Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents bfccec71 47e4e5dc
Showing 6 changed files with 20 additions and 11 deletions
admin-web-master/dist.zip
admin-web-master/src/components/chakan/zl.vue
admin-web-master/src/components/newmap/index.vue
admin-web-master/src/components/newmap/indexall.vue
admin-web-master/src/utils/request.js
lvdao-miniapp/utils/request.js
@@ -253,9 +253,10 @@
                 <el-form-item label="详细位置" prop="detailedLocation">
                   <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
                 </el-form-item>
-                <el-form-item label="地图标点" prop="mapPunctuation">
+                <el-form-item label="地图标点" prop="mapPunctuation" v-if="info.cereBasicInformationShop">
                   <div style="width: 100%;height: 300px;">
                     <!-- :edit='edit' :sendMap='getChildDate' -->
+                     <!-- {{ info.cereBasicInformationShop.mapPunctuation }} -->
                     <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
                   </div>
                 </el-form-item>
@@ -344,10 +345,10 @@
                 <!-- <el-form-item label="详细位置" prop="detailedLocation">
                     <div  class="duiqi">{{info.cereBasicInformationVenue.detailedLocation  || '无'}}</div>
                 </el-form-item> -->
-                <el-form-item label="地图标点" prop="mapMarker" v-if="false">
+                <el-form-item label="地图标点" prop="mapMarker">
                   <div style="width: 100%;height: 300px;">
-                    <newmap :isx="false" :message="editbgid.detailedLocation"></newmap>
-                    <!-- <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall> -->
+                    <!-- <newmap :isx="false" :message="editbgid.detailedLocation"></newmap> -->
+                    <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall>
                   </div>
                 </el-form-item>
                 <el-form-item label="场地描述" prop="description">
@@ -54,7 +54,11 @@
     },
     mounted() {
       // 初始化地图
-      this.initMap();
+      let that = this;
+      // 延迟2秒执行，避免地图加载失败
+      setTimeout(() => {
+        that.initMap();
+      }, 2000);
     },
     methods: {
       // 选择某一条搜索结果
@@ -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() {
@@ -17,12 +17,12 @@ let baseURL =  &#39;&#39;
 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 {
@@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// 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') || '';