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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.87",
+  "version": "1.0.88-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/XdButton/XdButton.vue

@@ -210,7 +210,6 @@
       let pageStyle = this.systemStyle || {};
       let style = await getParentsStyles(this.$parent);
       style = Object.assign({}, JSON.parse(JSON.stringify(style)) , pageStyle);
-      console.log('getPageStyles.created', style, pageStyle)
       this.btnBtnColor = {
         subPrimary: style.$subMainColor,
         primary: style.$mainColor,

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -421,8 +421,13 @@ export default {
       return time;
     },
     getList(){
+      let callThis = this;
+      // #ifdef MP
+      callThis = this.$parent;
+      // #endif
+
       //获取卡券列表
-      this.getSettleListCards((cardList) => {
+      callThis.getSettleListCards((cardList) => {
         this.$xdLog.setARMSInfo(this.filterMGinfo(cardList), 'init_binded_list');
         this.cardList = cardList;
       })
@@ -521,8 +526,15 @@ export default {
           this.cardList = this.cardList.filter(item => item.card_number != ticket.card_number);
           this.selectedCardList = this.selectedCardList.filter(item => item.card_number != ticket.card_number);
         }
+        // #ifdef MP
+        if(ticket.card_use_price) this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
+        if(ticket.card_use_point) this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
+        // #endif
+        // #ifdef H5
         this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
         this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
+        // #endif
+
         this.renderChecked = Date.now();
       }
 

package/src/components/XdCardV2/XdCardV2.vue

@@ -89,10 +89,19 @@ export default {
       }
     },
     loginStyleUI(){
+      //#ifdef MP-WEIXIN
+      return this.styleObjectToString({
+        backgroundColor:this.mainColor,
+        ...this.loginStyle
+      })
+      //#endif
+      //#ifdef H5
       return {
         backgroundColor:this.mainColor,
         ...this.loginStyle
       }
+      //#endif
+
     }
   },
   data(){

package/src/components/XdContentXss/XdContentXss.vue

@@ -81,9 +81,34 @@
         // #endif
 
         // #ifndef H5
-        this.vhtml = this.html;
+        this.vhtml = this.getMpHtml(this.html);
         // #endif
       }
+    },
+    methods:{
+      getMpHtml(html){
+        html = html.replace(/<img[^>]*>/gi, function(match, capture) {
+          match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+          match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+          match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+          return match;
+        });
+        html =  html.replace(/style="[^"]+"/gi, function(match, capture) {
+          match = match
+            .replace(/<p>/gi, '<p class="p_class">')
+            .replace(/width:[^;]+;/gi, 'max-width:100%;')
+            .replace(/width:[^;]+;/gi, 'max-width:100%;');
+          return match;
+        });
+        html =  html.replace(/<br[^>]*\/>/gi, "");
+        html =  html.replace(/<a>/gi, '<a class="a_class "');
+        html=  html.replace(/<li>/gi, '<li class="li_class "');
+        html =  html.replace(/\<p/gi, '<p class="p_class "');
+        html=  html.replace(/\<span/gi, '<span class="span_class "');
+        html =  html.replace(/<div/gi, '<div class="div_class "');
+        html =  html.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"');
+        return html;
+      }
     }
   }
 </script>

package/src/components/XdFontIcon/XdFontIcon.vue

@@ -110,7 +110,7 @@
           else {
             size = this.$isPortrait ? size : size / this.$portrait;
           }
-          
+
           temp += `font-size:${size}rpx`;
         }
         if(this.width) {
@@ -121,7 +121,7 @@
           temp += `;width:${width}rpx`;
         }
         if (this.height) {
-          let height = this.width;
+          let height = this.height;
           if (helper.checkVarType(this.height) === 'string') {
             height = Number(this.height);
           }

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/components/XdNoData/XdNoData.vue

@@ -41,7 +41,12 @@
         paddingBottom: 0,
         uiHeight: 0,
 
-        image: 'data:image/png;base64,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',
+        // #ifdef H5
+        image: '//img.jufubao.cn/common/nodata.png?v=1',
+        //#endif
+        //#ifdef MP-WEIXIN
+        image: 'https://img.jufubao.cn/common/nodata.png?v=1',
+        //#endif
       }
     },
 

