jufubao-base 1.0.238-beta1 → 1.0.238-beta67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.238-beta1",
+  "version": "1.0.238-beta67",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -183,7 +183,7 @@
                       :style="{marginRight: '18rpx'}"
                       :color="mainColor"
                     ></xd-font-icon>
-                    <view class="card_name_text">{{ item.card_type_name }}</view>
+                    <view class="card_name_text">{{ item.card_type_name }}-{{item.entries.length}}</view>
                   </view>
                   <view>
                     <view>{{ item.card_number }}{{showIndex?(':' + index):''}}</view>
@@ -564,8 +564,9 @@ export default {
      * @param item
      */
     handleBindLogin(item) {
+      if(this.$configProject.isPreview) return;
+      //普通卡
       if (this.tabIndex === 1) {
-
         //无效卡
         if (item["is_valid"] !== "Y") {
           console.log(
@@ -576,6 +577,8 @@ export default {
           );
           return;
         }
+
+        //正常卡券
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
           vm: this,
@@ -587,32 +590,30 @@ export default {
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
-              // this.jfbAuthorize.setToken("card", res["card_token"], {
-              //   expires: res["card_expire_in"] / 60 / 60,
-              // });
             }
             //#endif
 
-            if (this.$configProject.isPreview) {
-              console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            } else {
-              this.$xdUniHelper.redirectTo({
-                url: this.inCallback,
-              });
+            //单业务线卡券直接跳转到业务线
+            if(item.entries.length ===1) {
+              this.handleOneBussClick(item.entries[0]);
+              return
             }
+
+            //其他情况
+            this.$xdUniHelper.redirectTo({
+              url: this.inCallback,
+            });
           })
           .catch((res) => {
             this.$xdHideLoading();
           });
-      } else {
-        this.$xdUniHelper.navigateTo(
-          {
-            url: `${this.changeUrl}?card_number=${item["card_number"]}`,
-          },
-          false
-        );
+      }
+      //转移卡券
+      else {
+        this.$xdUniHelper.navigateTo({url: `${this.changeUrl}?card_number=${item["card_number"]}`}, false);
       }
     },
+
     toDetail(item) {
       this.$xdUniHelper.navigateTo(
         {
@@ -652,7 +653,7 @@ export default {
       if(this.show_coupon_tab === 'Y'){
         params.show_type = this.show_type;
       }
-      if(this.entryGroupId && this.show_type === 'normal') params['group_id'] = this.entryGroupId;
+      if(this.entryGroupId) params['group_id'] = this.entryGroupId;
       this.$xdShowLoading({});
       jfbRootExec("getListCardBind", {
         vm: this,
@@ -674,12 +675,18 @@ export default {
               ),
             };
           });
+
+          //过滤入口配置
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           this.cardList = res.list.filter((item,index) => {
             return item["is_valid"] === "Y";
           }).map((item,index)=>{
             item['index'] = index;
+            item['entries'] = this.getEntry(item['business_codes'], res['site_entry_settings'])
             return item
           });
+
           console.warn(`cardList:${this.cardList.length}`)
           this.disableList = res.list.filter((item) => {
             return item["is_valid"] === "N";
@@ -690,7 +697,6 @@ export default {
           })
           console.warn(`changeList:${this.changeList.length}`)
           this.showList = this.getPageCardContent(this.cardList);
-          // this.showList = []
           if(this.hasContent) this.offsetIndex++;
           this.$xdHideLoading();
         })

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -812,68 +812,69 @@ export default {
     },
 
     handleClick(entry){
-      if (this.$configProject['isPreview']) return;
-
-      //登陆成功，有回调地址返回回调地址
-      if(this.inCallbackUrlOrg) {
-        this.$xdUniHelper.redirectTo({
-          url:this.inCallback
-        }, false);
-        return;
-      }
-
-      const {dir, path, host, appType} = entry['redirect_data'];
-      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
-      let regSp = /(-apiuri\/v)/;
-
-      if(!appType) entry.redirect_data.appType = 'h5';
-      let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
-
-      //外站配置地址
-      if(entry.redirect_type === 'URL') {
-        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
-          let urlPath = entry.redirect_data['path'];
-          if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
-          else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
-          this.$xdUniHelper.redirectTo({
-            url:urlPath
-          }, false)
-        }
-        else {
-          console.error(`配置错误：${entry.redirect_data['path']}`);
-          throw new Error(`配置错误：${entry.redirect_data['path']}`)
-        }
-        return
-      }
-
-      //站内应用处理
-      let jumpUrl = path;
-      let cardPathStr = '';
-      const {deploy_dir} = this.projectAttr;
-      if(host === this.projectAttr.host && deploy_dir !== dir){
-        jumpUrl = `//${host}/${dir}${path}`;
-        //#ifdef MP-WEIXIN
-        jumpUrl = `https:${jumpUrl}`;
-        //#endif
-      }
-
-
-      //#ifdef MP-WEIXIN
-      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
-      if(entry.redirect_data.appType === 'h5') {
-        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['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
-
-      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
-      console.warn(`entry.path:${jumpUrl}`);
-      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
-      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
+      this.handleOneBussClick(entry);
+      // if (this.$configProject['isPreview']) return;
+      //
+      // //登陆成功，有回调地址返回回调地址
+      // if(this.inCallbackUrlOrg) {
+      //   this.$xdUniHelper.redirectTo({
+      //     url:this.inCallback
+      //   }, false);
+      //   return;
+      // }
+      //
+      // const {dir, path, host, appType} = entry['redirect_data'];
+      // let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      // let regSp = /(-apiuri\/v)/;
+      //
+      // if(!appType) entry.redirect_data.appType = 'h5';
+      // let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
+      //
+      // //外站配置地址
+      // if(entry.redirect_type === 'URL') {
+      //   if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+      //     let urlPath = entry.redirect_data['path'];
+      //     if(urlPath.indexOf('?') === -1) urlPath = `${urlPath}?x-common=${nsp}&vs=${new Date().getTime()}`;
+      //     else urlPath = `${urlPath}&x-common=${nsp}&vs=${new Date().getTime()}`;
+      //     this.$xdUniHelper.redirectTo({
+      //       url:urlPath
+      //     }, false)
+      //   }
+      //   else {
+      //     console.error(`配置错误：${entry.redirect_data['path']}`);
+      //     throw new Error(`配置错误：${entry.redirect_data['path']}`)
+      //   }
+      //   return
+      // }
+      //
+      // //站内应用处理
+      // let jumpUrl = path;
+      // let cardPathStr = '';
+      // const {deploy_dir} = this.projectAttr;
+      // if(host === this.projectAttr.host && deploy_dir !== dir){
+      //   jumpUrl = `//${host}/${dir}${path}`;
+      //   //#ifdef MP-WEIXIN
+      //   jumpUrl = `https:${jumpUrl}`;
+      //   //#endif
+      // }
+      //
+      //
+      // //#ifdef MP-WEIXIN
+      // //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      // if(entry.redirect_data.appType === 'h5') {
+      //   const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['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
+      //
+      // jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      // console.warn(`entry.path:${jumpUrl}`);
+      // if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      // else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
 
     toDetail(item, out=true) {

package/src/components/JfbBaseCardV2/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryGroupId',
+        value: data.entryGroupId || 'default',
+        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: 'el-input',

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -183,7 +183,8 @@
         inCallbackUrlOrg:'',//是否带有回调地址
         buy_new_url: '',
         isShowBuy: "",
-        buy_name: ""
+        buy_name: "",
+        entryGroupId:'default'
       }
     },
     watch: {
@@ -231,9 +232,15 @@
           }
         }
         this.inCallback = inCallback || this.settings.index;
+
         this.getList();
       },
 
+      onJfbShow(options) {
+        this.cardList = [];
+        this.onJfbLoad(options);
+      },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -251,40 +258,51 @@
         this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
         this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
         this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
+        this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
       },
+
       getList(){
         let options = this.options;
-        let params = {is_all: 'Y'};
+        let params = {is_all: 'Y',is_show_entry_settings: 'Y'};
         if (options['jfb_business_code']) {
           params['card_business_code'] = options['jfb_business_code'];
         }
         if(this.show_coupon_tab === 'Y'){
           params.show_type = this.show_type;
         }
-
+        if(this.entryGroupId) params['group_id'] = this.entryGroupId;
         jfbRootExec("getListCardBind", {
           vm: this,
           data: params,
         }).then((res) => {
           this.loadingCardList = false;
+          //过滤入口配置
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           this.cardList = res.list.map((item) => {
             item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);
             item['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(item.other_card_point,100);
+            item['entries'] = this.getEntry(item['business_codes'], res['site_entry_settings'])
             return item;
           }).filter((item) => item["is_valid"] === "Y");
         })
       },
+
       switchShowType(type){
         this.show_type = type;
+        this.getList();
       },
+
       handleBindLogin(item){
+        if(this.$configProject.isPreview) return;
+
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
           vm: this,
           data: { card_number: item["card_number"] },
         })
