Commit 84cb5fa73c9ad93f41d9e950d36f260e20afc847

Authored by wesley88
1 parent 120060e1

1

admin-web-master/src/components/newmap/index.vue
... ... @@ -108,7 +108,8 @@
108 108 // 创建地图实例
109 109 this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
110 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 7 </view>
8 8 <!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
9 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 13 <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
13 14 </view>
14 15 <view class="" v-if="moban.length !=0" @click="moreZu">
... ... @@ -252,8 +253,24 @@
252 253 const imgs = list.split(',')
253 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 274 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
258 275 "pageSize": 10,
259 276 pageNumber: 0,
... ...
lvdao-miniapp/pages/details/details.vue
... ... @@ -21,7 +21,8 @@
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 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 26 </view>
26 27 <view class="" v-if="moban.length !=0" @click="moreZu">
27 28 查看更多租金优惠
... ... @@ -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 427 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
409 428 "pageSize": 10,
410 429 pageNumber: 0,
... ...
lvdao-miniapp/pagesA/moreZu/moreZu.vue
... ... @@ -3,9 +3,10 @@
3 3 <view class="cardZu" v-for="(item,index) in moban">
4 4 <view class="zuTitle">{{item.policyName}}</view>
5 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 7 {{item.rentalPrice*moprice}}元/{{item.leaseTerm}}
8 8 </view>
  9 + <view style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;" v-else>自营</view>
9 10 <view class="youTitle">
10 11 优惠政策:
11 12 </view>
... ...
lvdao-miniapp/utils/request.js
... ... @@ -21,10 +21,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 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 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 29 }else if(baseUrl == 3){
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
... ...