webapp / GreenwayWeb

Commit 48d42e15b6822bc478a56b2292c5e5c82611a6b7

Authored by 杨鑫
1 parent 464298a8

'1'

Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
ceres-uniapp-master/config/api.js
  View file @48d42e1
1 1
2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4 -// const DOMAIN_PREFIXPING = 'http://128.10.250.204:9003'  
5 -// const DOMAIN_PREFIX = 'http://128.10.250.204:9007' 4 +const DOMAIN_PREFIXPING = 'http://128.10.250.204:9003'
  5 +const DOMAIN_PREFIX = 'http://128.10.250.204:9007'
6 const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang' 6 const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang'
7 -const host = `${window.location.protocol}//${window.location.host}`  
8 -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`  
9 -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 7 +// const host = `${window.location.protocol}//${window.location.host}`
  8 +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
  9 +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
10 // const DOMAIN_PREFIXPING = `http://8.130.38.56:9003` 10 // const DOMAIN_PREFIXPING = `http://8.130.38.56:9003`
11 // const DOMAIN_PREFIX = 'http://8.130.38.56:9007' 11 // const DOMAIN_PREFIX = 'http://8.130.38.56:9007'
12 12
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @48d42e1
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 </view> 25 </view>
26 <view class="form-item"> 26 <view class="form-item">
27 <view class="label">租赁期限</view> 27 <view class="label">租赁期限</view>
28 - <text>{{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}</text> 28 + <text>{{heData.contractSigningDate?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}</text>
29 </view> 29 </view>
30 <view class="form-item"> 30 <view class="form-item">
31 <view class="label">租金</view> 31 <view class="label">租金</view>
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
172 172
173 </view> 173 </view>
174 <view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view> 174 <view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
175 - <view class="page-footer"> 175 + <view class="page-footer" v-if="record.auditStatus =='4'">
176 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')" 176 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
177 >申请退租</u-button> 177 >申请退租</u-button>
178 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button> 178 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button>
merchant-web-master/src/utils/request.js
  View file @48d42e1
@@ -20,8 +20,8 @@ let PREFIX; @@ -20,8 +20,8 @@ let PREFIX;
20 // 其他情况的默认值 20 // 其他情况的默认值
21 // PREFIX = 'http://8.130.38.56:8027/business-server'; 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business'; 22 // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
23 - PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';  
24 - // PREFIX = 'http://128.10.249.206:9004'; 23 + // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
  24 + PREFIX = 'http://128.10.250.204:9004';
25 }else{ 25 }else{
26 // PREFIX = '/merchant-business'; 26 // PREFIX = '/merchant-business';
27 // PREFIX = 'http://8.130.38.56:9004'; 27 // PREFIX = 'http://8.130.38.56:9004';