jufubao-base 1.0.186-beta3 → 1.0.187-beta2

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -122,11 +122,11 @@
           color: subTabIndex === 1 ? mainColor : '#fff',
           background: subTabIndex === 1 ? noticeBackgroundColor : '#DDDDDD',
         }" @click="subTabIndex=1" class="jfb-base-card-entry__body-sub-tab-item">可用票券</view>
-        <view :style="{
+        <view v-if="isChange === 'Y'" :style="{
           color: subTabIndex === 2 ? mainColor : '#fff',
           background: subTabIndex === 2 ? noticeBackgroundColor : '#DDDDDD',
         }" @click="subTabIndex=2" class="jfb-base-card-entry__body-sub-tab-item">可转票券</view>
-        <view :style="{
+        <view v-if="isTransfering === 'Y'" :style="{
           color: subTabIndex === 3 ? mainColor : '#fff',
           background: subTabIndex === 3 ? noticeBackgroundColor : '#DDDDDD',
         }" @click="subTabIndex=3" class="jfb-base-card-entry__body-sub-tab-item">赠送中</view>
@@ -217,7 +217,7 @@
                 </view>
                 <template v-if="subTabIndex === 1">
                   <view class="card-list__entry" v-if="item.is_login==='N'&&force">
-                    <view 
+                    <view
                       @click.stop="handleBindLogin(item,item['entries'][0])"
                       :style="{
                         background: '#fff',
