jufubao-base 1.0.169-beta14 → 1.0.169-beta16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.169-beta14",
+  "version": "1.0.169-beta16",
   "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/ContentFilm.vue

@@ -155,10 +155,9 @@
     align-items: flex-end;
     justify-content: flex-end;
     flex-flow: wrap;
-    height: 100%;
     box-sizing: border-box;
     width: 160rpx;
-    min-height: 200rpx;
+    height: 190rpx;
 
     & .score {
       height: 40rpx;

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -10,7 +10,7 @@
         borderRadius: borderRadius + 'rpx',
       }"
     >
-      <image :src="imageUrl" :alt="item['product_name']" mode="aspectFit"></image>
+      <image :src="imageUrl" :alt="item['product_name']"></image>
     </view>
     <view class="prodcut-content" :style="{marginTop:cell === 1? 0: (outSpacing + 'rpx') }">
       <view class="prodcut-content-info">
@@ -75,7 +75,7 @@ export default {
   props:{
     keyword:{
       type:String,
-      default:'北京'
+      default:''
     },
 
     height:{
@@ -197,6 +197,13 @@ export default {
     &.tow {
       .prodcut-image {
         width: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        & > image {
+          height: 100%;
+          width: 100%;
+        }
       }
 
     }
@@ -204,8 +211,8 @@ export default {
     &-image {
       overflow: hidden;
       & > image {
-        max-height: 100%;
-        max-width: 100%;
+        height: 100%;
+        width: 100%;
       }
     }
 

package/src/components/JfbBaseTfkSearch/ContentShop.vue

@@ -147,11 +147,13 @@ export default {
         justify-content: flex-start;
         align-items: flex-start;
         font-size: 22rpx;
+        line-height: 40rpx;
         color: #999;
 
         & > view:first-child {
           width: 40rpx;
           height: 40rpx;
+          line-height: 40rpx;
           margin-right: 10rpx;
           display: flex;
           justify-content: center;

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="custom-list">
+  <view class="custom-list" v-if="parentStatus">
     <view v-if="dataList === null">
       <view :class="{productBoxCell2: type_other === 2 }">
         <view
@@ -8,22 +8,22 @@
           :class="{productItemCell2: type_other === 2 }"
           :key="item"
           :style="{
-            marginBottom:$parentVm.outSpacing + 'rpx',
+            marginBottom:listItemStyle.outSpacing + 'rpx',
             padding:contMarginComp,
-            borderRadius:$parentVm.contRradius+ 'rpx',
+            borderRadius:listItemStyle.contRradius+ 'rpx',
             boxShadow:'0 0 10rpx rgba(0,0,0,0.1)',
             width: (type_code === 'product' && type_other === 2) ? (outItemProduct + 'rpx'): 'auto',
           }"
         >
           <skeleton-product
             :cell="type_other"
-            v-if="$parentVm.productConfig !== null && type_code === 'product'"
-            :product-config="$parentVm.productConfig"
-            :out-spacing="$parentVm.outSpacing"
+            v-if="productConfig !== null && type_code === 'product'"
+            :product-config="productConfig"
+            :out-spacing="listItemStyle.outSpacing"
             :height="outItemProduct"
           ></skeleton-product>
-          <skeleton-shop v-if="type_code === 'shop'" :out-spacing="$parentVm.outSpacing"></skeleton-shop>
-          <skeleton-film v-if="type_code === 'film'" :out-spacing="$parentVm.outSpacing"></skeleton-film>
+          <skeleton-shop v-if="type_code === 'shop'" :out-spacing="listItemStyle.outSpacing"></skeleton-shop>
+          <skeleton-film v-if="type_code === 'film'" :out-spacing="listItemStyle.outSpacing"></skeleton-film>
           <skeleton-cinema v-if="type_code === 'cinema'"></skeleton-cinema>
         </view>
       </view>
@@ -34,26 +34,27 @@
           v-for="item in dataList"
           :key="item.cuid"
           :style="{
-            marginBottom:$parentVm.outSpacing + 'rpx',
+            marginBottom:listItemStyle.outSpacing + 'rpx',
             padding:contMarginComp,
-            borderRadius:$parentVm.contRradius+ 'rpx',
-            border: $parentVm.contBorder,
-            boxShadow:$parentVm.contShadow,
+            borderRadius:listItemStyle.contRradius+ 'rpx',
+            border: listItemStyle.contBorder,
+            boxShadow:listItemStyle.contShadow,
             width: (type_code === 'product' && type_other === 2) ? (outItemProduct + 'rpx'): 'auto',
             height: heightRpx,
-            backgroundColor: $parentVm.contBgColor
-          }">
+            backgroundColor: listItemStyle.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)}"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="listItemStyle.mainColor"
+            :border-radius="listItemStyle.imgRradius"
+            @on-film-detail="handleFilmDetail"
+            @on-buy="handleBuy"
           ></content-film>
           <content-cinema
             v-if="type_code === 'cinema'"
@@ -61,36 +62,37 @@
             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)}"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
+            :border-radius="listItemStyle.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"
+            :out-spacing="listItemStyle.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)}"
+            :color="listItemStyle.mainColor"
+            :border-radius="listItemStyle.imgRradius"
+            :is-echange="'Y' || listItemStyle.isShowExchange"
+            @on-shop-jhd="handleShopJhd"
+            @on-shop-detail="handleShopDetail"
           ></content-shop>
           <content-product
-            v-if="$parentVm.productConfig !== null && type_code === 'product'"
+            v-if="productConfig !== null && type_code === 'product'"
             style="width: 100%; height: 100%"
-            :product-config="$parentVm.productConfig"
-            :out-spacing="$parentVm.outSpacing"
+            :keyword="keyword"
+            :product-config="productConfig"
+            :out-spacing="listItemStyle.outSpacing"
             :item="item"
-            :brand-color="$parentVm.brandColor"
-            :color="$parentVm.mainColor"
-            :border-radius="$parentVm.imgRradius"
+            :brand-color="listItemStyle.brandColor"
+            :color="listItemStyle.mainColor"
+            :border-radius="listItemStyle.imgRradius"
             :cell="type_other"
-            @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,dataConfig)}"
+            @on-product-detail="handleProductDetail"
           ></content-product>
         </view>
       </template>
