gxd-uni-library-editx 1.0.86 → 1.0.87-beta2

package/package.json

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

package/src/components/XdBar/XdBar.vue

@@ -24,7 +24,7 @@
         <!--返回上一个界元素-->
         <view class="xd-custom-bar__fixed-content-icon" @click.stop="back" v-if="!isSlotTopBar">
           <xd-font-icon
-            v-if="noPrevToIndex && showBack && isPrev !== null"
+            v-if="isTopIcon"
             :icon="isPrev ? 'iconxiangzuo_xian' : 'iconshouye_mian'"
             :color="uiTextColor"
             :size="uiIconSize"
@@ -157,7 +157,7 @@
         // #ifdef H5
         return isThirdLogin().isICB && !this.isPrev
         // #endif
-        // #ifndef H5
+        // #ifdef MP-WEIXIN
         return false
         // #endif
       },
@@ -177,6 +177,18 @@
         return bgc;
 
       },
+      isTopIcon(){
+        // #ifdef H5
+        return this.noPrevToIndex && this.showBack && this.isPrev !== null
+        // #endif
+        // #ifdef MP-WEIXIN
+        //自定义导航并且不显示导航设置
+        if(this.$parent.navigationStyle && !this.showBack) {
+          return this.noPrevToIndex && this.isPrev !== null
+        }
+        return this.noPrevToIndex && this.showBack && this.isPrev !== null
+        // #endif
+      }
     },
     created(){
       this.noPrevToIndex = this.$settings['noPrevPageToIndex'] === undefined ? false : this.$settings['noPrevPageToIndex'];
@@ -270,6 +282,14 @@
       },
 
       back(){
+        // #ifdef MP-WEIXIN
+        //自定义导航并且不显示导航设置
+        if(this.$parent.navigationStyle && !this.showBack) {
+          this.$xdUniHelper.navigateBack();
+          return;
+        }
+        // #endif
+
         if(!this.showBack) return;
 
         //临时兼容

package/src/components/XdLayout/XdLayout.vue

@@ -288,7 +288,13 @@
 
         startAnimation : false, //开始动画效果
         doneAnimation: false, //完成动画效果
-        defaultImage: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDM4QTUyMkNDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDM4QTUyMkRDRUQyMTFFQzkzRTZDOUJBNTFBNTA3RDUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozMkE3N0VGRkNFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkE3N0YwMENFRDAxMUVDOTNFNkM5QkE1MUE1MDdENSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PliHXlsAAAAQSURBVHjaYvj//z8DQIABAAj8Av7bok0WAAAAAElFTkSuQmCC',
+        // #ifdef H5
+        defaultImage: '//img.jufubao.cn/common/empty.png?ver=1',
+        //#endif
+        //#ifdef MP-WEIXIN
+        defaultImage: 'https://img.jufubao.cn/common/empty.png?ver=1',
+        //#endif
+
         bgImage: '',
         barBgColor: '', //bar背景颜色
         systemInfoSyn: null,
@@ -325,7 +331,13 @@
         //底部是否插槽模式
         isFooterSolt: true,
         wiewType: false,
+
+        // #ifdef H5
         loadingUrl: '//img.jufubao.cn/loading-block.jpg?v=1',
+        //#endif
+        //#ifdef MP-WEIXIN
+        loadingUrl: 'https://img.jufubao.cn/loading-block.jpg?v=1',
+        //#endif
 
 	      //自定义背景
         customBg: null,

package/src/utils/helper.js

@@ -1,4 +1,5 @@
 'use strict';
+
 import {Base64} from 'js-base64';
 import {
   PLATFORM_PARAM_SETTING
@@ -512,14 +513,15 @@ class Helpers {
       pathname = url.split('?')[0];
       search = url.split('?')[1];
     }
-
+    let partReplaceStr = '/$1';
+    if(/(\/\/|http:\/\/|https:\/\/).+$/.test(url)) partReplaceStr = '$1';
     return{
       source: url,
       query: search,
       params: params(search),
       relative: url,
       segments: pathname.replace(/^\//, '').split('/'),
-      path: pathname.replace(/^([^\/])/, '/$1'),
+      path: pathname.replace(/^([^\/])/, partReplaceStr),
       file: (pathname.match(/\/([^\/?#]+)$/i) || [, ''])[1],
     }
     //#endif
@@ -812,16 +814,31 @@ class Helpers {
   }
 
   replacePathForDir(url){
-    //#ifndef H5
-    return url
+    let dir = '';
+    let host = '';
+    if(store.state.brandInfo) {
+      dir = store.state.brandInfo.deploy_dir
+      host = store.state.brandInfo.host;
+    }
+
+    //#ifdef MP-WEIXIN
+    //带有应用部署目录处理
+    if(/@site_domain@\//.test(url)) {
+      let indexReg = new RegExp(`@site_domain@/${dir}`);
+      //相同应用处理
+      if(indexReg.test(url)) {
+        return url.replace(indexReg,'');
+      }
+      //不同应用处理
+      else{
+        return `https://${host}${url.replace('@site_domain@','')}`;
+      }
+    }
+    else return url;
     //#endif
 
     //#ifdef H5
     let siteDomain = `${window.location.protocol}//${window.location.host}`;
-    let dir = '';
-    if(store.state.brandInfo && store.state.brandInfo.deploy_dir) {
-      dir = store.state.brandInfo.deploy_dir
-    }
     let reg = new RegExp(`@site_domain@`); //检查是否为站点下其他应用的链接地址
     let selfReg = new RegExp(`@site_domain@/${dir}`); //检查是否为自己内部链接
     let relfRedirectReg = new RegExp(`^/${dir}\/.+$`); //检查是否带有内容部署目录地址
@@ -962,7 +979,7 @@ class Helpers {
       else window.location.href = obj['url'];
       // #endif
 
-      //#ifndef H5
+      //#ifdef MP-WEIXIN
       let fn = 'navigateTo';
       if (!type) fn = 'redirectTo';
       console.warn(`webview:/pages/webview/webview?seatUrl=${encodeURIComponent(obj['url'])}`)
@@ -972,8 +989,16 @@ class Helpers {
       // #endif
     }
     else {
-      console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
-      if (type) uni.navigateTo(obj);
+      console.log(type, obj)
+      if (type){
+        //#ifdef H5
+        console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
+        uni.navigateTo(obj);
+        //#endif
+        //#ifdef MP-WEIXIN
+        this.handleWxTo(type, obj)
+        //#endif
+      }
       else {
         //#ifdef H5
         if(notHistory){
@@ -984,16 +1009,53 @@ class Helpers {
           }
           window.location.replace(`${dir}${obj.url}`);
         }
-        else uni.redirectTo(obj);
+        else{
+          console.warn(`${type?'navigateTo.jump': 'redirectTo'}: ${JSON.stringify(obj)}`);
+          uni.redirectTo(obj);
+        }
         // #endif
 
-        //#ifndef H5
-        uni.redirectTo(obj);
+        //#ifdef MP-WEIXIN
+        this.handleWxTo(type, obj)
         // #endif
       }
     }
   }
 
+  /**
+   * @description 微信跳转
+   * @param type
+   * @param obj {object}
+   * @param obj.url {string}
+   */
+  handleWxTo(type, obj) {
+    let fnName = 'navigateTo';
+    if (!type) fnName = 'redirectTo';
+
+    //带有@site_domain@设置标识
+    if(obj.url.indexOf('@site_domain@') === 0) {
+      const {host,deploy_dir} = store.state.brandInfo;
+      let url = obj.url.replace(/@site_domain@/,'');
+      //相同应用
+      if(url.indexOf(`/${deploy_dir}/`) === 0){
+        obj.url = url.replace(`/${deploy_dir}/`,'/');
+        uni[fnName](obj)
+      }
+      //不同应用
+      else {
+        url = `https://${host}${url}`;
+        console.warn(`webview:/pages/webview/webview?seatUrl=${encodeURIComponent(url)}`)
+        uni[fnName]({
+          url: `/pages/webview/webview?seatUrl=${Base64.encodeURI(url)}`
+        });
+      }
+
+    }
+    else{
+      uni[fnName](obj)
+    }
+  }
+
   /**
    * @description 返回处理
    * @param type {boolean} 跳转类型 true=>navigateTo   false=>redirectTo
@@ -1046,7 +1108,7 @@ class Helpers {
    */
   async specialApiTransform(obj, cb){
     let reg  = /(-apiuri\/v)/;
-    let regHttp = /^(\/\/)|(http:\/\/)|(http:\/\/).+/;
+    let regHttp = /^(\/\/)|(http:\/\/)|(https:\/\/).+/;
     //需要转化的特殊访问地址
     if(reg.test(obj.url)){
       if(!regHttp.test(obj.url)) {