jufubao-base 1.0.169-beta12 → 1.0.169-beta14

package/src/components/JfbBaseTfkCardLogin/Mock.js

@@ -116,6 +116,7 @@ module.exports = {
         card_point: 5000,
         card_type: "0",
         card_type_name: "满50减50",
+        show_name: "满50减50",
         unit: "点",
         end_time: "2024-11-23",
         is_valid: "Y",
@@ -134,6 +135,7 @@ module.exports = {
         card_point: 5000,
         card_type: "0",
         card_type_name: "满50减50",
+        show_name: "满50减50",
         unit: "点",
         end_time: "2024-11-23",
         is_valid: "Y",
@@ -152,6 +154,7 @@ module.exports = {
         card_point: 5000,
         card_type: "0",
         card_type_name: "满50减50",
+        show_name: "满50减50",
         unit: "点",
         end_time: "2024-11-23",
         is_valid: "Y",
@@ -170,6 +173,7 @@ module.exports = {
         card_point: 5000,
         card_type: "0",
         card_type_name: "满50减50",
+        show_name: "满50减50",
         unit: "点",
         end_time: "2024-11-23",
         is_valid: "Y",
@@ -183,496 +187,6 @@ module.exports = {
         card_use_rule: "满50减0",
         is_transfering: "N"
       },
-      {
-        card_number: "10001000001166",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001165",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001164",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001163",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001162",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001161",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "10001000001160",
-        card_point: 5000,
-        card_type: "0",
-        card_type_name: "满50减50",
-        unit: "点",
-        end_time: "2024-11-23",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000007025",
-        card_point: 3210,
-        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: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "food",
-          "event12",
-          "event18",
-          "event26",
-          "event29",
-          "event32"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "110101000000025",
-        card_point: 4999,
-        card_type: "65",
-        card_type_name: "满减券100减20",
-        unit: "点",
-        end_time: "2026-04-30",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["video"],
-        is_login: "N",
-        consume_type: "2",
-        card_use_rule: "满50减0",
-        is_transfering: "N"
-      },
-      {
-        card_number: "261001000002762",
-        card_point: 100,
-        card_type: "35",
-        card_type_name: "大礼包测试",
-        unit: "次",
-        end_time: "2025-05-31",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["gift"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "261001000002761",
-        card_point: 100,
-        card_type: "35",
-        card_type_name: "大礼包测试",
-        unit: "次",
-        end_time: "2025-05-31",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["gift"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000007024",
-        card_point: 3110,
-        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: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "food",
-          "event12",
-          "event18",
-          "event26",
-          "event29",
-          "event32"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000593",
-        card_point: 200,
-        card_type: "39",
-        card_type_name: "一对一次卡（无限制）",
-        unit: "次",
-        end_time: "2025-10-31",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000590",
-        card_point: 100,
-        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: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "video", "market", "book"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000008569",
-        card_point: 15884,
-        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",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small",
-          "supermarket",
-          "food"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000666",
-        card_point: 9500,
-        card_type: "2146",
-        card_type_name: "一对一次卡（2d抵扣45，3d2张兑换一张）",
-        unit: "次",
-        end_time: "2025-07-26",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small",
-          "supermarket",
-          "food"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000665",
-        card_point: 10000,
-        card_type: "2146",
-        card_type_name: "一对一次卡（2d抵扣45，3d2张兑换一张）",
-        unit: "次",
-        end_time: "2025-07-26",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small",
-          "supermarket",
-          "food"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000659",
-        card_point: 1000,
-        card_type: "2146",
-        card_type_name: "一对一次卡（2d抵扣45，3d2张兑换一张）",
-        unit: "次",
-        end_time: "2025-06-30",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "171003500000658",
-        card_point: 1000,
-        card_type: "2146",
-        card_type_name: "一对一次卡（2d抵扣45，3d2张兑换一张）",
-        unit: "次",
-        end_time: "2025-06-30",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000008586",
-        card_point: 99788102,
-        card_type: "27",
-        card_type_name: "聚福宝福",
-        unit: "点",
-        end_time: "2027-07-31",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: ["cake", "movie", "10755f84"],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000008601",
-        card_point: 93040,
-        card_type: "27",
-        card_type_name: "聚福宝福",
-        unit: "点",
-        end_time: "2026-04-30",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small",
-          "supermarket",
-          "food"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
-      {
-        card_number: "101001000008609",
-        card_point: 111897,
-        card_type: "27",
-        card_type_name: "聚福宝福",
-        unit: "点",
-        end_time: "2026-04-30",
-        is_valid: "Y",
-        main_business_code_name: "",
-        other_card_point: 0,
-        is_exchange: "N",
-        card_point_type: 1,
-        business_codes: [
-          "cake",
-          "movie",
-          "video",
-          "market",
-          "book",
-          "health",
-          "travel",
-          "play",
-          "small",
-          "supermarket",
-          "food"
-        ],
-        is_login: "N",
-        consume_type: "1",
-        card_use_rule: "",
-        is_transfering: "N"
-      },
     ],
     request_id: "413e08844fe1d1af"
   }

package/src/components/JfbBaseTfkCardLogin/XdCouponItem.vue

@@ -14,7 +14,7 @@
         ></xd-unit>
         <!-- <text style="font-size: 24rpx;">{{ item.unit }}</text> -->
       </view>
-      <view class="_rule">{{ item.card_use_rule }}</view>
+      <view class="_rule">{{ item.show_name }}</view>
     </view>
     <view class="coupon_right" :style="couponRightItemBoxStyle">
       <view class="cont_top" :style="{
@@ -153,7 +153,7 @@
       },
       couponRightItemBoxStyle(){
         let image = {};
-        if(this.cardImageUrl) image = {
+        if(this.couponImageUrl) image = {
           backgroundImage: `url(${this.getCouponBgImage})`,
           backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -5,7 +5,10 @@
     >
       <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
       <view v-if="parent.type !== 'product'" class="module_cont">
-        <view v-for="(item, i) in parent.items" :key="i">
+        <view v-for="(item, i) in parent.items" :key="item.key"
+          class="module_cont_inner"
+          :style="moduleItemContStyle"
+        >
           <content-cinema v-if="parent.type === 'cinema'"
             style="width: 100%; height: 100%"
             :keyword="keyword"
@@ -48,11 +51,11 @@
         </view>
       </view>
       <view v-else class="module_cont product_wrap">
-        <view v-for="(item, i) in parent.items" :key="i"
-          :style="{
-            width: getProductCell(parent.tab) == 2 ? (outItemProduct + 'rpx'): '100%',
-            marginBottom: $parentVm.outSpacing + 'rpx',
-          }"
+        <view v-for="(item, i) in parent.items" :key="item.key"
+          class="module_cont_inner"
+          :style="[moduleItemContStyle, {
+            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${$parentVm.allModuleItemContMargin/2}rpx)`: '100%',
+          }]"
         >
           <content-product v-if="parent.type === 'product'"
             style="width: 100%; height: 100%"
@@ -109,6 +112,7 @@
         return str
       },
       moduleItemStyle(){
+        const { allModuleRadius } = this.$parentVm;
         let padding = `${this.$parentVm.checkValue(this.$parentVm.allModulePadding.top, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.right, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.bottom, 20)}rpx`;
@@ -117,7 +121,8 @@
         return this.styleObjectToString({
           background: this.$parentVm.allListBgColor,
           padding: padding,
-          marginBottom: this.$parentVm.allModuleMargin + 'rpx'
+          marginBottom: this.$parentVm.allModuleMargin + 'rpx',
+          borderRadius: allModuleRadius + 'rpx',
         })
       },
       moduleItemTitleStyle(){
@@ -136,6 +141,35 @@
 
         return this.styleObjectToString(style);
       },
+      moduleItemContStyle(){
+        let { 
+          allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
+          allModuleItemContRadius, allModuleItemContBgColor
+        } = this.$parentVm;
+        let border = "none";
+        let boxShadow = "none";
+        if(allModuleItemContBorder && allModuleItemContBorder.type === 'Y'){
+          let { width, color } = allModuleItemContBorder.value;
+          border = `${width}rpx solid ${color}`;
+        }
+        if(allModuleItemContShadow && allModuleItemContShadow.type === 'Y'){
+          let { width, color } = allModuleItemContShadow.value;
+          boxShadow = `0 0 ${width}rpx ${color}`;
+        }
+        let padding = `${this.$parentVm.checkValue(allModuleItemContPadding.top, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.right, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.left, 20)}rpx`;
+        console.log("allModuleItemContShadow", allModuleItemContShadow)
+        return this.styleObjectToString({
+          padding: padding,
+          border: border,
+          borderRadius: allModuleItemContRadius + 'rpx',
+          boxShadow: boxShadow,
+          marginBottom: allModuleItemContMargin + 'rpx',
+          background: allModuleItemContBgColor,
+        })
+      },
       moduleMoreStyle(){
         let allModuleMoreStyle = this.$parentVm.allModuleMoreStyle;
         let style = {};
@@ -150,6 +184,7 @@
       },
       outItemProduct(){
         //获取每列元素最大宽度
+        // return 300;
         let num = (750 - 3 * Number(this.$parentVm.outSpacing))/2;
         num = num - this.$parentVm.checkValue(this.$parentVm.contMargin.right, 20) - this.$parentVm.checkValue(this.$parentVm.contMargin.left, 20);
         return num - this.$parentVm.contBorderWidth * 2
@@ -178,7 +213,7 @@
       this.getList();
     },
     methods: {
-      getProductCell(str){
+      getProductCell(str = ''){
         let cellNum = str.split("@")[3] || 1;
         return Number(cellNum);
       },
@@ -207,7 +242,13 @@
         this.$emit('on-list', {
           params: params,
           cb:(list)=>{
-            this.list = list || [];
+            this.list = (list || []).map(parent => {
+              parent.items = parent.items.map(item => {
+                item['key'] = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id;
+                return item;
+              })
+              return parent;
+            });
             this.$xdHideLoading();
           }
         })
@@ -237,6 +278,10 @@
         justify-content: space-between;
         flex-wrap: wrap;
       }
+
+      .module_cont_inner{
+        box-sizing: border-box;
+      }
     }
     .module_more{
       display: flex;
@@ -249,7 +294,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 80rpx;
+        height: 70rpx;
         width: 200rpx;
         border-radius: 80rpx;
       }

package/src/components/JfbBaseTfkSearch/Api.js

@@ -9,7 +9,7 @@ module.exports = [
     //设置方法名字当别忘记加上【模块名字】：Tfk
     mapFnName: 'getTfkSearchList',
     title: '获取s搜索列表',
-    path: '/mall/v1/search',
+    path: '/mall/v1/msearch',
     isRule: false,
     params: {
       keyword: ['模糊搜索关键字', 'Number', '必选'],