Commit be8e7fa95a1928e1b8d066de401ef35641d7acef
Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb
Showing
5 changed files
with
6 additions
and
6 deletions
admin-web-master/src/utils/request2.js
| @@ -17,10 +17,10 @@ let baseURL = '' | @@ -17,10 +17,10 @@ let baseURL = '' | ||
| 17 | // || host === 'localhost:9528' | 17 | // || host === 'localhost:9528' |
| 18 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { | 18 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 19 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; | 19 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 20 | - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | 20 | + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; |
| 21 | // baseURL = 'http://172.16.61.125:9004'; | 21 | // baseURL = 'http://172.16.61.125:9004'; |
| 22 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; | 22 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; |
| 23 | - baseURL = 'http://128.10.249.20:9004'; | 23 | + // baseURL = 'http://128.10.249.20:9004'; |
| 24 | } else { | 24 | } else { |
| 25 | console.error('---------------------') | 25 | console.error('---------------------') |
| 26 | console.error(hostall) | 26 | console.error(hostall) |
lvdao-miniapp/pages/field/field.vue
| @@ -158,7 +158,7 @@ | @@ -158,7 +158,7 @@ | ||
| 158 | reconciliationdetail(item) { | 158 | reconciliationdetail(item) { |
| 159 | let items = JSON.stringify(item) | 159 | let items = JSON.stringify(item) |
| 160 | uni.navigateTo({ | 160 | uni.navigateTo({ |
| 161 | - url: `/pages/details/details?item=${items}` | 161 | + url: `/pages/details/details?item=${encodeURIComponent(items)}` |
| 162 | }) | 162 | }) |
| 163 | }, | 163 | }, |
| 164 | search(){ | 164 | search(){ |
lvdao-miniapp/pages/home/home.vue
| @@ -639,7 +639,7 @@ | @@ -639,7 +639,7 @@ | ||
| 639 | let items = JSON.stringify(item) | 639 | let items = JSON.stringify(item) |
| 640 | if (this.current == 0 || this.current == 1) { | 640 | if (this.current == 0 || this.current == 1) { |
| 641 | uni.navigateTo({ | 641 | uni.navigateTo({ |
| 642 | - url: `/pages/details/details?item=${items}` | 642 | + url: `/pages/details/details?item=${encodeURIComponent(items)}` |
| 643 | }) | 643 | }) |
| 644 | } else { | 644 | } else { |
| 645 | uni.navigateTo({ | 645 | uni.navigateTo({ |
lvdao-miniapp/pages/my/my.vue
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view class="screen-list"> | 3 | <view class="screen-list"> |
| 4 | <view class="list"> | 4 | <view class="list"> |
| 5 | <u-input type="select" @click="typeShow = true" | 5 | <u-input type="select" @click="typeShow = true" |
| 6 | - :placeholder="pageindex.dataStatus == '1'?'申请中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" /> | 6 | + :placeholder="pageindex.dataStatus == '1'?'租赁中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" /> |
| 7 | </view> | 7 | </view> |
| 8 | </view> | 8 | </view> |
| 9 | <!-- 记录列表 --> | 9 | <!-- 记录列表 --> |