webapp / GreenwayWeb

Commit 93849c0f65b957b7ba9e6f42ab57a504f25065d8

Authored by 杨鑫
2 parents bfccec71 47e4e5dc

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

Inline Side-by-side
Showing 6 changed files with 20 additions and 11 deletions
admin-web-master/dist.zip
View file @93849c0
No preview for this file type
admin-web-master/src/components/chakan/zl.vue
  View file @93849c0
... ... @@ -253,9 +253,10 @@
253 253 <el-form-item label="详细位置" prop="detailedLocation">
254 254 <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
255 255 </el-form-item>
256   - <el-form-item label="地图标点" prop="mapPunctuation">
  256 + <el-form-item label="地图标点" prop="mapPunctuation" v-if="info.cereBasicInformationShop">
257 257 <div style="width: 100%;height: 300px;">
258 258 <!-- :edit='edit' :sendMap='getChildDate' -->
  259 + <!-- {{ info.cereBasicInformationShop.mapPunctuation }} -->
259 260 <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
260 261 </div>
261 262 </el-form-item>
... ... @@ -344,10 +345,10 @@
344 345 <!-- <el-form-item label="详细位置" prop="detailedLocation">
345 346 <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation || '无'}}</div>
346 347 </el-form-item> -->
347   - <el-form-item label="地图标点" prop="mapMarker" v-if="false">
  348 + <el-form-item label="地图标点" prop="mapMarker">
348 349 <div style="width: 100%;height: 300px;">
349   - <newmap :isx="false" :message="editbgid.detailedLocation"></newmap>
350   - <!-- <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall> -->
  350 + <!-- <newmap :isx="false" :message="editbgid.detailedLocation"></newmap> -->
  351 + <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall>
351 352 </div>
352 353 </el-form-item>
353 354 <el-form-item label="场地描述" prop="description">
... ...
admin-web-master/src/components/newmap/index.vue
  View file @93849c0
... ... @@ -54,7 +54,11 @@
54 54 },
55 55 mounted() {
56 56 // 初始化地图
57   - this.initMap();
  57 + let that = this;
  58 + // 延迟2秒执行，避免地图加载失败
  59 + setTimeout(() => {
  60 + that.initMap();
  61 + }, 2000);
58 62 },
59 63 methods: {
60 64 // 选择某一条搜索结果
... ...
admin-web-master/src/components/newmap/indexall.vue
  View file @93849c0
... ... @@ -47,8 +47,12 @@ export default {
47 47 },
48 48 },
49 49 mounted() {
50   - this.initMap();
51   - this.setActiveType('polygon')
  50 + let that = this;
  51 + // 延迟2秒执行，避免地图加载失败
  52 + setTimeout(() => {
  53 + that.initMap();
  54 + that.setActiveType('polygon')
  55 + }, 2000);
52 56 },
53 57 methods: {
54 58 searchLocation() {
... ...
admin-web-master/src/utils/request.js
  View file @93849c0
... ... @@ -17,12 +17,12 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
  20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - baseURL = 'http://128.10.249.9:9003';
  25 + // baseURL = 'http://128.10.249.9:9003';
26 26  
27 27  
28 28 } else {
... ...
lvdao-miniapp/utils/request.js
  View file @93849c0
... ... @@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
24 24 bases = 'http://128.10.249.9:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27   - // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  27 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28  
29 29 }else if(baseUrl == 3){
30 30 // 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; {
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42 42 bases = 'http://128.10.249.9:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44   - // bases = c1 + 'cdwlMall/business-server' + url;
  44 + bases = c1 + 'cdwlMall/business-server' + url;
45 45  
46 46 }
47 47 var token = uni.getStorageSync('token') || '';
... ...