jufubao-base 1.0.169-beta13 → 1.0.169-beta15

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,
@@ -43,43 +43,43 @@
             height: heightRpx,
             backgroundColor: $parentVm.contBgColor
           }">
-          <content-film
-            type="hot"
-            v-if="type_code === 'film'"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :item="item"
-            :out-spacing="$parentVm.outSpacing"
-            :color="$parentVm.mainColor"
-            :border-radius="$parentVm.imgRradius"
-            @on-film-detail="(film)=>{$parentVm.handleFilmDetail(film, dataConfig)}"
-            @on-buy="(film)=>{$parentVm.handleBuy(film, dataConfig)}"
-          ></content-film>
-          <content-cinema
-            v-if="type_code === 'cinema'"
-            style="width: 100%;height: 100%"
-            type="list"
-            :keyword="keyword"
-            :item="item"
-            :out-spacing="$parentVm.outSpacing"
-            :color="{SEAT:$parentVm.mainColor,CODE:$parentVm.subMainColor,SELL:$parentVm.successColor}"
-            :border-radius="$parentVm.imgRradius"
-            @on-schedule="(cinema)=>{$parentVm.handleSchedule(cinema,dataConfig)}"
-            @on-cashier-detail="(cinema)=>{$parentVm.handleCashierDetail(cinema,dataConfig)}"
-            @on-code-detail="(cinema)=>{$parentVm.handleCodeDetail(cinema,dataConfig)}"
-          ></content-cinema>
-          <content-shop
-            v-if="type_code === 'shop'"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :out-spacing="$parentVm.outSpacing"
-            :item="item"
-            :color="$parentVm.mainColor"
-            :border-radius="$parentVm.imgRradius"
-            :is-echange="'Y' || $parentVm.isShowExchange"
-            @on-shop-jhd="(shop)=>{$parentVm.handleShopJhd(shop,dataConfig)}"
-            @on-shop-detail="(shop)=>{$parentVm.handleShopDetail(shop,dataConfig)}"
-          ></content-shop>
+            <content-film
+              type="hot"
+              v-if="type_code === 'film'"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :item="item"
+              :out-spacing="$parentVm.outSpacing"
+              :color="$parentVm.mainColor"
+              :border-radius="$parentVm.imgRradius"
+              @on-film-detail="handleFilmDetail"
+              @on-buy="handleBuy"
+            ></content-film>
+            <content-cinema
+              v-if="type_code === 'cinema'"
+              style="width: 100%;height: 100%"
+              type="list"
+              :keyword="keyword"
+              :item="item"
+              :out-spacing="$parentVm.outSpacing"
+              :color="{SEAT:$parentVm.mainColor,CODE:$parentVm.subMainColor,SELL:$parentVm.successColor}"
+              :border-radius="$parentVm.imgRradius"
+              @on-schedule="handleSchedule"
+              @on-cashier-detail="handleCashierDetail"
+              @on-code-detail="handleCodeDetail"
+            ></content-cinema>
+            <content-shop
+              v-if="type_code === 'shop'"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :out-spacing="$parentVm.outSpacing"
+              :item="item"
+              :color="$parentVm.mainColor"
+              :border-radius="$parentVm.imgRradius"
+              :is-echange="'Y' || $parentVm.isShowExchange"
+              @on-shop-jhd="handleShopJhd"
+              @on-shop-detail="handleShopDetail"
+            ></content-shop>
           <content-product
             v-if="$parentVm.productConfig !== null && type_code === 'product'"
             style="width: 100%; height: 100%"
@@ -90,7 +90,7 @@
             :color="$parentVm.mainColor"
             :border-radius="$parentVm.imgRradius"
             :cell="type_other"
-            @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,dataConfig)}"
+            @on-product-detail="handleProductDetail"
           ></content-product>
         </view>
       </template>
@@ -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,
@@ -122,12 +122,11 @@
               :brand-color="$parentVm.brandColor"
               :border-radius="$parentVm.imgRradius"
               :cell="type_other"
-              @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,dataConfig)}"
+              @on-product-detail="handleProductDetail"
             ></content-product>
           </view>
         </view>
       </view>
-
     </view>
   </view>
 </template>
@@ -219,7 +218,7 @@ export default {
   },
   data(){
     return {
-      $parentVm:null,
+      $parentVm:{},
       parentStatus: false,
       skeletonCount: 6,
       hasNoData: false,
@@ -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,
@@ -307,7 +308,7 @@ export default {
 
     getParentMV(){
       this.$emit('on-parent-vm', ($vm)=>{
-        this.$parentVm = $vm;
+        //this.$parentVm = $vm;
         this.parentStatus = true;
       })
     },
@@ -323,17 +324,19 @@ export default {
       this.getList();
     },
 
-
     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 +351,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,10 +371,47 @@ 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)
+          })
         }
       })
-    }
+    },
+
+    //影片
+    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>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -43,14 +43,13 @@
         <view v-if="!isPreview" style="height: 100rpx;"></view>
 
         <view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
-          <all-list v-if="tabId === 'all'"
-            :keyword="keyword"
-            @on-parent-vm="handleParentVm"
-            @on-list="handleList"
-            @on-switch="handleSwitchMenu"
-          ></all-list>
+<!--          <all-list v-if="tabId === 'all'"-->
+<!--            :keyword="keyword"-->
+<!--            @on-parent-vm="handleParentVm"-->
+<!--            @on-list="handleList"-->
+<!--            @on-switch="handleSwitchMenu"-->
+<!--          ></all-list>-->
           <custom-list
-            v-else
             :tab-id="tabId"
             :keyword="keyword"
             ref="customList"
@@ -74,14 +73,14 @@
   import extsMixins from "@/mixins/extsMixins";
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
-  import AllList from "./AllList.vue";
+  //import AllList from "./AllList.vue";
 
   export default {
     name: "JfbBaseTfkSearch",
     components: {
       CustomList,
       XdFontIcon,
-      AllList,
+      //AllList,
       XdSearchHistory
     },
     mixins: [