gxd-uni-library-editx 1.0.29 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.29",
+  "version": "1.0.32",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdCityLocation/XdCityLocation.vue

@@ -195,14 +195,20 @@
                   longitude: location['longitude'],
                   address: {}
                 };
+                let temp = JSON.parse(JSON.stringify(this.location))
                 this.$xdLog.setProject('Location.wx.api.done', {
                   lng: location.longitude,
                   lat: location.latitude
                 });
-                this.handleBaiduInit(this.location);
+                setTimeout(()=>{
+                  this.handleBaiduInit(temp);
+                  if(time){
+                    clearTimeout(time);
+                    time=null
+                  }
+                }, 10)
               },
               fail: (e) => {
-
                 //已超时返回
                 if(isReturn) {
                   time = null;
@@ -223,6 +229,10 @@
                 this.handleBaiduInit(null)
               },
               cancel: (e) => {
+                if(time){
+                  clearTimeout(time);
+                  time=null
+                }
                 this.$xdLog.setProject('Location.wx.api.cancel', {
                   lng: null,
                   lat: null
@@ -241,7 +251,7 @@
               });
               this.handleBaiduInit(null);
               isReturn = true;
-            }, 5000)
+            }, 4000)
           })
           .catch(res => {
             this.$xdLog.setProject('Location.wx.jwxSDK.fail', {
@@ -261,7 +271,7 @@
             this.$emit('done', null);
             this.failStatus = true;
             this.$xdLog.setProject('Location.timeout', 'Location.timeout.10s');
-          }, 10000)
+          }, 4000)
         }
       },
 

package/src/components/XdLayout/XdLayout.vue

@@ -515,7 +515,13 @@
       this.wiewType = this.$configProject.isPreview;
       this.systemInfoSyn = uni.getSystemInfoSync();
       this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;
-      this.websiteStatus = this.siteInfo && this.siteInfo.site && this.siteInfo.site.status === 'Y'
+
+      //判断是否禁用
+      if(this.wiewType) {
+        this.websiteStatus = true;
+      }else {
+        this.websiteStatus = !!(this.siteInfo && this.siteInfo.site && this.siteInfo.site.status === 'Y');
+      }
 
       // #ifdef H5
       if(!uni.getStorageSync('xd-max-window-height')) {