jufubao-base 1.0.159 → 1.0.160-beta1

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -49,7 +49,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
-  import {base64} from 'js-base64';
+  import {mapState} from "vuex";
   export default {
     name: "JfbBaseEntry",
     components: {
@@ -66,21 +66,23 @@
         paddingInput: 20,
         loadingList: true,
         margin: {},
+        entryType: '',
       }
     },
     computed: {
+      ...mapState(['brandInfo']),
       bodyStyle(){
-        return {
+        return this.styleObjectToString({
           backgroundColor: this.bgcolor,
           minHeight: this.layoutInfo.bodyMinHeight,
-        }
+        })
       },
       entryStyle(){
-        return {
+        return this.styleObjectToString({
           gridTemplateColumns: `repeat(${this.rowNum}, 1fr)`,
           gap: this.paddingInput + 'rpx',
           padding: this.paddingInput + 'rpx'
-        }
+        })
       },
       marginUi(){
         let str = `${this.checkValue(this.margin.top, 0)}rpx`;
@@ -91,9 +93,10 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
-      }
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
     created() {
       this.init(this.container);
@@ -111,17 +114,67 @@
         this.rowNum = getContainerPropsValue(container, 'content.rowNum', 1);
         this.paddingInput = getContainerPropsValue(container, 'content.paddingInput', 20);
         this.margin = getContainerPropsValue(container, 'content.margin', {});
+        this.entryType = getContainerPropsValue(container, 'content.entryType', 'default');
+      },
+
+      getCardPath(custom_redirect_data = {}){
+        //#ifdef H5
+        return null;
+        //#endif
+        //#ifdef MP-WEIXIN
+        const dir = custom_redirect_data.dir;
+        const actDir = this.projectAttr['deploy_dir'];
+        if(custom_redirect_data.appType === 'wxmp') {
+          if(dir === actDir) {
+            return {
+              cardPath:  custom_redirect_data.path,
+              cardSelf: 'wxmp',
+            };
+          }
+          else return null;
+        }
+        else if(custom_redirect_data.appType === 'h5'){
+          return {
+            cardPath: custom_redirect_data.site_url,
+            cardSelf: 'h5',
+          };
+        }
+        else return null;
+        //#endif
       },
       getEntrySetting(){
         this.$xdShowLoading({});
         jfbRootExec("getEntrySetting", {
           vm: this,
-          data: {}
+          data: {
+            group_id:this.entryType || 'default'
+          }
         }).then(res => {
           this.loadingList = false;
           this.$xdHideLoading();
-          this.entryList = res.list.map(item => {
-            const {dir, path, host} = item['redirect_data'];
+          let isH5FilterEntryList = [];
+          let isMpFilterEntryList = [];
+          this.entryList = res.list.filter(item=>{
+            //#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
+          }).map(item => {
+            const {dir, path, host,appType} = item['redirect_data'];
+            if(appType === undefined) item.redirect_data.appType = 'h5';
             item['image_url'] = getServiceUrl(item.image_url);
             item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
             item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
@@ -139,24 +192,35 @@
             let jumpUrl = path;
 
             //域名相同并且应用路径不相同时候处理
-            if(host === this.projectAttr.host
-              && this.projectAttr['deploy_dir'] !== dir
-            ){
+            if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
               jumpUrl = `//${host}/${dir}${path}`;
               //#ifdef MP-WEIXIN
               jumpUrl = `https:${jumpUrl}`;
               //#endif
             }
 
-            if(item['redirect_data']['fixed_business_code'] === '') {
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-            }
-            else{
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+            //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+            let cardPathStr = '';
+            //#ifdef MP-WEIXIN
+            if(item.redirect_data.appType === 'h5') {
+              const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
+              const cardPathObject = this.getCardPath(custom_redirect_data);
+              if(cardPathObject !== null) {
+                const {cardPath, cardSelf} =cardPathObject
+                if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+              }
             }
+            //#endif
+            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
             return item;
           });
-          console.log( this.entryList)
+          //#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(this.entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
           if(res.list.length === 1) this.toLink(this.entryList[0]);
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})

package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetail.vue

@@ -50,14 +50,13 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -67,6 +67,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import {parsePath} from '@/utils/linkUrl'
   import XdFastNav from "./XdFastNav.vue";
   import Color from "color";
   const color = require('color');
@@ -113,8 +114,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
 
@@ -132,10 +134,10 @@
       },
 
       subNameSize(){
-        return  {
+        return  this.styleObjectToString({
           fontSize: this.fontSubSize + 'rpx',
           color: this.subColor
-        }
+        })
       }
     },
 
@@ -185,24 +187,33 @@
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
-        this.listNave = this.list.map(item=>{
-          const {appValue,path} = item.path
-          if(appValue === undefined && path === undefined) {
-            return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
-          }
-          else{
-            const {dir,fixed_business_code} = item.path;
-            let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
-            if(bus) bus = `?x-common=${bus}`;
-            let jumpUrl = '';
-            //#ifdef H5
-            if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
-            else jumpUrl = path;
-            //#endif
-            jumpUrl = `${jumpUrl}${bus}`;
-            return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
-          }
-        })
+        if(this.is_layout === 'fixed') {
+          this.listNave = this.list.map(item=>{
+            let {appValue,path} = item.path
+            if(appValue === '0') {
+              return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
+            }
+            else{
+              const {dir,fixed_business_code} = item.path;
+              let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
+              if(bus) bus = `?x-common=${bus}`;
+              let jumpUrl = '';
+              //#ifdef H5
+              if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
+              else jumpUrl = path;
+              //#endif
+
+              //#ifdef MP-WEIXIN
+              const pathObj = parsePath(path);
+              if(pathObj.isSameApp) jumpUrl = pathObj.url;
+              else jumpUrl =  `https://${this.projectAttr.host}/${pathObj.dir}${pathObj.url}`;
+              //#endif
+
+              jumpUrl = `${jumpUrl}${bus}`;
+              return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
+            }
+          });
+        }
 
       },
     }

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -10,7 +10,7 @@
     <view class="xd-fast-nave__body">
       <view class="xd-fast-nave__body-close" v-if="close" @click="close=false">
         <xd-font-icon icon="iconjiantou_zuo" color="#fff" size="30"></xd-font-icon>
-        <view>{{fastName}}</view>
+        <view v-if="0">{{fastName}}</view>
       </view>
       <view class="xd-fast-nave__body-open" v-else @click="close=true">
         <xd-font-icon icon="iconjiantou_you" color="#fff" size="30"></xd-font-icon>
@@ -23,7 +23,7 @@
           :key="index"
           @click="handleClick(item)"
         >
-          <view>
+          <view v-if="item.icon">
             <xd-font-icon v-if="item.icon" :icon="item.icon" size="34"  :color="color"></xd-font-icon>
           </view>
           <view :style="{color: color}">{{item.name}}</view>

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -64,7 +64,6 @@
       container(value,oloValue) {
         if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
         if (this.$configProject['isPreview']){
-          debugger
           this.init(value);
           this.getNumber();
           this.footerBarKey = this.$xdUniHelper.randomChar(20);

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -144,8 +144,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -39,8 +39,7 @@
             type="primary"
             radius="20rpx"
             @click="doWxMpLogin"
-            >快捷登录</xd-button
-          >
+            >快捷登录</xd-button>
           <!-- #endif -->
           <view class="login-pub">
             <xd-button
@@ -51,7 +50,6 @@
               @click="doLoginAccount"
               >账号登录</xd-button>
           </view>
-
           <view class="protocol">
             <xd-form-checkbox
               class="xd-form-checkbox"
@@ -61,7 +59,7 @@
               :localdata="[{ value: 1, text: '请阅读并同意《隐私政策》《用户服务协议》' },]"
             >
               <template slot="a1">
-                <view>
+                <view class="text-content">
                   <text>请阅读并同意</text>
                   <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                   <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -90,7 +88,7 @@
         </view>
         <view style="margin-top: 40rpx">
           <xd-form
-            label-width="130"
+            label-width="150"
             label-align="right"
             content-align="left"
             :border="true"
@@ -145,7 +143,7 @@
             :localdata="[{ value: 1, text: '登录即同意《隐私政策》《用户服务协议》' },]"
           >
             <template slot="a1">
-              <view>
+              <view class="text-content">
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -167,8 +165,7 @@
           v-if="accountLoginType === 'pwd'"
           class="forget_password"
           @click="toValidPhone"
-          >忘记密码</view
-        >
+        >忘记密码</view>
       </view>
       <view  class="bottom_btn" :style="prod_bottom" v-if="isPreview === 'Y' || isDebugPreview">
         <view
@@ -225,6 +222,10 @@ import {
 } from "@/utils/xd.base";
 
 export default {
+  // #ifdef MP-WEIXIN
+  options: { styleIsolation: 'shared' },
+  // #endif
+
   name: "JfbBaseLogin",
   components: {
     XdFontIcon,
@@ -305,8 +306,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     "accountForm.verification_code"(value){
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -695,7 +697,7 @@ export default {
           content: "请阅读并勾选读用户协议与隐私协议",
           cancel: false,
           confirmText: "我知道了",
-          $vm: this,
+          styles: this.styles,
         });
         return;
       }
@@ -1011,5 +1013,20 @@ export default {
   }
 }
 
+/* #ifdef MP-WEIXIN */
+/deep/ .xd-form-checkbox .checklist-group {
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+.text-content {
+  width: 100%;
+  & > text {
+    font-size: 26rpx;
+  }
+}
+/* #endif */
+
+
 
 </style>

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -13,21 +13,17 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-login-forget-pwd__body">
       <view class="panel-forget-password">
         <view class="form-group" style="padding-top: 60rpx;padding-bottom: 40rpx;">
           <view style="font-size: 36rpx;color: #333;">请输入手机号</view>
-          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx"
-            >为了您的账号安全，请先验证手机号</view
-          >
+          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx">为了您的账号安全，请先验证手机号</view>
         </view>
         <xd-form
-          label-width="130"
+          label-width="170"
           label-align="right"
           content-align="left"
           :border="true"
@@ -117,8 +113,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     "resetForm.verification_code"(value) {
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -231,6 +228,7 @@ export default {
       color: @xd-base-color;
       font-size: 24rpx;
       margin-right: unit(20,rpx);
+      flex-shrink: 0;
     }
     .panel-forget-password {
       /deep/ .uni-forms-item__label {

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -25,7 +25,7 @@
           <view style="font-size:26rpx;color:#999;margin-top:20rpx;">请输入{{pwd_type_text}}并牢记</view>
         </view>
         <xd-form
-          label-width="130"
+          label-width="170"
           label-align="right"
           content-align="left"
           :border="true"
@@ -77,10 +77,13 @@
   import XdForm from "@/components/XdForm/XdForm";
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
-  
-  
+
+
   export default {
     name: "JfbBaseLoginSetPwd",
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     components: {
       XdFontIcon,
       XdFormItem,
@@ -99,7 +102,6 @@
         },
         success_url: "",
         pwd_type: "", //设置密码 1， 重设密码 2
-        //todo
       }
     },
     computed: {
@@ -108,8 +110,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -20,7 +20,7 @@
         <iframe frameborder="0" v-if="iframe" :src="iframe" class="jfb-base-map-overlay__body-iframe"></iframe>
         <xd-baidu-overlay v-else :defaultOverlays="overlays" :level="11"></xd-baidu-overlay>
       </template>
-      
+
       <!-- #endif -->
       <!-- #ifdef MP -->
       <xd-map-overlay :defaultOverlays="overlays" :level="11"></xd-map-overlay>
@@ -76,8 +76,9 @@
       })
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {
@@ -111,7 +112,20 @@
         }).then(res => {
           //iframe
           if(res['is_ifream'] === 'Y') {
+            // #ifdef MP
+            if(!res.url){
+              return uni.showToast({
+                title: 'URL不存在',
+                duration: 2000
+              });
+            }
+            this.$xdUniHelper.redirectTo({
+              url: url,
+            })
+            // #endif
+            // #ifdef H5
             this.iframe = res.url
+            // #endif
           }
           else{
             this.overlays = res.data;
@@ -203,7 +217,7 @@
       onJfbBack(options) {
 			  this.$xdUniHelper.navigateBack()
       },
-      
+
     }
   }
 
@@ -215,7 +229,7 @@
   .jfb-base-map-overlay {
     &__body{
       width: 750rpx;
-      
+
       &-iframe {
         height: 100%;
         width: 100%;