@@ -101,28 +103,30 @@
             v-for="item in productTowList[listKey]"
             :key="item.cuid"
             :style="{
-              marginBottom:$parentVm.outSpacing + 'rpx',
+              marginBottom:listItemStyle.outSpacing + 'rpx',
               padding:contMarginComp,
-              borderRadius:$parentVm.contRradius+ 'rpx',
-              border: $parentVm.contBorder,
-              boxShadow:$parentVm.contShadow,
+              borderRadius:listItemStyle.contRradius+ 'rpx',
+              border: listItemStyle.contBorder,
+              boxShadow:listItemStyle.contShadow,
               width: (type_code === 'product' && type_other === 2) ? (outItemProduct + 'rpx'): 'auto',
               height: heightRpx,
-              backgroundColor: $parentVm.contBgColor
+              backgroundColor: listItemStyle.contBgColor
             }"
           >
             <content-product
-              v-if="$parentVm.productConfig !== null"
+
+              v-if="productConfig !== null"
               style="width: 100%; height: 100%"
-              :product-config="$parentVm.productConfig"
-              :out-spacing="$parentVm.outSpacing"
+              :keyword="keyword"
+              :product-config="productConfig"
+              :out-spacing="listItemStyle.outSpacing"
               :item="item"
               :height="outItemProduct"
-              :color="$parentVm.mainColor"
-              :brand-color="$parentVm.brandColor"
-              :border-radius="$parentVm.imgRradius"
+              :color="listItemStyle.mainColor"
+              :brand-color="listItemStyle.brandColor"
+              :border-radius="listItemStyle.imgRradius"
               :cell="type_other"
-              @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,dataConfig)}"
+              @on-product-detail="handleProductDetail"
             ></content-product>
           </view>
         </view>
@@ -159,6 +163,14 @@ export default {
       type:String,
       default:'',
     },
