jufubao-base 1.0.169-beta13 → 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/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', '必选'],

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -32,7 +32,7 @@
       <template v-if="type_other !== 2">
         <view
           v-for="item in dataList"
-          :key="item.id"
+          :key="item.cuid"
           :style="{
             marginBottom:$parentVm.outSpacing + 'rpx',
             padding:contMarginComp,
@@ -99,7 +99,7 @@
           <view
             v-if="productTowList[listKey] !== null"
             v-for="item in productTowList[listKey]"
-            :key="item.id"
+            :key="item.cuid"
             :style="{
               marginBottom:$parentVm.outSpacing + 'rpx',
               padding:contMarginComp,
@@ -127,7 +127,6 @@
           </view>
         </view>
       </view>
-
     </view>
   </view>
 </template>
@@ -258,7 +257,9 @@ export default {
         this.onCusReloadList();
       },500)
     },
+
     tabId(){
+      this.handleClear();
       this.parseTab()
       this.onCusReloadList();
     },
@@ -281,8 +282,6 @@ export default {
     parseTab(){
       let tabs = this.tabId.split('@');
       this.type_code = tabs[1];
-      this.search_range =  tabs[0]
-      this.is_open_city = tabs[2];
       if(this.type_code === 'product'){
         this.type_other = Number(tabs[3]);
         if(this.type_other === 2) this.skeletonCount = 12
@@ -292,13 +291,15 @@ export default {
         this.skeletonCount = 6;
         this.type_other = null
       }
+      this.search_range =  tabs[0]
+      this.is_open_city = tabs[2];
     },
 
     handleClear(){
       this.is_open_city = 'N';
       this.dataConfig = null;
       this.page_token = '1';
-      this.dataList = null;
+      this.dataList = [];
       this.productTowList = {
         left:null,
         right:null,
@@ -325,15 +326,18 @@ export default {
 
 
     getList(){
+      let time = new Date().getTime();
 
       //无关键字不搜索
       if(this.keyword === '') {
         return;
       }
       this.$xdShowLoading({});
+      console.log(new Date().getTime()-time)
       this.$emit('on-list', {
         params:this.getParams,
         cb:(res)=>{
+          console.log(new Date().getTime()-time)
           //无数据处理
           if(res === null){
             this.hasNoData = true;
@@ -348,10 +352,7 @@ export default {
 
           //整理为统一ID
           res.items = res.items.map((item,index)=>{
-            if(!item.id){
-              item.id = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id
-            }
-            //item.list_title = `${index} - ${ item.list_title}`
+            item.cuid = `${this.$xdUniHelper.randomChar(5)}_${item.product_id || item.resource_shop_id || item.cinema_id || item.film_id}`
             return item;
           })
 
@@ -371,7 +372,11 @@ export default {
           this.dataList = (this.dataList||[]).concat(res.items);
           this.page_token = res.next_page_token
           this.hasNoData = false;
-          this.$xdHideLoading();
+          this.$nextTick(()=>{
+            setTimeout(()=>{
+              this.$xdHideLoading();
+            },300)
+          })
         }
       })
     }