Commit 84cb5fa73c9ad93f41d9e950d36f260e20afc847
1 parent
120060e1
1
Showing
5 changed files
with
48 additions
and
10 deletions
admin-web-master/src/components/newmap/index.vue
| @@ -108,7 +108,8 @@ | @@ -108,7 +108,8 @@ | ||
| 108 | // 创建地图实例 | 108 | // 创建地图实例 |
| 109 | this.map = new qq.maps.Map(document.getElementById('mapContainer'), { | 109 | this.map = new qq.maps.Map(document.getElementById('mapContainer'), { |
| 110 | center: centerLatLng, | 110 | center: centerLatLng, |
| 111 | - zoom: 13 | 111 | + zoom: 13, |
| 112 | + styles: 'dark' | ||
| 112 | }); | 113 | }); |
| 113 | 114 | ||
| 114 | // 创建标记 | 115 | // 创建标记 |
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
| @@ -7,8 +7,9 @@ | @@ -7,8 +7,9 @@ | ||
| 7 | </view> | 7 | </view> |
| 8 | <!-- <view class="info-text">{{tableData.shopDescription}}</view> --> | 8 | <!-- <view class="info-text">{{tableData.shopDescription}}</view> --> |
| 9 | <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0"> | 9 | <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0"> |
| 10 | - <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}} | ||
| 11 | - </view> | 10 | + <view class="info-price" v-if="moban[0].rentalPrice"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view> |
| 11 | + <view class="info-price" v-else>自营</view> | ||
| 12 | + | ||
| 12 | <!-- <view class="info-intention">{{tableData.id}}人有意向</view> --> | 13 | <!-- <view class="info-intention">{{tableData.id}}人有意向</view> --> |
| 13 | </view> | 14 | </view> |
| 14 | <view class="" v-if="moban.length !=0" @click="moreZu"> | 15 | <view class="" v-if="moban.length !=0" @click="moreZu"> |
| @@ -252,8 +253,24 @@ | @@ -252,8 +253,24 @@ | ||
| 252 | const imgs = list.split(',') | 253 | const imgs = list.split(',') |
| 253 | return imgs | 254 | return imgs |
| 254 | }, | 255 | }, |
| 255 | - leaseAdd(url) { | ||
| 256 | - | 256 | + async leaseAdd(url) { |
| 257 | + let c1 = await this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', { | ||
| 258 | + "pageNumber": 0, | ||
| 259 | + "pageSize": 10, | ||
| 260 | + "auditStatus": "1", | ||
| 261 | + "applicant": uni.getStorageSync('user').phone, | ||
| 262 | + "rentalResourcesId":this.tableData.id | ||
| 263 | + }, 1).then(res => { | ||
| 264 | + return res.data.data.content | ||
| 265 | + }) | ||
| 266 | + console.error(c1) | ||
| 267 | + if (c1.length > 0) { | ||
| 268 | + uni.showToast({ | ||
| 269 | + icon: 'none', | ||
| 270 | + title: '已申请,请勿重复提交' | ||
| 271 | + }) | ||
| 272 | + return | ||
| 273 | + } | ||
| 257 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { | 274 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { |
| 258 | "pageSize": 10, | 275 | "pageSize": 10, |
| 259 | pageNumber: 0, | 276 | pageNumber: 0, |
lvdao-miniapp/pages/details/details.vue
| @@ -21,7 +21,8 @@ | @@ -21,7 +21,8 @@ | ||
| 21 | <!-- <view class="info-text">{{tableData.shopDescription}}</view> --> | 21 | <!-- <view class="info-text">{{tableData.shopDescription}}</view> --> |
| 22 | <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0"> | 22 | <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0"> |
| 23 | <view class="info-price" v-if="tableData.actualUsableArea"><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 | + <view class="info-price" v-else-if="moban[0].rentalPrice"><span>{{moban[0].rentalPrice*tableData.actualArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view> |
| 25 | + <view class="info-price" v-else>自营</view> | ||
| 25 | </view> | 26 | </view> |
| 26 | <view class="" v-if="moban.length !=0" @click="moreZu"> | 27 | <view class="" v-if="moban.length !=0" @click="moreZu"> |
| 27 | 查看更多租金优惠 | 28 | 查看更多租金优惠 |
| @@ -404,7 +405,25 @@ | @@ -404,7 +405,25 @@ | ||
| 404 | } | 405 | } |
| 405 | }); | 406 | }); |
| 406 | }, | 407 | }, |
| 407 | - leaseAdd(url) { | 408 | + async leaseAdd(url) { |
| 409 | + let c1 = await this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST',{"dataStatus":"1", | ||
| 410 | + "pageNumber":0, | ||
| 411 | + "pageSize":10, | ||
| 412 | + "auditStatus":"1", | ||
| 413 | + "applicant":uni.getStorageSync('user').phone, | ||
| 414 | + "rentalResourcesId":(this.tableData.shopName?'sp':'cd') +this.tableData.id | ||
| 415 | + },1).then(res => { | ||
| 416 | + return res.data.data.records | ||
| 417 | + }) | ||
| 418 | + console.error(c1) | ||
| 419 | + if(c1.length>0) { | ||
| 420 | + uni.showToast({ | ||
| 421 | + icon:'none', | ||
| 422 | + title:'已申请,请勿重复提交' | ||
| 423 | + }) | ||
| 424 | + return | ||
| 425 | + } | ||
| 426 | + | ||
| 408 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { | 427 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { |
| 409 | "pageSize": 10, | 428 | "pageSize": 10, |
| 410 | pageNumber: 0, | 429 | pageNumber: 0, |
lvdao-miniapp/pagesA/moreZu/moreZu.vue
| @@ -3,9 +3,10 @@ | @@ -3,9 +3,10 @@ | ||
| 3 | <view class="cardZu" v-for="(item,index) in moban"> | 3 | <view class="cardZu" v-for="(item,index) in moban"> |
| 4 | <view class="zuTitle">{{item.policyName}}</view> | 4 | <view class="zuTitle">{{item.policyName}}</view> |
| 5 | <view class=""> | 5 | <view class=""> |
| 6 | - <view style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;"> | 6 | + <view v-if="item.rentalPrice" style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;"> |
| 7 | {{item.rentalPrice*moprice}}元/{{item.leaseTerm}} | 7 | {{item.rentalPrice*moprice}}元/{{item.leaseTerm}} |
| 8 | </view> | 8 | </view> |
| 9 | + <view style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;" v-else>自营</view> | ||
| 9 | <view class="youTitle"> | 10 | <view class="youTitle"> |
| 10 | 优惠政策: | 11 | 优惠政策: |
| 11 | </view> | 12 | </view> |
lvdao-miniapp/utils/request.js
| @@ -21,10 +21,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | @@ -21,10 +21,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | ||
| 21 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; | 21 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; |
| 22 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; | 22 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; |
| 23 | 23 | ||
| 24 | - bases = 'http://128.10.249.24:9003'+ url; | 24 | + // bases = 'http://128.10.249.24:9003'+ url; |
| 25 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; | 25 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; |
| 26 | 26 | ||
| 27 | - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; | 27 | + bases = c1 + 'cdwlMall/meserver/admin-server' + url; |
| 28 | 28 | ||
| 29 | }else if(baseUrl == 3){ | 29 | }else if(baseUrl == 3){ |
| 30 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; | 30 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; |