+    listItemStyle:{
+      type:Object|null,
+      default:null,
+    },
+    productConfig:{
+      type:Object|null,
+      default:null,
+    },
     tabId:{
       type:String,
       required:true
@@ -196,17 +208,19 @@ export default {
       return params
     },
     contMarginComp(){
-      let str = `${this.$parentVm.checkValue(this.$parentVm.contMargin.top, 20)}rpx`;
-      str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.right, 20)}rpx`;
-      str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.bottom, 20)}rpx`;
-      str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.left, 20)}rpx`;
+      if(this.getParent === null) return 0
+      let str = `${this.getParent().checkValue(this.listItemStyle.contMargin.top, 20)}rpx`;
+      str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.right, 20)}rpx`;
+      str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.bottom, 20)}rpx`;
+      str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.left, 20)}rpx`;
       return str
     },
     outItemProduct(){
+      if(this.getParent === null) return 0
       //获取每列元素最大宽度
-      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
+      let num = (750 - 3 * Number(this.listItemStyle.outSpacing))/2;
+      num = num - this.getParent().checkValue(this.listItemStyle.contMargin.right, 20) - this.getParent().checkValue(this.listItemStyle.contMargin.left, 20);
+      return num - this.listItemStyle.contBorderWidth * 2
     },
     heightRpx(){
       let h = 'auto'
@@ -218,13 +232,14 @@ export default {
   },
   data(){
     return {
-      $parentVm:null,
+      /**@type Function|null**/
+      getParent:null,
       parentStatus: false,
       skeletonCount: 6,
       hasNoData: false,
 
       page_token:'1',
-      page_size: 100,
+      page_size: 20,
 
       //参数
       type_code:'',
@@ -284,7 +299,7 @@ export default {
       this.type_code = tabs[1];
       if(this.type_code === 'product'){
         this.type_other = Number(tabs[3]);
-        if(this.type_other === 2) this.skeletonCount = 12
+        if(this.type_other === 2) this.skeletonCount = 6
         else this.skeletonCount = 6
       }
       else {
@@ -299,7 +314,7 @@ export default {
       this.is_open_city = 'N';
       this.dataConfig = null;
       this.page_token = '1';
-      this.dataList = [];
+      this.dataList = null;
       this.productTowList = {
         left:null,
         right:null,
@@ -307,14 +322,14 @@ export default {
     },
 
     getParentMV(){
-      this.$emit('on-parent-vm', ($vm)=>{
-        this.$parentVm = $vm;
+      this.$emit('on-parent-vm', (getParent)=>{
+        this.getParent = getParent;
         this.parentStatus = true;
       })
     },
 
     onCusReachBottom(){
-      if(!this.page_token) return false;
+      if(this.dataList === null || !this.page_token) return false;
       this.getList();
     },
 
@@ -324,7 +339,6 @@ export default {
       this.getList();
     },
 
-
     getList(){
       let time = new Date().getTime();
 
@@ -332,12 +346,11 @@ export default {
       if(this.keyword === '') {
         return;
       }
-      this.$xdShowLoading({});
-      console.log(new Date().getTime()-time)
+      //this.$xdShowLoading({});
       this.$emit('on-list', {
         params:this.getParams,
         cb:(res)=>{
-          console.log(new Date().getTime()-time)
+          console.log(new Date().getTime()-time);
           //无数据处理
           if(res === null){
             this.hasNoData = true;
@@ -379,7 +392,40 @@ export default {
           })
         }
       })
-    }
+    },
+
+    //影片
+    handleFilmDetail(film){
+      this.getParent().handleFilmDetail(film, this.dataConfig)
+    },
+    handleBuy(film){
+      this.getParent().handleBuy(film, this.dataConfig)
+    },
+
+    //影院
+    handleSchedule(cinema){
+      this.getParent().handleSchedule(cinema, this.dataConfig)
+    },
+    handleCashierDetail(cinema){
+      this.getParent().handleCashierDetail(cinema, this.dataConfig)
+    },
+    handleCodeDetail(cinema){
+      this.getParent().handleCodeDetail(cinema, this.dataConfig)
+    },
+
+    //门店
+    handleShopJhd(shop){
+      this.getParent().handleShopJhd(shop, this.dataConfig)
+    },
+    handleShopDetail(shop){
+      this.getParent().handleShopDetail(shop, this.dataConfig)
+    },
+
+    //商品
+    handleProductDetail(product){
+      this.getParent().handleProductDetail(product, this.dataConfig)
+    },
+
   }
 }
 </script>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -41,25 +41,24 @@
           </view>
         </view>
         <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"
+            :list-item-style="listItemStyle"
+            :product-config="productConfig"
             ref="customList"
             @on-parent-vm="handleParentVm"
             @on-list="handleList"
           ></custom-list>
         </view>
       </view>
-
     </view>
   </view>
 </template>
@@ -74,14 +73,20 @@
   import extsMixins from "@/mixins/extsMixins";
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
-  import AllList from "./AllList.vue";
+  //import AllList from "./AllList.vue";
+
+  class EmitParent {
+    constructor(options) {
+      this.options = options;
+    }
+  }
 
   export default {
     name: "JfbBaseTfkSearch",
     components: {
       CustomList,
       XdFontIcon,
-      AllList,
+      //AllList,
       XdSearchHistory
     },
     mixins: [
@@ -91,7 +96,7 @@
       return {
         hideMask: true,
         tabId: 'all', //cinema/film/shop/product
-        keyword: '',
+        keyword: '测试',
         options:{},
         menuList: [],
         //公共样式
@@ -121,7 +126,7 @@
         allModuleItemContPadding: {},
         allModuleItemContRadius: 16,
         allModuleItemContBgColor: "#FFFFFF",
-
+        emitParent:{},
       }
     },
     computed: {
@@ -187,14 +192,19 @@
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']){
-          this.cusInit(value)
           this.init(value);
+          this.cusInit(value)
         }
       },
     },
     created() {
-      this.cusInit(this.container);
+      this.emitParent = new EmitParent({
+        getParent: ()=>{
+          return this;
+        }
+      })
       this.init(this.container);
+      this.cusInit(this.container);
     },
 
     methods: {
@@ -215,6 +225,7 @@
         }).then(res => {
           if(this.tabId === 'all'){
             if(!this.$configProject['isPreview']){
+              res = this.filtersResData(res);
               this.menuList = res.tabs;
             }
             cb(res.list)
@@ -222,7 +233,9 @@
             if(this.isPreview){
               return cb(res.list.find(item => item.type === this.tabId.split("@")[1]))
             }
-            if(res.list.length > 0)  cb(res.list[0])
+            if(res.list.length > 0) {
+              cb(res.list[0])
+            }
             else cb(null)
           }
         }).catch((e)=>{
@@ -278,18 +291,10 @@
         // console.log('event.onJfbScroll', options)
       },
 
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
       onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
+       this.$xdUniHelper.navigateBack()
       },
+
       onJfbCustomEvent({action, data}) {
         if(action === 'baseHeader@search'){
           uni.pageScrollTo({

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -4,17 +4,7 @@ import { getContainerPropsValue } from "@/utils/xd.base";
 export default {
   data(){
     return {
-      isShowExchange:'N',
-
-      contMargin:{},
-      contRradius:'10',
-      contShadow:'',
-      contBorder:'',
-      contBgColor:'',
-      contBorderWidth: 0,
-
-      imgRradius:'10',
-
+      listItemStyle:null,
       productConfig:null,
     }
   },
@@ -24,7 +14,6 @@ export default {
   methods:{
 
     cusInit(container){
-      this.isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
 
       //商品相关
       let is_show_brand = getContainerPropsValue(container, 'content.is_show_brand', 'N');
@@ -34,43 +23,60 @@ export default {
       let isAddCart = getContainerPropsValue(container, 'content.isAddCart', "Y");
       let differ = getContainerPropsValue(container, 'content.differ', 1);
       let showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
-      this.productConfig = {is_show_brand,isPrice,isShowTag,isShowDiscount,isAddCart,differ,showActivityPrice}
-
-      this.brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');
+      let isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
+      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange};
 
       //内容
-      this.contMargin =  getContainerPropsValue(container, 'content.contMargin', {});
-      this.contRradius =  getContainerPropsValue(container, 'content.contRradius', '10');
-      this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
-      this.contBorder = this.getXdBorder({width:2,color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contBorder', {}));
-      this.contBgColor = getContainerPropsValue(container, 'content.contBgColor', '#fff');
-      this.contObjBorder = getContainerPropsValue(container, 'content.contBorder', {});
-      if(this.contObjBorder && this.contObjBorder.type === 'Y') {
-        if(this.contObjBorder.value && this.contObjBorder.value.width) {
-          this.contBorderWidth = Number(this.contObjBorder.value.width);
+      let brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');
+      let imgRradius = getContainerPropsValue(container, 'content.imgRradius', '10');
+      let contMargin =  getContainerPropsValue(container, 'content.contMargin', {});
+      let contRradius =  getContainerPropsValue(container, 'content.contRradius', '10');
+      let contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
+      let contBorder = this.getXdBorder({width:2,color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contBorder', {}));
+      let contBgColor =  getContainerPropsValue(container, 'content.contBgColor', '#fff');
+      let contObjBorder = getContainerPropsValue(container, 'content.contBorder', {});
+      let contBorderWidth = 0
+      if(contObjBorder && contObjBorder.type === 'Y') {
+        if(contObjBorder.value && contObjBorder.value.width) {
+          contBorderWidth = Number(contObjBorder.value.width);
         }
-        else this.contBorderWidth = 2;
+        else contBorderWidth = 2;
       }
+      this.listItemStyle = {
+        outSpacing: this.outSpacing,
+        mainColor: this.mainColor,
+        subMainColor: this.subMainColor,
+        successColor: this.successColor,
+        brandColor,imgRradius,contMargin,contRradius,contShadow,contBorder,contBgColor,contObjBorder,contBorderWidth}
+    },
 
-      //图片
-      this.imgRradius = getContainerPropsValue(container, 'content.imgRradius', '10');
-
+    filtersResData(res){
+      let list = res.list.filter(item=>{
+        return item.items.length > 0
+      });
+      if(res.list.length  === list.length) return res;
+      let tabs = list.map(item=>{
+        return {
+          label: item.name,
+          value: item.tab
+        }
+      });
+      return {...res, list, tabs}
     },
 
 
     //通信相关================
     handleParentVm(cb){
-      cb(this)
+      cb(this.emitParent.options.getParent)
     },
 
     onJfbReachBottom(options) {
-      console.log('event.onJfbReachBottom', options)
-      this.$refs['customList']['onCusReachBottom'](options)
-
+      if(this.tabId !== "all") {
+        this.$refs['customList']['onCusReachBottom'](options)
+      }
     },
 
     onCusReload() {
-      console.log('event.onCusReload', this.options)
       this.$refs['customList']['onCusReloadList'](this.options)
     },
     //通信相关================

package/src/mixins/componentsMixins.js

@@ -560,7 +560,7 @@ export default {
       //#endif
     },
 
-    getUrlHasSpStr(pathDir){
+    getUrlHasSpStrDIR(pathDir){
       if(pathDir.indexOf('@site_domain@/') === 0) {
         return pathDir.replace('@site_domain@/','').split('/')[0]
       }
@@ -569,18 +569,48 @@ export default {
 
     /**
      * @description 过滤不可以用
-     * 当前项目未H5时,过滤所有小程序应用
-     * 当前项目未小程序时,过滤所有非当前小程序应用
+     * 当前项目为H5时,过滤所有小程序应用
+     * 当前项目为小程序时,过滤所有非当前小程序应用
      * 站外地址直接返回
      * 站内地址未选值直接返回
      * 预览模式全过
      * @param url {object}
      */
     checkUrlIsValid(url){
+      let projectAttr = this.$root.projectAttr;
+      //url = '{"dir":"wtxsaas","host":"sandbox-website-05.jufubao.cn","path":"\/main\/order\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\/\/sandbox-website-05.jufubao.cn\/wtxsaas\/main\/order\/detail","frontPath":"\/wtxsaas\/main\/order\/detail","fixed_business_code":""}'
       if(!url) return null;
       try {
+        let redirect_data = JSON.parse(url);
+        if(!redirect_data['appType']) redirect_data['appType']= 'h5';
+
+        //#ifdef H5
+        if(redirect_data['appType'] === 'wxmp') return null;
+        else {
+          if(redirect_data.dir === projectAttr.deploy_dir) {
+            return redirect_data.path
+          }
+          else {
+            return `//${projectAttr.host}/${redirect_data.frontPath}`
+          }
+
+        }
+        //#endif
 
+        //#ifdef MP-WEIXIN
+
+        let dir = this.getUrlHasSpStrDIR(redirect_data.path);
+        if(redirect_data['appType'] === 'wxmp'){
+          if(projectAttr.deploy_dir === dir) return redirect_data.path;
+          else return null;
+        }
+        else if(redirect_data['appType'] === 'h5'){
+
+        }
+        else return null;
+        //#endif
       }catch (e){
+        console.error(e);
         return null;
       }
       // let content = list.filter(item=>{

package/src/mixins/posterMixins.js

@@ -0,0 +1,122 @@
+'use strict';
+
+export default {
+  methods:{
+    /**
+     * @description 过滤不可以用
+     * 当前项目未H5时,过滤所有小程序应用
+     * 当前项目未小程序时,过滤所有非当前小程序应用
+     * 站外地址直接返回
+     * 站内地址未选值直接返回
+     * 预览模式全过
+     */
+    posterFilterNoUseData(list = []){
+      let content = this.$xdUniHelper.cloneDeep(list).filter(item=>{
+        //预览模式
+        if( this.$configProject.isPreview) return true;
+
+        //非内部应用
+        if(item.redirect_type !== 'INN') return true
+
+        //没有配置链接
+        if(!item.redirect_data) return true;
+
+        //内部应用
+        else {
+          let redirect_data;
+          try {
+            redirect_data = JSON.parse(item.redirect_data);
+            if(!item['app_type']) item['app_type']= 'h5';
+
+            //#ifdef H5
+            return item['app_type'] !== 'wxmp';
+            //#endif
+
+            //#ifdef MP-WEIXIN
+            let actDir = this.$parent['projectAttr']['deploy_dir'];
+            let dir = this.getPosterPathDir(redirect_data.page);
+            if(item['app_type'] === 'wxmp'){
+              return actDir === dir;
+            }
+            else if(item['app_type'] === 'h5') return true;
+            else return true
+            //#endif
+          }
+          catch (e) {
+            return true
+          }
+        }
+      });
+      console.warn(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
+      return content;
+
+    },
+
+    getPosterPathDir(pathDir){
+      if(pathDir.indexOf('@site_domain@/') === 0) {
+        return pathDir.replace('@site_domain@/','').split('/')[0]
+      }
+      return ''
+    },
+
+    handlePosterClick(item) {
+      if(!item.redirect_data) {
+        console.warn(`未配置链接地址: ${item.redirect_data}`);
+        console.error(`未配置链接地址: ${item.redirect_data}`);
+        return
+      }
+
+      //内部链接跳转地址
+      if (item.redirect_type === 'INN') {
+        try {
+          let url = JSON.parse(item.redirect_data);
+          let params = '';
+          if(url.page) {
+            if (item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({url: url.page + params})
+          }
+          else {
+            console.error(`应用链接配置错误: ${url.page}`)
+          }
+        } catch (e) {
+          console.error(`应用链接配置错误: ${item.redirect_data}`)
+        }
+      }
+
+      //外部链接
+      if (item.redirect_type === 'URL') {
+        let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
+        let spReg = /(-apiuri\/v)/;
+        //#ifdef MP-WEIXIN
+        try {
+          let url = JSON.parse(item.redirect_data);
+          if (reg.test(url.url) || spReg.test(url.url)) {
+            console.warn(`广告跳转外站: ${url.url}`)
+            this.$xdUniHelper.navigateTo(url);
+          } else {
+            console.error(`广告跳转外站配置错误: ${url.url}`)
+          }
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+        //#ifdef H5
+        try {
+          let url = JSON.parse(item.redirect_data);
+          console.warn(`广告跳转外站: ${url.url}`);
+          this.$xdUniHelper.redirectTo(url, false)
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+
+      }
+
+      //无跳转地址
+      if(item.redirect_type === 'EMP') {
+        console.warn(`无跳转地址`);
+      }
+    },
+  },
+}
+