gxd-uni-library-editx 1.0.173 → 1.0.174

package/package.json

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

package/src/utils/helper.js

@@ -1090,6 +1090,25 @@ class Helpers {
     }
     let isH5 = reg.test(obj.url);
 
+    //第三方平台链接
+    if(isH5) {
+      console.warn(`window.location.href: ${JSON.stringify(obj)},notHistory=${notHistory}`);
+      //#ifdef H5
+      if(notHistory) window.location.replace(obj['url']);
+      else window.location.href = obj['url'];
+      // #endif
+
+      //#ifdef MP-WEIXIN
+      let fn = 'navigateTo';
+      if (!type) fn = 'redirectTo';
+      console.warn(`webview:/pages/webview/webview?seatUrl=${encodeURIComponent(obj['url'])}`)
+      uni[fn]({
+        url: `/pages/webview/webview?seatUrl=${Base64.encodeURI(obj['url'])}`
+      });
+      // #endif
+      return;
+    }
+
     //全平台参数设置(当前页面中获取｜参数中获取，入口缓存中获取)
     let params = [];
     xParamsKey.map(key=>{
@@ -1100,40 +1119,12 @@ class Helpers {
       }
     });
 
-    // let xdProject= currentPagesParams[PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME]
-    //   || obj[PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME]
-    //   || uni.getStorageSync(PLATFORM_PARAM_SETTING.EVENT_PARAM_SAVE_KEY);
-    // let xdAllProject = currentPagesParams[PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME]
-    //   || obj[PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME]
-    //   || uni.getStorageSync(PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME_SAVE_KEY);
-    //
-    // let xdTestProject = currentPagesParams[PLATFORM_PARAM_SETTING.TEST_PARAM_NAME]
-    //   || obj[PLATFORM_PARAM_SETTING.TEST_PARAM_NAME]
-    //   || uni.getStorageSync(PLATFORM_PARAM_SETTING.TEST_PARAM_NAME_SAVE_KEY);
-    //
-    // //x-params
-    // if(xdProject && obj['url'].indexOf(PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME) === -1){
-    //   params.push(`${PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME}=${encodeURIComponent(xdProject)}`);
-    // }
-    //
-    // //x-common
-    // if(xdAllProject && obj['url'].indexOf(PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME) === -1){
-    //   params.push(`${PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME}=${encodeURIComponent(xdAllProject)}`);
-    // }
-    //
-    // //x-test
-    // if (xdTestProject && obj['url'].indexOf(PLATFORM_PARAM_SETTING.TEST_PARAM_NAME) === -1) {
-    //   params.push(`${PLATFORM_PARAM_SETTING.TEST_PARAM_NAME}=${encodeURIComponent(xdTestProject)}`);
-    // }
-
     //删除参数中等公告参数
     xParamsKey.map(key=>{
       let {paramKey, storageKey} = getPlatformParamsValue(key);
       if(obj[paramKey]) delete obj[paramKey];
     });
-    // if (obj[PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME]) delete obj[PLATFORM_PARAM_SETTING.EVENT_PARAM_NAME];
-    // if (obj[PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME]) delete obj[PLATFORM_PARAM_SETTING.OVER_ALL_PARAM_NAME];
-    // if (obj[PLATFORM_PARAM_SETTING.TEST_PARAM_NAME]) delete obj[PLATFORM_PARAM_SETTING.TEST_PARAM_NAME];
+
 
     //需要设置redirect参数
     if (redirect) {
@@ -1160,52 +1151,34 @@ class Helpers {
     console.warn(`handleTo:isH5=>${isH5},type=>${type},obj=${JSON.stringify(obj)}`);
 
     //带有网络链接地址处理
-    if (isH5) {
-      console.warn(`window.location.href: ${JSON.stringify(obj)},notHistory=${notHistory}`);
+    if (type){
       //#ifdef H5
-      if(notHistory) window.location.replace(obj['url']);
-      else window.location.href = obj['url'];
-      // #endif
-
+      console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
+      uni.navigateTo(obj);
+      //#endif
       //#ifdef MP-WEIXIN
-      let fn = 'navigateTo';
-      if (!type) fn = 'redirectTo';
-      console.warn(`webview:/pages/webview/webview?seatUrl=${encodeURIComponent(obj['url'])}`)
-      uni[fn]({
-        url: `/pages/webview/webview?seatUrl=${Base64.encodeURI(obj['url'])}`
-      });
-      // #endif
+      this.handleWxTo(type, obj)
+      //#endif
     }
     else {
-      if (type){
-        //#ifdef H5
+      //#ifdef H5
+      if(notHistory){
+        console.warn(`${type ? 'notHistory.jump' : 'redirectTo'}: ${JSON.stringify(obj)}`);
+        let dir = '';
+        if (store.state.brandInfo && store.state.brandInfo['deploy_dir']) {
+          dir = `/${store.state.brandInfo['deploy_dir']}`
+        }
+        window.location.replace(`${dir}${obj.url}`);
+      }
+      else{
         console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
-        uni.navigateTo(obj);
-        //#endif
-        //#ifdef MP-WEIXIN
-        this.handleWxTo(type, obj)
-        //#endif
+        uni.redirectTo(obj);
       }
-      else {
-        //#ifdef H5
-        if(notHistory){
-          console.warn(`${type ? 'notHistory.jump' : 'redirectTo'}: ${JSON.stringify(obj)}`);
-          let dir = '';
-          if (store.state.brandInfo && store.state.brandInfo['deploy_dir']) {
-            dir = `/${store.state.brandInfo['deploy_dir']}`
-          }
-          window.location.replace(`${dir}${obj.url}`);
-        }
-        else{
-          console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
-          uni.redirectTo(obj);
-        }
-        // #endif
+      // #endif
 
-        //#ifdef MP-WEIXIN
-        this.handleWxTo(type, obj)
-        // #endif
-      }
+      //#ifdef MP-WEIXIN
+      this.handleWxTo(type, obj)
+      // #endif
     }
   }