jufubao-base 1.0.158 → 1.0.159-beta2

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -24,7 +24,7 @@
       <view
         class="card-list"
         :style="{
-           background: headerBg['color'],
+            background: headerBg['color'],
             backgroundSize: '100%'
           }">
         <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
@@ -74,21 +74,17 @@
           <view>转换后预估票券额度</view>
         </view>
         <view
-          :class="
-            item.key === 'other_card_point'
-              ? 'jfb-base-card-shift-entry__body-content-special'
-              : 'jfb-base-card-shift-entry__body-content-item'
-          "
+          :class=" item.key === 'other_card_point'? 'jfb-base-card-shift-entry__body-content-special': 'jfb-base-card-shift-entry__body-content-item'"
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
           <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
-            {{ info[item.key] }}
+            <text>{{ info[item.key] }}</text>
             <text>点</text>
           </view>
           <view style="color: #333; font-weight: 500" v-else>
-            {{ info[item.key] }}
+            <text>{{ info[item.key] }}</text>
             <text v-if="item.type === 'type'">券</text>
           </view>
         </view>
@@ -109,9 +105,8 @@
         <xd-button
           @click="handleChange"
           width="500rpx"
-          type="primary">
-          转换
-        </xd-button>
+          type="primary"
+        >立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -132,12 +127,13 @@
             <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
           </view>
           <view class="jfb-base-card-shift-entry__body-success-content">
-            已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为
-            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>可在券包中查看
+            <text>已成功将</text>
+            <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>
+            <text>转换成为</text>
+            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>
+            <text>可在券包中查看</text>
           </view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink"
-          >返回列表</xd-button
-          >
+          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
         </view>
       </xd-dailog>
     </view>
@@ -196,7 +192,8 @@ export default {
       //页面跳转地址
       backUrl: "",
       bottomHeight: 120,
-      changeBg: ''
+      changeBg: '',
+      headerBg:'',
     };
   },
   computed: {
@@ -219,7 +216,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {
@@ -591,7 +588,7 @@ export default {
     .fixe_bottom{
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      justify-content: center;
       height: unit(100, rpx);
       padding: 0 unit(40, rpx);
       background: #FFF;

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -114,8 +114,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)
     },
   },
   computed: {

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -82,22 +82,13 @@
               </view>
               <view class="jfb-base-card__body-card-item-right-bottom">
                 <view class="jfb-base-card__body-card-item-right-bottom-info">
-                  <view
-                    class="jfb-base-card__body-card-item-right-bottom-info-residue"
-                  >
-                    剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}
-                  </view>
-                  <view
-                    class="jfb-base-card__body-card-item-right-bottom-info-deduction"
-                  >
-                    购买其他物品可抵：{{ item.other_card_point }}
-                  </view>
+                  <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
+                  <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
                 </view>
                 <view
                   @click.stop="toDetail(item)"
                   :style="{ background: mainColor }"
-                  >查看</view
-                >
+                >查看</view>
               </view>
             </view>
           </view>
@@ -106,8 +97,14 @@
       <view :style="{height:'128rpx'}"></view>
       <view class="bottom_fix" :style="button_bottom">
         <view>
+          <!-- #ifdef MP-WEIXIN-->
+          <view><xd-button type="primary" @click="toBindCard">绑定新卡</xd-button></view>
+          <view><xd-button type="primary" @click="toOrderList">我的订单</xd-button></view>
+          <!-- #endif-->
+          <!-- #ifdef H5-->
           <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
           <xd-button type="primary" @click="toOrderList">我的订单</xd-button>
+          <!-- #endif-->
         </view>
       </view>
     </view>
@@ -123,6 +120,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
+  import {mapState} from "vuex";
 
   export default {
     name: "JfbBaseCardV2",
@@ -137,6 +135,7 @@
       return {
         cardList: [],
         inCallback: "",
+
         //面板
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
@@ -154,11 +153,14 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
-      }
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
     computed: {
+      ...mapState(['jfbAuthorize']),
+
       button_bottom() {
         return this.fixedStyle({paddingBottom: 0, zIndex: 111})
       },
@@ -204,6 +206,7 @@
           }).filter((item) => item["is_valid"] === "Y");
         })
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -215,6 +218,7 @@
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
       },
