gxd-uni-library-editx 1.0.138 → 1.0.140

package/package.json

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

package/src/components/XdLayout/XdLayout.vue

@@ -437,8 +437,8 @@
         let windowTop = uni.getSystemInfoSync().windowTop || 0;
         let temp = 'center top'; //默认值
         let top = this.navBarHeight + this.statusBarHeight;
-        //自定义 + 显示顶部导航
-        if (this.navigationStyle && (this.showBar || this.isPreviewShowBar)) {
+        //自定义 + 显示顶部导航 (微信模式不显示bar自定强制开启自定义头)
+        if (this.navigationStyle && (this.showBar || this.isPreviewShowBar || this.isCustomNavigation) ) {
           temp = `center -${top + this.getRpx(windowTop)}rpx`;
         }
         return temp;

package/src/utils/helper.js

@@ -959,6 +959,21 @@ class Helpers {
    */
   handleTo(obj = {}, redirect, type = true, notHistory = false) {
 
+    //直接跳转到第三方
+    if(obj.cusType === 'thirdH5') {
+      let regMp = /^(https:\/\/).+$/;
+      let regH5 = /^(https:\/\/|\/\/|http:\/\/).+$/;
+      //#ifdef H5
+      if(regH5.test(obj.url)) window.location.href = obj.url;
+      // #endif
+      //#ifdef MP-WEIXIN
+      if(regMp.test(obj.url)){
+        uni.navigateTo({
+          url: `/pages/thirdview/thirdview?seatUrl=${Base64.encodeURI(obj['url'])}`
+        });
+      }
+      // #endif
+    }
 
     //#ifdef H5
     if (window['$configProject'] && window['$configProject'].isPreview) {
@@ -1264,6 +1279,7 @@ class Helpers {
           //链接地址
           if(res.type === 'url' && res.value){
             obj.url = res.value;
+            obj.cusType = 'thirdH5';
             cb(obj)
           }
         })