jufubao-base 1.0.237 → 1.0.238-beta1

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -16,6 +16,28 @@ export default {
           {label: "布局2", value: "2"},
         ]
       },
+      {
+        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: 'xd-site-news',

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -123,7 +123,7 @@
           >可转换票券</view>
           <view class="debuger" v-if="cardList.length === 0" @click="openDebugger(true)" style="opacity: 0">debuger</view>
         </view>
-        
+
       </view>
       <view
         class="jfb-base-card__body-tips"
@@ -375,6 +375,9 @@ export default {
       changeList: [], //可转化卡列表
       disableList: [], //不可用卡列表
       inCallback: null, //内部跳转地址
+      businessList:{
+
+      },
       loadingCardList: true,
       showIndex: false,
 
@@ -409,7 +412,8 @@ export default {
       popup: "https://img.zcool.cn/community/01784158abe781a801219c77e981ee.jpg?x-oss-process=image/auto-orient,1/resize,m_lfit,w_1280,limit_1/sharpen,100",
       buy_name: '',
       isShowBuy: 'N',
-      buy_new_url: ''
+      buy_new_url: '',
+      entryGroupId:'default'
     };
   },
   created() {
@@ -449,6 +453,7 @@ export default {
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
+      this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
 
       //登录样式
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
@@ -467,7 +472,7 @@ export default {
       this.look_text_radius = getContainerPropsValue(container, 'content.look_text_radius', '20');
 
       this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
-      this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");      
+      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");
     },
@@ -640,13 +645,14 @@ export default {
     },
 
     getCardList(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 && this.show_type === 'normal') params['group_id'] = this.entryGroupId;
       this.$xdShowLoading({});
       jfbRootExec("getListCardBind", {
         vm: this,

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -785,7 +785,6 @@ export default {
       }
     },
 
-
     getCardPath(custom_redirect_data = {}){
       //#ifdef H5
       return null;