webapp / GreenwayWeb

Commit 6106f9fa9f08f0845afa362f9762102e6f40bb22

Authored by 杨鑫
1 parent 7af2d89a

'最新'

Inline Side-by-side
Showing 8 changed files with 40 additions and 21 deletions
admin-web-master/src/components/chakan/map.vue
  View file @6106f9f
... ... @@ -31,8 +31,8 @@
31 31 </el-form-item>
32 32 </el-col>
33 33 <el-col :span="8">
34   - <el-form-item label="广告位数量" prop="advertisingNumber" >
35   - <div class="duiqi">{{editbgid.advertisingNumber || '无'}}</div>
  34 + <el-form-item label="轮播顺序" prop="rotationOrder" >
  35 + <div class="duiqi">{{editbgid.rotationOrder || '无'}}</div>
36 36 </el-form-item>
37 37 </el-col>
38 38 <el-col :span="8">
... ... @@ -47,7 +47,8 @@
47 47 </el-col>
48 48 <el-col :span="8">
49 49 <el-form-item label="播放时长" prop="playDuration">
50   - <div class="duiqi">{{editbgid.playDuration || '无'}}</div>
  50 + <div class="duiqi" v-if="editbgid.playDuration!=''">{{editbgid.playDuration}}/秒</div>
  51 + <div class="duiqi" v-else>无</div>
51 52 </el-form-item>
52 53 </el-col>
53 54 <el-col :span="8">
... ...
admin-web-master/src/components/resourceCommodity/index.vue
  View file @6106f9f
... ... @@ -169,7 +169,10 @@
169 169 <!-- <el-table-column label="经营类型" prop="businessType" min-width="100">
170 170  
171 171 </el-table-column> -->
172   - <el-table-column label="租金价格" prop="rentalPrice">
  172 + <el-table-column label="租金价格(/M²)" prop="rentalPrice">
  173 + <template slot-scope="scope">
  174 + {{scope.row.rentalPrice}}/M²
  175 + </template>
173 176 </el-table-column>
174 177 <el-table-column label="付款周期" prop="leaseTerm">
175 178 </el-table-column>
... ...
admin-web-master/src/utils/request.js
  View file @6106f9f
... ... @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19   - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
  19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
... ...
admin-web-master/src/views/detect/examine/index.vue
  View file @6106f9f
... ... @@ -68,7 +68,8 @@
68 68 </el-table-column>
69 69 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
70 70 <template slot-scope="scope">
71   - {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
  71 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
  72 + <span v-else>无</span>
72 73 </template>
73 74 </el-table-column>
74 75 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
... ... @@ -113,7 +114,8 @@
113 114 </el-table-column>
114 115 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
115 116 <template slot-scope="scope">
116   - {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
  117 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
  118 + <span v-else>无</span>
117 119 </template>
118 120 </el-table-column>
119 121 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
... ... @@ -158,7 +160,8 @@
158 160 </el-table-column>
159 161 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
160 162 <template slot-scope="scope">
161   - {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
  163 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
  164 + <span v-else>无</span>
162 165 </template>
163 166 </el-table-column>
164 167 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
... ...
ceres-uniapp-master/config/api.js
  View file @6106f9f
1 1  
2 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4   -const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
5   -const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
  4 +// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  5 +// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
6 6 const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
7 7 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
8   -// const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003'
9   -// const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
  8 +const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003'
  9 +const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
10 10 // const host = `${window.location.protocol}//${window.location.host}`
11 11 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
12 12 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
... ...
ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
  View file @6106f9f
... ... @@ -170,7 +170,7 @@ export default {
170 170 // this.total = this.total + item.total
171 171 })
172 172 }
173   - this.total = await this.HandleGetRefundMoney()
  173 + // this.total = await this.HandleGetRefundMoney()
174 174 },
175 175 // 申请退货
176 176 ReturnGoods(item) {
... ... @@ -218,7 +218,7 @@ export default {
218 218 }
219 219 this.$set(this.allCheck, 'checked', false);
220 220 }
221   - this.total = await this.HandleGetRefundMoney()
  221 + // this.total = await this.HandleGetRefundMoney()
222 222  
223 223 // if(this.xuanzlist.findIndex(item=>item.checked===true)==-1){
224 224 // console.log(this.allCheck,'this.allCheck')
... ...
lvdao-miniapp/pages/details/details.vue
  View file @6106f9f
... ... @@ -20,7 +20,8 @@
20 20 </view>
21 21 <!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
22 22 <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
23   - <view class="info-price"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
  23 + <view class="info-price" v-if="tableData.actualUsableArea"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
  24 + <view class="info-price" v-else><span>{{moban[0].rentalPrice*tableData.actualArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
24 25 </view>
25 26 <view class="" v-if="moban.length !=0" @click="moreZu">
26 27 查看更多租金优惠
... ... @@ -454,9 +455,18 @@
454 455  
455 456 },
456 457 moreZu() {
457   - uni.navigateTo({
458   - url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualUsableArea}`
459   - })
  458 + if(this.tableData.actualUsableArea){
  459 +
  460 + uni.navigateTo({
  461 + url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualUsableArea}`
  462 + })
  463 + }else{
  464 + uni.navigateTo({
  465 + url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualArea}`
  466 + })
  467 +
  468 + }
  469 +
460 470 },
461 471 }
462 472 };
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
  View file @6106f9f
... ... @@ -49,11 +49,13 @@
49 49  
50 50 <view class="form-item">
51 51 <view class="label">实际使用面积</view>
52   - <text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
  52 + <text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}/M²</text>
  53 + <text v-else>无</text>
53 54 </view>
54 55 <view class="form-item">
55 56 <view class="label">产权面积</view>
56   - <text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
  57 + <text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}/M²</text>
  58 + <text v-else>无</text>
57 59 </view>
58 60 <view class="form-item">
59 61 <view class="label">所属区域</view>
... ...