-          .then((res) => {
-            this.$xdHideLoading();
+          .then(async (res) => {
+            await this.$xdHideLoading();
 
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
@@ -292,21 +310,23 @@
             }
             //#endif
 
-            if (this.$configProject.isPreview) {
-              console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            }
-            else {
-              console.warn(`handleBindLogin: ${this.inCallback}`);
-              this.$xdUniHelper.redirectTo({
-                url: this.inCallback,
-              });
+            //单业务线卡券直接跳转到业务线
+            if(item.entries.length ===1) {
+              this.handleOneBussClick(item.entries[0]);
+              return
             }
+
+            //其他情况
+            this.$xdUniHelper.redirectTo({
+              url: this.inCallback,
+            });
           })
           .catch((res) => {
             console.error(res);
             this.$xdHideLoading();
           });
       },
+
       toBindCard(){
         let path = this.getUrlCallback(this.cardBindPath)
         this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseCardV3/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryGroupId',
+        value: data.entryGroupId || 'default',
+        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: 'el-input',

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -39,7 +39,8 @@
             @bindLogin="handleBindLogin(item)"
             ></xd-card-v2>
         </view>
-        <view v-else class="empty_data">暂时没有票券 
+        <view v-else class="empty_data">
+          <view>暂时没有票券</view>
           <view v-if="isShowBuy==='Y'" class="buy_new" @click="toBuyNew" :style="{color: mainColor}"><view>{{buy_name}}</view> <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon></view>
         </view>
       </template>
@@ -62,6 +63,7 @@
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
   import {mapState} from "vuex";
+  import colorCardMixins from "@/mixins/colorCardMixins";
 
   export default {
     name: "JfbBaseCardV3",
@@ -72,7 +74,7 @@
       XdCardV2Skeleton
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBaseCardV3Mixin
+      componentsMixins, extsMixins, JfbBaseCardV3Mixin,colorCardMixins
     ],
     data() {
       return {
@@ -92,7 +94,8 @@
         inCallbackUrlOrg:'',//是否带有回调地址
         buy_new_url: '',
         isShowBuy: "",
-        buy_name: ""
+        buy_name: "",
+        entryGroupId:'default'
       }
     },
     watch: {
@@ -130,6 +133,7 @@
 
         this.getList();
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -145,30 +149,37 @@
         this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
         this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
       },
+
       getList(){
         let options = this.options;
-        let params = {is_all: 'Y'};
+        let params = {is_all: 'Y',is_show_entry_settings: 'Y'};
         if (options['jfb_business_code']) {
           params['card_business_code'] = options['jfb_business_code'];
         }
         if(this.show_coupon_tab === 'Y'){
           params.show_type = this.show_type;
         }
-
+        if(this.entryGroupId) params['group_id'] = this.entryGroupId;
         jfbRootExec("getListCardBind", {
           vm: this,
           data: params,
         }).then((res) => {
           this.loadingCardList = false;
+
+          //过滤入口配置
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           this.cardList = res.list.map((item) => {
             item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);
             item['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(item.other_card_point,100);
+            item['entries'] = this.getEntry(item['business_codes'], res['site_entry_settings'])
             return item;
           }).filter((item) => item["is_valid"] === "Y");
         });
       },
       switchShowType(type){
         this.show_type = type;
+        this.getList();
       },
       toBindCard(){
         let path = this.getUrlCallback(this.cardBindPath)
@@ -189,9 +200,9 @@
        * @param item
        */
       handleBindLogin(item) {
-        if (this.tabIndex === 1) {
-          console.log("bindCardLogin", this.inCallback);
+        if(this.$configProject.isPreview) return;
 
+        if (this.tabIndex === 1) {
           //无效卡
           if (item["is_valid"] !== "Y") {
             console.log(
@@ -207,38 +218,38 @@
             vm: this,
             data: { card_number: item["card_number"] },
           })
-            .then((res) => {
-              console.log(res);
-              this.$xdHideLoading();
+            .then(async (res) => {
+              await this.$xdHideLoading();
+
               //#ifdef MP-WEIXIN
               if (this.jfbAuthorize !== null) {
                 this.jfbAuthorize.setCardToken(res, null);
               }
               //#endif
-              console.log(this.inCallback);
-              debugger
-              if (this.$configProject.isPreview) {
-                console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-              } else {
-                this.$xdUniHelper.redirectTo({
-                  url: this.inCallback,
-                });
+
+              //单业务线卡券直接跳转到业务线
+              if(item.entries.length ===1) {
+                this.handleOneBussClick(item.entries[0]);
+                return
               }
+
+              //其他情况
+              this.$xdUniHelper.redirectTo({
+                url: this.inCallback,
+              });
             })
             .catch((res) => {
               this.$xdHideLoading();
             });
         }
         else {
-          this.$xdUniHelper.navigateTo({
-              url: `${this.changeUrl}?card_number=${item["card_number"]}`,
-            },
-            false
-          );
+          this.$xdUniHelper.navigateTo({url: `${this.changeUrl}?card_number=${item["card_number"]}`,}, false);
         }
       },
 
       onJfbShow(options) {
+        this.cardList = [];
+        this.tabIndex = 1;
         this.onJfbLoad(options);
       },
     }