jufubao-base 1.0.169-beta14 → 1.0.169-beta15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.169-beta14",
+  "version": "1.0.169-beta15",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

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/CustomList.vue

@@ -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>
@@ -122,7 +122,7 @@
               :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>
@@ -218,7 +218,7 @@ export default {
   },
   data(){
     return {
-      $parentVm:null,
+      $parentVm:{},
       parentStatus: false,
       skeletonCount: 6,
       hasNoData: false,
@@ -308,7 +308,7 @@ export default {
 
     getParentMV(){
       this.$emit('on-parent-vm', ($vm)=>{
-        this.$parentVm = $vm;
+        //this.$parentVm = $vm;
         this.parentStatus = true;
       })
     },
@@ -324,7 +324,6 @@ export default {
       this.getList();
     },
 
-
     getList(){
       let time = new Date().getTime();
 
@@ -379,7 +378,40 @@ export default {
           })
         }
       })
-    }
+    },
+
+    //影片
+    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: [