package/src/components/XdNoticeBar/XdNoticeBar.vue

@@ -1,5 +1,11 @@
 <template>
-  <view v-if="show" class="uni-noticebar" :style="{ backgroundColor: uiBackgroundColor }" @click="onClick">
+  <view
+    v-if="show"
+    class="uni-noticebar"
+    :class="{isMp:isMp}"
+    :style="{ backgroundColor: uiBackgroundColor }"
+    @click="onClick"
+  >
     <!-- #ifdef MP-ALIPAY -->
     <view
       v-if="showClose === true || showClose === 'true'"
@@ -218,19 +224,24 @@
         animationDuration: 'none',
         animationPlayState: 'paused',
         animationDelay: '0s',
-        
-        
+
+
         uiColor: '', //文字颜色
         uiBackgroundColor: '', //背景颜色
+
+        isMp: false,
       }
     },
-  
+
     async created() {
       this.uiColor = await getParentsStyle(this.$parent, '$warningColor');
       if(this.isNoBgc) this.uiBackgroundColor = Color(this.uiColor).alpha(0.2).toString();
       else this.uiBackgroundColor = 'rgba(0,0,0,0)';
-      
-      
+
+      //#ifdef MP-WEIXIN
+      this.isMp = true;
+      //#endif
+
       // #ifdef APP-PLUS
       var pages = getCurrentPages();
       var page = pages[pages.length - 1];
@@ -414,6 +425,7 @@
     flex: 1;
     flex-direction: column;
     overflow: hidden;
+    width: 100%;
   }
 
   .uni-noticebar__content-wrapper--single {
@@ -521,4 +533,8 @@
       transform: translate3d(-100%, 0, 0);
     }
   }
+
+  .isMp {
+    width: 100%;
+  }
 </style>

package/src/components/XdSearchHistory/XdSearchHistory.vue

@@ -1,19 +1,21 @@
 <template>
-  <view class="xd-search-history" v-show="historyList.length">
-    <view class="header">
-      <view class="title">搜索历史</view>
-      <view v-if="isEdit" class="clear_edit">
-        <view class="clear_all" @click="clearAll">全部清空</view> | <view class="clear_comp" @click="isEdit=false">完成</view>
+  <view class="xd-search-history">
+    <template v-if="historyList.length">
+      <view class="header">
+        <view class="title">搜索历史</view>
+        <view v-if="isEdit" class="clear_edit">
+          <view class="clear_all" @click="clearAll">全部清空</view> | <view class="clear_comp" @click="isEdit=false">完成</view>
+        </view>
+        <view v-else class="clear" @click="clearHistory">清空</view>
       </view>
-      <view v-else class="clear" @click="clearHistory">清空</view>
-    </view>
-    <view class="content">
-      <view class="history_item" v-for="(item,index) in historyList" :key="index"
-        @click="handleClick(item)">
-        <view class="text">{{item}}</view>
-        <xd-font-icon v-show="isEdit" icon="icondanchuangguanbi_xian" size="18"></xd-font-icon>
+      <view class="content">
+        <view class="history_item" v-for="(item,index) in historyList" :key="index"
+          @click="handleClick(item)">
+          <view class="text">{{item}}</view>
+          <xd-font-icon v-show="isEdit" icon="icondanchuangguanbi_xian" size="18"></xd-font-icon>
+        </view>
       </view>
-    </view>
+    </template>
   </view>
 </template>
 <script>

package/src/components/XdSelect/XdSelect.vue

@@ -30,7 +30,6 @@
             width: width,
             opacity: disabled ? 0.8: 1
           }"
-
           @click="bindPickerClick(true)"
         >
           <text
@@ -39,8 +38,7 @@
               'margin': margin,
               'color': color
             }"
