jufubao-base 1.0.169-beta13 → 1.0.169-beta15

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

@@ -17,11 +17,10 @@
             :color="{SEAT:$parentVm.mainColor,CODE:$parentVm.subMainColor,SELL:$parentVm.successColor}"
             :border-radius="$parentVm.imgRradius"
             :brand-color="$parentVm.brandColor"
-            @on-schedule="(cinema)=>{$parentVm.handleSchedule(cinema,parent)}"
-            @on-cashier-detail="(cinema)=>{$parentVm.handleCashierDetail(cinema,parent)}"
-            @on-code-detail="(cinema)=>{$parentVm.handleCodeDetail(cinema,parent)}"
+            @on-schedule="handleFilmDetail"
+            @on-cashier-detail="handleCashierDetail"
+            @on-code-detail="handleCodeDetail"
           ></content-cinema>
-
           <content-film v-if="parent.type === 'film'"
             type="hot"
             style="width: 100%; height: 100%"
@@ -31,10 +30,9 @@
             :color="$parentVm.mainColor"
             :border-radius="$parentVm.imgRradius"
             :brand-color="$parentVm.brandColor"
-            @on-film-detail="(film_id)=>{$parentVm.handleFilmDetail(film_id, parent)}"
-            @on-buy="(film_id)=>{$parentVm.handleBuy(film_id, parent)}"
+            @on-film-detail="handleFilmDetail"
+            @on-buy="handleBuy"
           ></content-film>
-
           <content-shop v-if="parent.type === 'shop'"
             style="width: 100%; height: 100%"
             :keyword="keyword"
@@ -44,10 +42,9 @@
             :border-radius="$parentVm.imgRradius"
             :brand-color="$parentVm.brandColor"
             :is-echange="'Y' || $parentVm.isShowExchange"
-            @on-shop-jhd="(shop)=>{$parentVm.handleShopJhd(shop,parent)}"
-            @on-shop-detail="(shop)=>{$parentVm.handleShopDetail(shop,parent)}"
+            @on-shop-jhd="handleShopJhd"
+            @on-shop-detail="handleShopDetail"
           ></content-shop>
-
         </view>
       </view>
       <view v-else class="module_cont product_wrap">
@@ -68,7 +65,7 @@
             :brand-color="$parentVm.brandColor"
             :border-radius="$parentVm.imgRradius"
             :cell="getProductCell(parent.tab)"
-            @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,parent)}"
+            @on-product-detail="handleProductDetail"
           ></content-product>
         </view>
       </view>
@@ -130,7 +127,7 @@
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.right, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.bottom, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.left, 20)}rpx`;
-        
+
         let allModuleTitleStyle = this.$parentVm.allModuleTitleStyle;
         let style = {padding: padding};
         if(allModuleTitleStyle === 'underline'){
@@ -142,7 +139,7 @@
         return this.styleObjectToString(style);
       },
       moduleItemContStyle(){
-        let { 
+        let {
           allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
           allModuleItemContRadius, allModuleItemContBgColor
         } = this.$parentVm;
@@ -255,7 +252,40 @@
       },
       switchMenu(item){
         this.$emit('on-switch', {...item, value: item.tab});
-      }
+      },
+
+
+      //影片
+      handleFilmDetail(film){
+        this.$parentVm.handleFilmDetail(film, this.dataConfig)
+      },
+      handleBuy(film){
+        this.$parentVm.handleBuy(film, this.dataConfig)
+      },
+
+      //影院
+      handleSchedule(cinema){
+        this.$parentVm.handleSchedule(cinema, this.dataConfig)
+      },
+      handleCashierDetail(cinema){
+        this.$parentVm.handleCashierDetail(cinema, this.dataConfig)
+      },
+      handleCodeDetail(cinema){
+        this.$parentVm.handleCodeDetail(cinema, this.dataConfig)
+      },
+
+      //门店
+      handleShopJhd(shop){
+        this.$parentVm.handleShopJhd(shop, this.dataConfig)
+      },
+      handleShopDetail(shop){
+        this.$parentVm.handleShopDetail(shop, this.dataConfig)
+      },
+
+      //商品
+      handleProductDetail(product){
+        this.$parentVm.handleProductDetail(product, this.dataConfig)
+      },
     }
   }
 </script>
@@ -272,7 +302,7 @@
     }
     .module_cont{
       padding: 20rpx 0;
-      
+
       &.product_wrap{
         display: flex;
         justify-content: space-between;
@@ -300,4 +330,4 @@
       }
     }
   }
-</style>
+</style>

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', '必选'],