'最新'

杨鑫
1 parent 7af2d89a
Showing 8 changed files with 40 additions and 21 deletions
admin-web-master/src/components/chakan/map.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/detect/examine/index.vue
ceres-uniapp-master/config/api.js
ceres-uniapp-master/pages_category_page1/orderModule/afterSaleApply.vue
lvdao-miniapp/pages/details/details.vue
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
@@ -31,8 +31,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="广告位数量" prop="advertisingNumber" >
-                      <div class="duiqi">{{editbgid.advertisingNumber || '无'}}</div>
+                    <el-form-item label="轮播顺序" prop="rotationOrder" >
+                      <div class="duiqi">{{editbgid.rotationOrder || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -47,7 +47,8 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="播放时长" prop="playDuration">
-                      <div class="duiqi">{{editbgid.playDuration || '无'}}</div>
+                      <div class="duiqi" v-if="editbgid.playDuration!=''">{{editbgid.playDuration}}/秒</div>
+					  <div class="duiqi" v-else>无</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -169,7 +169,10 @@
                 <!-- <el-table-column label="经营类型" prop="businessType" min-width="100">
                 </el-table-column> -->
-                <el-table-column label="租金价格" prop="rentalPrice">
+                <el-table-column label="租金价格(/M²)" prop="rentalPrice">
+					<template slot-scope="scope">
+					  {{scope.row.rentalPrice}}/M²
+					</template>
                 </el-table-column>
                 <el-table-column label="付款周期" prop="leaseTerm">
                 </el-table-column>
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
@@ -68,7 +68,8 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+           <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+           <span v-else>无</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
@@ -113,7 +114,8 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+            <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+            <span v-else>无</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
@@ -158,7 +160,8 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+              <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+			  <span v-else>无</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
 const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
-// const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003' 
-// const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
+const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003' 
+const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
 // const host = `${window.location.protocol}//${window.location.host}`
 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
@@ -170,7 +170,7 @@ export default {
           // this.total = this.total + item.total
         })
       }
-      this.total = await this.HandleGetRefundMoney()
+      // this.total = await this.HandleGetRefundMoney()
     },
     // 申请退货
     ReturnGoods(item) {
@@ -218,7 +218,7 @@ export default {
         }
         this.$set(this.allCheck, 'checked', false);
       }
-      this.total = await this.HandleGetRefundMoney()
+      // this.total = await this.HandleGetRefundMoney()
       //     if(this.xuanzlist.findIndex(item=>item.checked===true)==-1){
       //   console.log(this.allCheck,'this.allCheck')
@@ -20,7 +20,8 @@
 				</view>
 				<!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
 				<view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
-					<view class="info-price"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
+					<view class="info-price" v-if="tableData.actualUsableArea"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
+					<view class="info-price" v-else><span>{{moban[0].rentalPrice*tableData.actualArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
 				</view>
 				<view class="" v-if="moban.length !=0" @click="moreZu">
 					查看更多租金优惠
@@ -454,9 +455,18 @@
 			},
 			moreZu() {
-				uni.navigateTo({
-					url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualUsableArea}`
-				})
+				if(this.tableData.actualUsableArea){
+					
+					uni.navigateTo({
+						url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualUsableArea}`
+					})
+				}else{
+					uni.navigateTo({
+						url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}&moprice=${this.tableData.actualArea}`
+					})
+					
+				}
+			
 			},
 		}
 	};
@@ -49,11 +49,13 @@
 				<view class="form-item">
 					<view class="label">实际使用面积</view>
-					<text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
+					<text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}/M²</text>
+					<text  v-else>无</text>
 				</view>
 				<view class="form-item">
 					<view class="label">产权面积</view>
-					<text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
+					<text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}/M²</text>
+					<text v-else>无</text>
 				</view>
 				<view class="form-item">
 					<view class="label">所属区域</view>