diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index d8b7b39..3923d81 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -1,12 +1,12 @@ // 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 = 'http://128.10.250.204:9003' -// const DOMAIN_PREFIX = 'http://128.10.250.204:9007' +const DOMAIN_PREFIXPING = 'http://128.10.250.204:9003' +const DOMAIN_PREFIX = 'http://128.10.250.204:9007' const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang' -const host = `${window.location.protocol}//${window.location.host}` -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` +// const host = `${window.location.protocol}//${window.location.host}` +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` // const DOMAIN_PREFIXPING = `http://8.130.38.56:9003` // const DOMAIN_PREFIX = 'http://8.130.38.56:9007' diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue index c790db2..8d6d5df 100644 --- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue +++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue @@ -25,7 +25,7 @@ 租赁期限 - {{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}} + {{heData.contractSigningDate?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}} 租金 @@ -172,7 +172,7 @@ 添加我的店铺信息 - + 申请退租 申请续租 diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index 1f5d1ce..d6aa1fe 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -20,8 +20,8 @@ let PREFIX; // 其他情况的默认值 // PREFIX = 'http://8.130.38.56:8027/business-server'; // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business'; - PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - // PREFIX = 'http://128.10.249.206:9004'; + // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; + PREFIX = 'http://128.10.250.204:9004'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004';