diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index abfe1d9..ee62cb8 100644 --- a/admin-web-master/dist.zip +++ b/admin-web-master/dist.zip diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue index ef406cd..5bb18f4 100644 --- a/admin-web-master/src/components/chakan/zl.vue +++ b/admin-web-master/src/components/chakan/zl.vue @@ -253,9 +253,10 @@
{{info.cereBasicInformationShop.detailedLocation || '无'}}
- +
+
@@ -344,10 +345,10 @@ - +
- - + +
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue index e8c185a..a8e86ea 100644 --- a/admin-web-master/src/components/newmap/index.vue +++ b/admin-web-master/src/components/newmap/index.vue @@ -54,7 +54,11 @@ }, mounted() { // 初始化地图 - this.initMap(); + let that = this; + // 延迟2秒执行,避免地图加载失败 + setTimeout(() => { + that.initMap(); + }, 2000); }, methods: { // 选择某一条搜索结果 diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue index c0773a4..37bac7c 100644 --- a/admin-web-master/src/components/newmap/indexall.vue +++ b/admin-web-master/src/components/newmap/indexall.vue @@ -47,8 +47,12 @@ export default { }, }, mounted() { - this.initMap(); - this.setActiveType('polygon') + let that = this; + // 延迟2秒执行,避免地图加载失败 + setTimeout(() => { + that.initMap(); + that.setActiveType('polygon') + }, 2000); }, methods: { searchLocation() { diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index be369f9..b350a45 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,12 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.249.9:9003'; + // baseURL = 'http://128.10.249.9:9003'; } else { diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 450bea8..1a2bfae 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -24,7 +24,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { bases = 'http://128.10.249.9:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; + bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; @@ -41,7 +41,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; bases = 'http://128.10.249.9:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; - // bases = c1 + 'cdwlMall/business-server' + url; + bases = c1 + 'cdwlMall/business-server' + url; } var token = uni.getStorageSync('token') || '';