@@ -485,6 +485,8 @@ export default {
     return {
       options:{},
       inCallbackUrlOrg:'',//是否带有回调地址
+      isChange:'N',
+      isTransfering:'N',
 
       //提示文案
       noticeBackgroundColor: "",
@@ -614,6 +616,7 @@ export default {
     },
 
     handleToLink(path) {
+      if (this.$configProject['isPreview']) return
       path = this.getUrlCallback(path)
       this.$xdUniHelper.navigateTo({
         url: path,
@@ -689,6 +692,13 @@ export default {
       });
     },
 
+    checkTabStatus(res){
+      this.$xdUniHelper.cloneDeep(res.list).filter(item=>item.is_valid === 'Y').map(item=>{
+        if(item.is_transfering === 'Y') this.isTransfering = 'Y'
+        if(item.is_exchange === 'Y') this.isChange = 'Y'
+      });
+    },
+
     /**
      * @description 已绑定卡登录
      * @param item
@@ -765,6 +775,8 @@ export default {
     },
 
     handleClick(entry){
+      if (this.$configProject['isPreview']) return
+
       const {dir, path, host, appType} = entry['redirect_data'];
       let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
       let regSp = /(-apiuri\/v)/;
@@ -817,6 +829,7 @@ export default {
     },
 
     toDetail(item, out=true) {
+      if (this.$configProject['isPreview']) return
       if(this.subTabIndex===3) {
         this.$xdUniHelper.navigateTo({
           url: `${this.give_url}?card_number=${item["card_number"]}`,
@@ -872,16 +885,16 @@ export default {
           if(this.isPreview) {
             res.list = this.testCouponList
           }
-          //过滤入口配置          
+          //过滤入口配置
           res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
           let newCardList = this.$xdUniHelper.cloneDeep(res.list);
           this.couponList = this.getCardGroupItem(newCardList, res['site_entry_settings']);
           console.log(this.couponList,'this.couponList');
-          
+
           this.$xdHideLoading({});
 
       }) .catch(() => this.$xdHideLoading());
-        
+
     },
 
     getCardList(options) {
@@ -912,6 +925,8 @@ export default {
             };
           });
 
+          this.checkTabStatus(res);
+
           //过滤入口配置
           res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
 
@@ -928,7 +943,7 @@ export default {
             type = 'is_transfering'
           }
           console.log(this.ajaxCardList, type, 'this.ajaxCardList, type');
-          
+
           this.handleCardInit(this.ajaxCardList, type);
           this.cardPageNum = 1;
           this.$xdHideLoading();

package/src/components/JfbBaseCardEntry/Mock.js

@@ -2,125 +2,136 @@
 
 module.exports = {
   getListEntryCardBind: {
-    "list": [{
-      "card_number": "101001000008422",
-      "card_point": 100000,
-      "card_type": "27",
-      "card_type_name": "聚福宝福",
-      "unit": "点",
-      "end_time": "2025-04-30",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "is_login":'Y',
-      "business_codes": ["health"]
-    }, {
-      "card_number": "121000100000028",
-      "card_point": 10000,
-      "card_type": "44",
-      "card_type_name": "抵扣券测试",
-      "unit": "点",
-      "end_time": "2024-10-31",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["health"]
-    }, {
-      "card_number": "101001000005192",
-      "card_point": 100000000,
-      "card_type": "27",
-      "card_type_name": "聚福宝福",
-      "unit": "点",
-      "end_time": "2024-10-31",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
-    }, {
-      "card_number": "101001000008421",
-      "card_point": 100000,
-      "card_type": "27",
-      "card_type_name": "聚福宝福",
-      "unit": "点",
-      "end_time": "2024-12-31",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["cake"]
-    }, {
-      "card_number": "171003500000385",
-      "card_point": 10000,
-      "card_type": "39",
-      "card_type_name": "一对一次卡（无限制）",
-      "unit": "次",
-      "end_time": "2024-08-31",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "Y",
-      "card_point_type": 1,
-      "business_codes": ["movie", "market", "cake"]
-    }, {
-      "card_number": "101001000007175",
-      "card_point": 9998700,
-      "card_type": "27",
-      "card_type_name": "聚福宝福",
-      "unit": "点",
-      "end_time": "2023-10-31",
-      "is_valid": "Y",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["movie", "market", "cake", "video", "play", "health"]
-    }, {
-      "card_number": "261001000002666",
-      "card_point": 0,
-      "card_type": "35",
-      "card_type_name": "大礼包测试",
-      "unit": "次",
-      "end_time": "2025-02-28",
-      "is_valid": "N",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["gift"]
-    }, {
-      "card_number": "261001000002518",
-      "card_point": 100000,
-      "card_type": "31",
-      "card_type_name": "加盟商福卡",
-      "unit": "点",
-      "end_time": "2023-08-29",
-      "is_valid": "N",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
-    }, {
-      "card_number": "261001000000344",
-      "card_point": 100,
-      "card_type": "35",
-      "card_type_name": "大礼包测试",
-      "unit": "次",
-      "end_time": "2023-07-21",
-      "is_valid": "N",
-      "main_business_code_name": "",
-      "other_card_point": 0,
-      "is_exchange": "N",
-      "card_point_type": 1,
-      "business_codes": ["movie", "market", "cake", "book", "gift", "video", "play", "health", "small", "travel"]
-    }],
+    "list": [
+      {
+        "card_number": "101001000008422",
+        "card_point": 100000,
+        "card_type": "27",
+        "card_type_name": "聚福宝福",
+        "unit": "点",
+        "end_time": "2025-04-30",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"Y",
+        "card_point_type": 1,
+        "is_login":'Y',
+        "business_codes": ["health"]
+      }, {
+        "card_number": "121000100000028",
+        "card_point": 10000,
+        "card_type": "44",
+        "card_type_name": "抵扣券测试",
+        "unit": "点",
+        "end_time": "2024-10-31",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"Y",
+        "card_point_type": 1,
+        "business_codes": ["health"]
+      }, {
+        "card_number": "101001000005192",
+        "card_point": 100000000,
+        "card_type": "27",
+        "card_type_name": "聚福宝福",
+        "unit": "点",
+        "end_time": "2024-10-31",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"Y",
+        "card_point_type": 1,
+        "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
+      }, {
+        "card_number": "101001000008421",
+        "card_point": 100000,
+        "card_type": "27",
+        "card_type_name": "聚福宝福",
+        "unit": "点",
+        "end_time": "2024-12-31",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["cake"]
+      }, {
+        "card_number": "171003500000385",
+        "card_point": 10000,
+        "card_type": "39",
+        "card_type_name": "一对一次卡（无限制）",
+        "unit": "次",
+        "end_time": "2024-08-31",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "Y",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["movie", "market", "cake"]
+      }, {
+        "card_number": "101001000007175",
+        "card_point": 9998700,
+        "card_type": "27",
+        "card_type_name": "聚福宝福",
+        "unit": "点",
+        "end_time": "2023-10-31",
+        "is_valid": "Y",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["movie", "market", "cake", "video", "play", "health"]
+      }, {
+        "card_number": "261001000002666",
+        "card_point": 0,
+        "card_type": "35",
+        "card_type_name": "大礼包测试",
+        "unit": "次",
+        "end_time": "2025-02-28",
+        "is_valid": "N",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["gift"]
+      }, {
+        "card_number": "261001000002518",
+        "card_point": 100000,
+        "card_type": "31",
+        "card_type_name": "加盟商福卡",
+        "unit": "点",
+        "end_time": "2023-08-29",
+        "is_valid": "N",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
+      }, {
+        "card_number": "261001000000344",
+        "card_point": 100,
+        "card_type": "35",
+        "card_type_name": "大礼包测试",
+        "unit": "次",
+        "end_time": "2023-07-21",
+        "is_valid": "N",
+        "main_business_code_name": "",
+        "other_card_point": 0,
+        "is_exchange": "N",
+        "is_transfering":"N",
+        "card_point_type": 1,
+        "business_codes": ["movie", "market", "cake", "book", "gift", "video", "play", "health", "small", "travel"]
+      }
+    ],
     "is_show_invalid_card_entrance": "Y",
     "is_can_unbind": "Y",
     "site_entry_settings": [{

package/src/components/JfbBaseFastLink/Attr.js

@@ -1,4 +1,5 @@
 'use strict';
+import ICONS from '@/ICONS'
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -85,15 +86,15 @@ export default {
         ele: 'el-input',
         groupKey:'style',
         type: 'number',
-        valueKey: 'padding',
-        value: data.padding===undefined? data.padding: '',
+        valueKey: 'rowSpacing',
+        value: data.rowSpacing===undefined? data.rowSpacing: '',
         placeholder: '请输入行间距',
         className: 'input60',
         inline: false,
         notice: '设置行间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: '外边距设置:',
+        label: '边距设置:',
         ele: 'xd-margin-padding',
         groupKey:'style',
         valueKey: 'margin',
@@ -101,9 +102,22 @@ export default {
         setting: {
           type: 'margin',
         },
-        placeholder: '外边距设置',
+        placeholder: '边距设置',
         inline: false,
-        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '填充设置:',
+        ele: 'xd-margin-padding',
+        groupKey:'style',
+        valueKey: 'padding',
+        value: data['padding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '填充设置',
+        inline: false,
+        notice: '填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
@@ -239,7 +253,9 @@ export default {
             icon: true,
             notice: false,
             subTitle: true,
-          }
+            params: true,
+          },
+          icons:ICONS,
         },
         handleCustom({action, data}) {
           if (action === 'number') {

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -16,17 +16,15 @@
     <view class="jfb-base-fast-link__body">
       <template v-if="is_layout === 'noraml'">
         <view class="x-line"></view>
-        <view class="fast-link" :style="{ margin: outMargin}" v-if="list.length > 0">
+        <view
+          class="fast-link"
+          :style="[bodyStyle]"
+          v-if="list.length > 0">
           <view
             class="fast-link__item"
             v-for="item in list"
             :key="item.key"
-            :style="{
-              background: backgroundColor,
-              border: borderBox,
-              borderRadius: radius + 'rpx',
-              marginBottom: padding + 'rpx'
-            }"
+            :style="[contStyle]"
             @click="handleClick(item)"
           >
             <view class="fast-link__item-icon" v-if="item.icon">
@@ -107,7 +105,8 @@
 
         //其他
         margin: {},
-        padding: 20, //间距
+        padding:{},
+        rowSpacing: 20, //间距
       }
     },
     watch: {
@@ -118,16 +117,32 @@
     },
 
     computed: {
-      outMargin(){
-        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-        return str
+      bodyStyle(){
+        let margin = `${this.checkValue(this.margin.top, 0)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.right, 0)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.bottom, 0)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.left, 0)}rpx`;
+
+        let padding = `${this.checkValue(this.margin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.margin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.margin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.margin.left, 20)}rpx`;
+
+        return {
+          margin,
+          padding
+        }
       },
-      borderBox() {
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-        else return '0';
+
+      contStyle(){
+        let border = 0;
+        if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        return {
+          background: this.backgroundColor,
+          borderRadius: this.radius + 'rpx',
+          marginBottom: this.rowSpacing + 'rpx',
+          border
+        }
       },
 
       subNameSize(){
@@ -152,6 +167,7 @@
         }
       },
       handleClick(item){
+        if (this.$configProject['isPreview']) return
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
             url : `${item.path.value}`
@@ -168,9 +184,8 @@
         this.fontSize = getContainerPropsValue(container, 'content.fontSize', 26);
         this.radius = getContainerPropsValue(container, 'content.radius', 10);
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
-        this.padding = getContainerPropsValue(container, 'content.padding', 20);
+        this.rowSpacing = getContainerPropsValue(container, 'content.rowSpacing', 20);
         this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'noraml');
-        //this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 2);
@@ -213,8 +228,8 @@
           }).filter((item,index)=>{
             return index < 3
           });
-        }
 
+        }
       },
     }
   }