+
       handleBindLogin(item){
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
@@ -222,8 +226,8 @@
           data: { card_number: item["card_number"] },
         })
           .then((res) => {
-            console.log(res);
             this.$xdHideLoading();
+
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
@@ -232,13 +236,16 @@
 
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            } else {
+            }
+            else {
+              console.warn(`handleBindLogin: ${this.inCallback}`);
               this.$xdUniHelper.redirectTo({
                 url: this.inCallback,
               });
             }
           })
           .catch((res) => {
+            console.error(res);
             this.$xdHideLoading();
           });
       },
@@ -284,13 +291,22 @@
         box-shadow: 0px 0px 8rpx 0px rgba(179, 193, 196, 0.5);
         z-index: 111;
 
-        &>view {
+        & > view {
           width: 100%;
           display: flex;
           justify-content: center;
           align-items: center;
           padding: unit(24, rpx);
           box-sizing: border-box;
+
+          /* #ifdef MP-WEIXIN */
+          & > view {
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          /* #endif */
         }
       }
     }

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -51,6 +51,8 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
+  import {mapState} from "vuex";
+
   export default {
     name: "JfbBaseCardV3",
     components: {
@@ -77,11 +79,13 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
-      }
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
     computed: {
+      ...mapState(['jfbAuthorize']),
       button_bottom() {
         return this.fixedStyle({paddingBottom: 24, zIndex: 111})
       },
@@ -140,12 +144,7 @@
         })
       },
       toDetail(item) {
-        this.$xdUniHelper.navigateTo(
-          {
-            url: `${this.detailUrl}?card_number=${item["card_number"]}`,
-          },
-          false
-        );
+        this.$xdUniHelper.navigateTo({url: `${this.detailUrl}?card_number=${item["card_number"]}`,}, false);
       },
       /**
        * @description 已绑定卡登录
@@ -175,10 +174,11 @@
               this.$xdHideLoading();
               //#ifdef MP-WEIXIN
               if (this.jfbAuthorize !== null) {
-                this.jfbAuthorize.setCardToken(res);
+                this.jfbAuthorize.setCardToken(res, null);
               }
               //#endif
-
+              console.log(this.inCallback);
+              debugger
               if (this.$configProject.isPreview) {
                 console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
               } else {
@@ -190,9 +190,9 @@
             .catch((res) => {
               this.$xdHideLoading();
             });
-        } else {
-          this.$xdUniHelper.navigateTo(
-            {
+        }
+        else {
+          this.$xdUniHelper.navigateTo({
               url: `${this.changeUrl}?card_number=${item["card_number"]}`,
             },
             false

package/src/components/JfbBaseCity/JfbBaseCity.vue

@@ -44,8 +44,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)
     }
   },
   created() {

package/src/components/JfbBaseClear/JfbBaseClear.vue

@@ -54,8 +54,9 @@
       ...mapState(['jfbAuthorize']),
     },
     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/JfbBaseConList/JfbBaseConList.vue

@@ -203,8 +203,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)
     },
   },
   created() {

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -194,8 +194,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)
     },
   },
   created() {

package/src/components/JfbBaseEntry/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryType',
+        value: data['entryType'],
+        placeholder: '请选择综合入口类型',
+        multiple: false,
+        groupKey:'content',
+        className: 'input50',
+        rules: [
+          {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+        ],
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: '每行显示数量',
         ele: 'xd-radio',

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,9 +66,11 @@
         paddingInput: 20,
         loadingList: true,
         margin: {},
+        entryType: '',
       }
     },
     computed: {
+      ...mapState(['brandInfo']),
       bodyStyle(){
         return {
           backgroundColor: this.bgcolor,
@@ -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)
       }
     },
 
@@ -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);