jufubao-base 1.0.158-beta4 → 1.0.159-beta1

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -160,7 +160,7 @@ export default {
     },
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗",
         title: "系统提示",
         width: "80%",

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -11,7 +11,7 @@
       v-if="isEditx && active"
     >
       <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit"
-        >删除</view
+      >删除</view
       >
     </view>
     <!-- #endif -->
@@ -178,7 +178,7 @@ export default {
       return this.fixedStyle({height: 0, zIndex: 111});
     },
     emptyBg() {
-        return this.getNoData();
+      return this.getNoData();
     },
   },
   watch: {
@@ -195,7 +195,6 @@ export default {
       this.getCardList();
     },
 
-
     getCardList() {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
@@ -226,7 +225,7 @@ export default {
 
     handleAllUnBindCard(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定所有票券吗？",
         title: "系统提示",
         width: "80%",
@@ -259,7 +258,7 @@ export default {
 
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗？",
         title: "系统提示",
         width: "80%",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -76,6 +76,7 @@
           :style="{ background: noticeBackgroundColor }"
         >
           <xd-notice-bar
+            style="width: 100%"
             :showIcon="true"
             :scrollable="true"
             :speed="20"

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -37,15 +37,13 @@
               :placeholder="card_pwd_placeholder"
             />
             <xd-font-icon
-              @click="isPassword = !isPassword"
+              @click="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
           </view>
         </view>
         <view class="jfb-base-card-info__body-footer" :style="prod_bottom">
-          <xd-button type="primary" width="360rpx" @click="handleGetInfo"
-            >确认</xd-button
-          >
+          <xd-button type="primary" width="360rpx" @click="handleGetInfo">确认</xd-button>
         </view>
       </view>
 
@@ -53,7 +51,7 @@
         <view>
           <view
             class="jfb-base-card-info__body-info"
-            v-for="(item, index) in valueKey"
+            v-for="(item, index) in showValueKey"
             :key="index"
           >
             <view class="jfb-base-card-info__body-info-label">{{item.label}}</view>
@@ -78,15 +76,12 @@
               <view
                 v-if="info.other_card_point && info.card_point_type !== 1"
                 class="jfb-base-card-info__body-residue-reach"
-                >购买其他物品可抵：{{ info.other_card_point }}</view
-              >
+              >购买其他物品可抵：{{ info.other_card_point }}</view>
             </view>
             <view
               class="jfb-base-card-info__body-residue-business"
               v-if="info.card_point_type !== 1"
-            >
-              所属业务线：{{ info.main_business_code_name }}
-            </view>
+            >所属业务线：{{ info.main_business_code_name }}</view>
           </view>
           <view :style="{ height: '100rpx' }"></view>
         </view>
@@ -129,18 +124,10 @@ export default {
           label: "票券号码",
           key: "card_number",
         },
-        // {
-        //   label: "票券类型",
-        //   key: "unit",
-        // },
         {
           label: "票券状态",
           key: "card_status_name",
         },
-        // {
-        //   label: "票券转换",
-        //   key: "is_exchange_name",
-        // },
         {
           label: "有效期",
           key: "end_time",
@@ -175,10 +162,19 @@ export default {
         return this.is_show_balance === "Y";
       }
       return true;
+    },
+    showValueKey(){
+      if(this.info && this.info.is_expired === "Y"){
+        return this.valueKey.filter(item => item.key !== "end_time");
+      }
+      return this.valueKey;
     }
   },
   created() {},
   methods: {
+    handleIcon(){
+      this.isPassword = !this.isPassword
+    },
     toShowCouponDialog(){
       if(this.info){
         jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
@@ -250,7 +246,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',
@@ -287,6 +283,12 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
+      //#ifdef MP-WEIXIN
+      if(options.qrcode) {
+        this.qrcode = decodeURIComponent(options.qrcode);
+      }
+
+      //#endif
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -194,7 +194,7 @@ export default {
     handleToLink() {
       if(this.info.card_point===0) {
         this.$xdConfirm({
-        $vm: this,
+          styles: this.styles,
         content: "票券余额为0，是否确认绑定?",
         width: "80%",
         success: (res) => {
@@ -269,7 +269,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',
@@ -308,6 +308,9 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
+      //#ifdef MP-WEIXIN
+      this.qrcode = decodeURIComponent(options.qrcode);
+      //#endif
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -203,7 +203,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `转出卡号：${
           this.mergeForm.from_card_number
         }(剩余点数:${this.$xdUniHelper.divisionFloatNumber(

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -40,13 +40,14 @@
           </view>
         </view>
         <view class="merge-item" :style="{background: themeInStyle['color']}">
-          <view class="merge-item-box" :style="{backgroundImage: `url(${themeInStyle})`}">
-            <view class="merge-item-title">
+          <view class="merge-item-box" :style="{backgroundImage: `url(//img.jufubao.cn/component/card/mergbg.jpg)`}">
+            <view class="merge-item-title" :style="{background: themeOutStyle['color']}">
               <xd-font-icon icon="iconzhuanru"></xd-font-icon>
               <view>转入的票券</view>
             </view>
             <view>
               <xd-select
+                v-if="toListLoading"
                 :disabled="toList.length === 0"
                 :key="randomKey"
                 :height="66"
@@ -88,10 +89,11 @@
       <view class="bottom_btn-mask"></view>
       <view class="bottom_btn" :style="prod_bottom">
         <xd-button
+          v-if="btnLoading"
           :key="disabledKey"
           :disabled="disabled"
           @click="handleToSubmit"
-          width="90%"
+          style="width: 90%"
           :type="disabled ?'info': 'primary'"
         >合并</xd-button>
       </view>
@@ -137,9 +139,11 @@ export default {
       toList: [],
       fromSelect: null,
       toSelect: null,
-      randomKey: Date.now(),
+      randomKey:'randomKey',
       valid_code:'',
       valid_token: 'valid_token',
+      toListLoading: true,
+      btnLoading: true,
 
 
       content: "",
@@ -178,7 +182,10 @@ export default {
     },
 
     disabled(){
-      this.disabledKey = Date.now();
+      this.btnLoading = false;
+      setTimeout(()=>{
+        this.btnLoading = true;
+      },10)
       return this.fromSelect === null || this.toSelect === null;
     },
   },
@@ -194,7 +201,6 @@ export default {
     this.switchValidToken();
     this.validImageAPIUrl = this.brandInfo["api_host"] + "/common/v1/valid_code/image/show";
     this.contentBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
-
   },
   methods: {
     onJfbLoad(options) {
@@ -251,14 +257,6 @@ export default {
     },
 
     handleToSubmit() {
-      // if (!this.valid_code) {
-      //   uni.showToast({
-      //     title: "验证码不能为空！",
-      //     icon: "none",
-      //   });
-      //   return;
-      // }
-
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
       let inPrice = this.$xdUniHelper.divisionFloatNumber(this.toSelect.card_point, 100);
@@ -266,7 +264,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并票券",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `<div class="label-value"><div><span>转出票券：</span><span>${outHtml}</span></div><div><span>转入票券：</span><span>${inHtml}</span></div></div>`,
         success: (action) => {
           let params = {
@@ -295,6 +293,8 @@ export default {
       });
     },
     handleChangeFrom(select) {
+      this.toListLoading = false;
+      this.randomKey = null;
       this.fromSelect = select.item;
       jfbRootExec("toCardListEntry", {vm: this, data: {card_number: select.item.value,},})
         .then((res) => {
@@ -308,7 +308,11 @@ export default {
               name: item.card_type_name
             };
           });
-          this.randomKey = Date.now();
+          this.randomKey = this.$xdUniHelper.randomChar(20);
+          setTimeout(()=>{
+            this.toListLoading = true;
+          },50)
+
         })
         .catch((err) => {
           this.$xdLog.catch(err)

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -159,7 +159,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -219,7 +219,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -20,7 +20,7 @@
         <view>
           <view
             class="jfb-base-card-sweep-info__body-info"
-            v-for="(item, index) in valueKey"
+            v-for="(item, index) in showValueKey"
             :key="index"
           >
             <view class="jfb-base-card-sweep-info__body-info-label">{{item.label}}</view>
@@ -129,6 +129,12 @@ export default {
         return this.is_show_balance === "Y";
       }
       return true;
+    },
+    showValueKey(){
+      if(this.info.is_expired === "Y"){
+        return this.valueKey.filter(item => item.key !== "end_time");
+      }
+      return this.valueKey;
     }
   },
   created() {

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/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,
@@ -111,17 +113,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 +191,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: '当前票券暂无支持服务'})