-          >{{getSelectName}}
-          </text>
+          >{{getSelectName}}</text>
           <view>
             <slot :status="isUp">
               <xd-font-icon
@@ -49,7 +47,6 @@
                 :color="color"
               ></xd-font-icon>
             </slot>
-
           </view>
         </view>
       </view>
@@ -225,13 +222,11 @@
       list(value) {
         if (this.mode === 'selector') this.init(value);
         if (this.mode === 'multiSelector') this.multiInit(value)
-      }
+      },
     },
-  
+
     async created() {
       this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor');
-      
-      console.log('flimTypeList', this.mode)
       this.uiColor = this.styleMainColor;
       this.uiFontSize = this.fontSize;
       if (this.borderColor) this.uiColor = this.borderColor;

package/src/components/XdWalletChose/XdWalletChose.vue

@@ -113,7 +113,12 @@
       }
     },
     created(){
-      this.getUserWalletList((res) => {
+      let callThis = this;
+      // #ifdef MP
+      callThis = this.$parent;
+      // #endif
+
+      callThis.getUserWalletList((res) => {
         console.log("getUserWalletList", res.walletList);
         this.walletList = res.list.map(item => {
           item.checked = false;
@@ -141,8 +146,12 @@
         console.log(flag);
         console.log(this.walletList);
         if(flag){
+          let callThis = this;
+          // #ifdef MP
+          callThis = this.$parent;
+          // #endif
           this.$xdShowLoading({})
-          this.useBindedWallet({
+          callThis.useBindedWallet({
             wallet_type: row.wallet_type,
             selected_wallet_list_json: JSON.stringify(this.selectedWalletList),
           }, (res) => {

package/src/install.js

@@ -39,6 +39,12 @@ const install = (Vue, options = {}) => {
    *
    */
   Vue.prototype.$xdConfirm = (obj) => {
+    //#ifdef MP-WEIXIN
+    if(obj.$vm !== undefined && helper.checkVarType(obj.$vm) === 'object') {
+      if(obj.$vm.styles)  obj['styles'] = helper.cloneDeep(obj.$vm.styles);
+      obj.$vm = null;
+    }
+    //#endif
     obj['radius'] = obj['radius'] === undefined ? '10rpx' : obj['radius'];
     store.commit('setXdInputConfirm', obj);
   };
@@ -64,6 +70,12 @@ const install = (Vue, options = {}) => {
    *
    */
   Vue.prototype.$xdAlert = (obj) => {
+    //#ifdef MP-WEIXIN
+    if(obj.$vm !== undefined && helper.checkVarType(obj.$vm) === 'object') {
+      if(obj.$vm.styles)  obj['styles'] = helper.cloneDeep(obj.$vm.styles);
+      obj.$vm = null;
+    }
+    //#endif
     obj['radius'] = obj['radius'] === undefined ? '30rpx' : obj['radius'];
     store.commit('setTips', obj);
   };

package/src/mixins/colorCardMixins.js

@@ -6,13 +6,12 @@ import getServiceUrl from "@/common/getServiceUrl";
 export default {
   data() {
     return {
-
+      colorObj : {},
     }
   },
 
   created(){
-    // console.log(this.$colorConfig)
-    // debugger
+    this.colorObj = this.$colorConfig || getApp().globalData.$colorConfig;
   },
 
   methods: {
@@ -25,13 +24,13 @@ export default {
       return result;
     },
     getCardThemes(name , disabled='N') {
-      let colorLen = this.$colorConfig.cardThemesColor.length;
-      let imgLen = this.$colorConfig.cardThemesImage.length;
+      let colorLen = this.colorObj.cardThemesColor.length;
+      let imgLen =  this.colorObj.cardThemesImage.length;
       let colorIndex = this.stringToNumber(name) % colorLen;
       let imgIndex = this.stringToNumber(name) % imgLen;
       return {
-        color: disabled === 'N' ? this.$colorConfig.cardThemesColor[colorIndex]: this.getDisabledColor(),
-        image: this.$colorConfig.cardThemesImage[imgIndex],
+        color: disabled === 'N' ?  this.colorObj.cardThemesColor[colorIndex]: this.getDisabledColor(),
+        image:  this.colorObj.cardThemesImage[imgIndex],
       }
     },
     getEntry(codes = [], allEntry = []) {
@@ -49,6 +48,60 @@ export default {
       });
       return support
     },
+
+    filterNotSupportEntry(allEntry){
+      let isH5FilterEntryList = [];
+      let isMpFilterEntryList = [];
+      allEntry =  allEntry.map(item=>{
+        try {
+          if(!item.redirect_data) item.redirect_data = null;
+          else {
+            item.redirect_data = JSON.parse(item.redirect_data);
+            item.redirect_data.appType = item.redirect_data.appType || 'h5';
+          }
+        }catch (e){
+          item.redirect_data = null
+        }
+        return item;
+      })
+        .filter(item=>{
+          //地址不存在
+          if(!item.redirect_data) return false
+
+          //#ifdef H5
+          //在H5平台应用中不可跳转到微信小程序应用
+          if(item.redirect_data.appType === 'wxmp'){
+            isH5FilterEntryList.push(item)
+          }
+          return item.redirect_data.appType !== 'wxmp';
+          //#endif
+
+          //#ifdef MP-WEIXIN
+          const dir = item['redirect_data'].dir;
+          const actDir = this.projectAttr['deploy_dir'];
+          if(item.redirect_data.appType === 'wxmp') {
+            if(dir !== actDir) isMpFilterEntryList.push(item)
+            return dir === actDir;
+          }
+          return true
+          //#endif
+
+        });
+      console.log(isH5FilterEntryList)
+      console.log(isMpFilterEntryList);
+      console.log(allEntry)
+
+      //#ifdef MP-WEIXIN
+      console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+      //#endif
+      //#ifdef H5
+      console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+      //#endif
+      console.warn(`福利入口链接列表:${JSON.stringify(allEntry.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
+
+      return allEntry
+    },
+
     getCardGroupItem(list, allEntry, disabled='N') {
       list.map(item => {
         //设置卡片样式
@@ -57,15 +110,16 @@ export default {
       });
       return list
     },
+
     getDisabledColor(){
-      return this.$colorConfig.disableColor
+      return  this.colorObj.disableColor
     },
     getMergBg(disabled = 'Y'){
-      return disabled === 'Y' ? this.$colorConfig['mergIcon'][1]
-        : this.$colorConfig['mergIcon'][0]
+      return disabled === 'Y' ?  this.colorObj['mergIcon'][1]
+        :  this.colorObj['mergIcon'][0]
     },
     getNoData(){
-      return this.$colorConfig.nodata
+      return this.colorObj.nodata
     }
   }
 }

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)) {

package/src/utils/xd.base.js

@@ -775,6 +775,30 @@ export function isQrCode($vm,isOpen=true){
   return false
 }
 
+/**
+ * @description 小驼峰，大驼峰 转 数组
+ * @param str
+ * @return {*[]}
+ */
+export function spStrToArray(str){
+  let temp=[]
+  let reg = /[A-Z]/;
+  let word = '';
+  str.split('').map((char, index) => {
+    if (index === 0) {
+      word = char.toLocaleLowerCase();
+    } else {
+      if (reg.test(char)) {
+        temp.push(word);
+        word = char.toLocaleLowerCase();
+      } else {
+        word += char;
+        if (index === (str.length - 1)) temp.push(word);
+      }
+    }
+  });
+  return temp
+}
 
 
 

package/src/utils/xdWxLog.js

@@ -66,7 +66,9 @@ class Logs {
     console.warn(`setConfig:${uid}`)
   }
 
-
+  setARMSInfo(params, eventName='default'){
+    console.log('setARMSInfo',eventName, params)
+  }
 
   checkApiHost() {
     if (typeof getApp !== 'function') return false;