jufubao-mall 2.0.39 → 2.0.40-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.39",
+  "version": "2.0.40-beta2",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallNewShopList/Api.js

@@ -26,7 +26,7 @@ module.exports = [
     disabled: true
   },
   {
-    mapFnName: "getNewSearchFilterList",
+    mapFnName: "getMallNewSearchFilterList",
     title: "获取搜索过滤条件",
     path: "/mall/v1/msearch/search-filter",
     isRule: true,

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -24,6 +24,15 @@
         v-if="showQuery === 'Y' && searchFilterList.length > 0"
         :style="[queryWrapStyle]"
       >
+        <view v-if="topNavStatus !== 'N'" class="top_category">
+          <view class="top_item"
+            v-for="(item, i) in topShowItemsComp"
+            :key="item.value"
+            :class="{active: topIndex === i}"
+            :style="[topCategoryItemStyleComp]"
+            @click="handleTopItemClick(item, i)"
+          >{{item.label}}</view>
+        </view>
         <view class="query_wrap_tabs">
           <view class="query_wrap_tabs_title" v-if="filterItemsComp.length === 1">店铺列表</view>
           <view
@@ -139,6 +148,16 @@
         cusEntry:{}, //入口状态
         initAttr: false, //状态完成
 
+        //顶部导航
+        topIndex: 0, //顶部导航当前索引
+        topNavStatus:'',//顶部导航状态
+        topAllService:'Y',//顶部服务状态
+        topCashierText:'',//线下核销
+        topCodeText:'',//电子码
+        topSeatText:'',//在线选座
+        topTravelText:'',//旅游门店
+        topFoodText:'',//在线点单
+
         //style
         bodyPadding:{},
         contentBgColor:'rgba(0,0,0,0)',
@@ -221,7 +240,8 @@
       },
 
       cateFixedHeight(){
-        return 80
+        if(this.topNavStatus === 'N') return 80;
+        return 160
       },
 
       queryWrapStyle(){
@@ -232,7 +252,8 @@
           backgroundColor: this.filterBgcColor|| '#fff',
           color: this.filterColor|| '#333',
           top,
-          borderTop: this.filterStyle.filterTopBorder|| '2rpx solid #f8f8f8'
+          borderTop: this.filterStyle.filterTopBorder|| '2rpx solid #f8f8f8',
+          height: this.cateFixedHeight + 'rpx'
         }
       },
 
@@ -253,9 +274,36 @@
         let tabs = [];
         if(this.filterMode.includes('area')) tabs.push({value: 'area', label: '区域', icon: 'icondizhitubiao',size: 24});
         if(this.filterMode.includes('brand')) tabs.push({value: 'brand', label: '品牌', icon: 'iconxia_down',size: 18});
-        if(this.filterMode.includes('shop_category')) tabs.push({value: 'shop_category', label: '门店分类', icon: 'iconxia_down',size: 18});
+        if(this.filterMode.includes('shop_category') && this.topNavStatus !== 'C') tabs.push({value: 'shop_category', label: '分类', icon: 'iconxia_down',size: 18});
         if(this.filterMode.includes('filter')) tabs.push({value: 'filter', label: '筛选', icon: 'iconshaixuanbiaoji_mian',size: 24});
         return tabs
+      },
+      topCategoryItemStyleComp(){
+        let w = 750 / this.topShowItemsComp.length;
+        let minW = 160;
+        return {
+          width: w < minW ? minW + 'rpx' : w + 'rpx',
+        }
+      },
+      //顶部导航展示项目
+      topShowItemsComp(){
+        if(this.topNavStatus === 'N') return [];
+        if(this.topNavStatus === 'S'){
+          //显示-服务类型
+          return [
+            this.topAllService === 'Y' && {label: '全部', value:'all'},
+            this.serverType.includes("SELL") && {label: this.topCashierText, value:'SELL'},
+            this.serverType.includes("CODE") && {label: this.topCodeText, value:'CODE'},
+            this.serverType.includes("SEAT") && {label: this.topSeatText, value:'SEAT'},
+            this.serverType.includes("TRAVEL") && {label: this.topTravelText, value:'TRAVEL'},
+            this.serverType.includes("HDSELF") && {label: this.topFoodText, value:'HDSELF'}
+          ].filter(i => i)
+        }else if(this.topNavStatus === 'C'){
+          //显示-门店分类
+          let shopCate = this.searchFilterList.find(item => item.value === 'shop_category');
+          return shopCate ? shopCate.options : [];
+        }
+        return [];
       }
     },
     created() {
@@ -275,6 +323,7 @@
         this.serverType = gCPVal(container, 'serverType', [['SELL']]);
         this.shopType = gCPVal(container, 'shopType', '');
         this.shopListStyle =  gCPVal(container, 'shopListStyle', 'v2');
+        this.topNavStatus = gCPVal(container, 'topNavStatus', 'N');
         this.showQuery = gCPVal(container, 'showQuery', 'N');
         if(this.showQuery === 'Y') this.filterMode = gCPVal(container, 'filterMode', [['filter']])
         else this.filterMode = [];
@@ -303,6 +352,15 @@
         if(gCPVal(container,'showStorePrice','Y') === 'Y') cusContent.push('price'); // 折扣/价格
         this.cusContent = cusContent;
 
+        //顶部导航
+        this.topNavStatus = gCPVal(container,'topNavStatus', 'N');
+        this.topAllService = gCPVal(container,'topAllService', 'Y');
+        this.topCashierText = gCPVal(container,'topCashierText', '聚好兑');
+        this.topCodeText = gCPVal(container,'topCodeText', '电子码');
+        this.topSeatText = gCPVal(container,'topSeatText', '在线选座');
+        this.topTravelText = gCPVal(container,'topTravelText', '旅游门票');
+        this.topFoodText = gCPVal(container,'topFoodText', '在线点单');
+
         //style
         let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`
         let shopStyle = this.getRelationStatus(container,'shopStyle', {  cardItemSpaceStatus:['cardItemSpace'],bodyPaddingStatus:['bodyPadding']}, sValue);
@@ -348,14 +406,26 @@
         this.travelfPath = gCPVal(container, 'travelfPath', {value: ''}).value;
         this.initAttr = true;
       },
-
+      handleTopItemClick(item, index){
+        this.topIndex = index;
+        if(this.topNavStatus === 'N') return;
+        if(this.topNavStatus === 'C'){
+          //门店分类
+          console.log("handleTopItemClick", item);
+          this.$set(this.searchFilterParams, 'shop_category', item.value);
+        }
+        if(this.topNavStatus === 'S'){
+          //服务类型
+        }
+        this.getList();
+      },
       getParams(){
-        let params = {
+        let params = this.$xdUniHelper.deleteParamEmptyKey({
           page_size: this.page_size,
           page_token: this.page_token,
           namespace: this.xnamespace,
           ...this.options,
-        }
+        })
 
 
         const getSFP = (key , value, p)=>{
@@ -364,11 +434,17 @@
             if(value.length > 0) params[key] = value.join(',');
           }
         }
-
+        //支持顶部门店服务类型筛选
+        if(this.topNavStatus === 'S'){
+          let curTopNav = this.topShowItemsComp[this.topIndex];
+          if(curTopNav.value !== 'all') params['consume_mode'] = curTopNav.value;
+        }else{
+          getSFP('consume_mode',this.serverType);
+        }
 
         getSFP('keyword',this.keyword);
         getSFP('brand_type',this.shopType);
-        getSFP('consume_mode',this.serverType);
+        // getSFP('consume_mode',this.serverType);
         getSFP('shop_category_ids',this.searchFilterParams['shop_category']);
         getSFP('brand_ids',this.searchFilterParams['brand']);
         getSFP('area_codes',this.searchFilterParams['area']);
@@ -511,15 +587,15 @@
           this.searchFilterList = [];
           return
         }
-
-        let data = {
+        let data = this.$xdUniHelper.deleteParamEmptyKey({
           ...this.options,
           namespace: this.xnamespace,
           keyword: this.keyword,
           city_code: this.stateCity.city_code,
           type:'sell',
-        }
-        jfbRootExec("getNewSearchFilterList", {
+        })
+
+        jfbRootExec("getMallNewSearchFilterList", {
           vm: this,
           data: data
         })
@@ -614,7 +690,8 @@
           delete options['shop_category_ids'];
         }
 
-        this.options = this.$xdUniHelper.cloneDeep(options);
+        // this.options = this.$xdUniHelper.cloneDeep(options);
+        this.options = this.reserveParams(options, ['brand_type', 'keyword', 'xnamespace', 'channel_code', 'consume_mode']);
         this.getSearchFilterList();
         this.getList();
       },
@@ -646,10 +723,27 @@
 
   .jfb-mall-new-shop-list {
     &__body{
+      .top_category{
+        height: 80rpx;
+        line-height: 80rpx;
+        padding: 0;
+        background-color: #fff;
+        white-space: nowrap;
+        overflow: auto;
+        .top_item{
+          font-size: 32rpx;
+          color: #333;
+          display: inline-block;
+          text-align: center;
+          &.active{
+            color: var(--g-theme-main-color);
+          }
+        }
+      }
       .query_wrap{
         position: relative;
         z-index: 103;
-        height: 80rpx;
+        // height: 160rpx;
         box-sizing: border-box;
         &.isFixed {
           position: fixed;
@@ -662,7 +756,7 @@
           align-items: center;
           position: relative;
           z-index: 103;
-          height: 100%;
+          height: 80rpx;
 
           &_title {
             text-align: center;

package/src/components/JfbMallNewShopList/Mock.js

@@ -485,7 +485,7 @@ module.exports = {
     "next_page_token":"",
     "request_id":"3c64153d7c1eec3a"
   },
-  getNewSearchFilterList: {
+  getMallNewSearchFilterList: {
     items: [
       {
         title: '门店分类',

package/src/components/JfbMallNewShopList/cusAttr/content.js

@@ -144,6 +144,94 @@ export default (data, gValue, gColor, oldData={})=>{
           });
       },
     },
+    {
+      label: "顶部导航",
+      ele: "xd-radio",
+      valueKey: "topNavStatus",
+      value: dataVal({data, key:'topNavStatus', dValue:'N', gValue}),
+      groupKey: "content",
+      list: [
+        {label: "隐藏", "value": "N"},
+        {label: "显示-门店分类", "value": "C"},
+        {label: "显示-服务类型", "value": "S"}
+      ],
+      labelInline:true,
+    },
+    {ele: 'group_start'},
+    {
+      label: "全部选项",
+      ele: "xd-radio",
+      valueKey: "topAllService",
+      value: dataVal({data, key:'topAllService', dValue:'Y', gValue}),
+      groupKey: "content",
+      list: [
+        {label: "显示", "value": "Y"},
+        {label: "隐藏", "value": "N"},
+      ],
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+    },
+    data.serverType.includes('SELL') && {
+      label: "线下核销",
+      ele: "el-input",
+      valueKey: "topCashierText",
+      value: dataVal({data, key:'topCashierText', dValue:'', gValue}),
+      max: 4,
+      groupKey: "content",
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+      className: 'input100',
+      placeholder: "聚好兑"
+    },
+    data.serverType.includes('CODE') && {
+      label: "电子码",
+      ele: "el-input",
+      valueKey: "topCodeText",
+      value: dataVal({data, key:'topCodeText', dValue:'', gValue}),
+      max: 4,
+      groupKey: "content",
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+      className: 'input100',
+      placeholder: "电子码"
+    },
+    data.serverType.includes('SEAT') && {
+      label: "在线选座",
+      ele: "el-input",
+      valueKey: "topSeatText",
+      value: dataVal({data, key:'topSeatText', dValue:'', gValue}),
+      max: 4,
+      groupKey: "content",
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+      className: 'input100',
+      placeholder: "在线选座"
+    },
+    data.serverType.includes('TRAVEL') && {
+      label: "旅游门店",
+      ele: "el-input",
+      valueKey: "topTravelText",
+      value: dataVal({data, key:'topTravelText', dValue:'', gValue}),
+      max: 4,
+      groupKey: "content",
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+      className: 'input100',
+      placeholder: "旅游门票"
+    },
+    data.serverType.includes('HDSELF') && {
+      label: "小时达到店",
+      ele: "el-input",
+      valueKey: "topFoodText",
+      value: dataVal({data, key:'topFoodText', dValue:'', gValue}),
+      max: 4,
+      groupKey: "content",
+      labelInline:true,
+      hidden: dataVal({data, key:'topNavStatus', dValue:'N', gValue}) !== 'S',
+      className: 'input100',
+      placeholder: "在线点单"
+    },
+    {ele: 'group_end'},
     {
       label: "展示内容",
       ele: "title",
@@ -166,7 +254,7 @@ export default (data, gValue, gColor, oldData={})=>{
     },
     {ele: 'group_start'},
     {
-      label: "横向菜单",
+      label: "",
       ele: "xd-check",
       groupKey:'content',
       valueKey: "filterMode",
@@ -174,7 +262,7 @@ export default (data, gValue, gColor, oldData={})=>{
       list:[
         {"label": "区域", "value": 'area'},
         {"label": "品牌", "value": 'brand'},
-        {"label": "门店分类", "value": 'shop_category'},
+        {"label": "分类", "value": 'shop_category', disabled: data.topNavStatus === 'C'},
         {"label": "筛选", "value": 'filter'},
       ],
       labelInline: true,

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -166,9 +166,9 @@
                   <cus-poster
                     :key="posterKey"
                     :main-color="mainColor"
-                    v-if="posterList !== null && posterList.length > 0"
+                    v-if="showPosterList !== null && showPosterList.length > 0"
                     :mode="mode"
-                    :poster-list="posterList"
+                    :poster-list="showPosterList"
                     :style-obj="{
                       posterSize: posterSize,
                       carouselTime: carouselTime,
@@ -395,6 +395,24 @@
           paddingTb: Number(this.getPMValue(this.filterPadding, 'TB',0))
         }
       },
+      showPosterList(){
+        let resultList = this.posterList.filter(item=>{
+          if(!item.custom_params){
+            return true;
+          } else {
+            let reg = new RegExp('cid=([^&]*)');
+            let result = reg.exec(item.custom_params);
+            let cid = result && result[1];
+            if(cid){
+              return cid == this.trueCateId || cid == this.truePid;
+            }else{
+              return true;
+            }
+          }
+        }).slice(0,this.posterNum);
+        console.log('resultList', resultList);
+        return resultList;
+      },
     },
     watch: {
       container(value,oldValue) {
@@ -953,7 +971,7 @@
             data: {
               page_id: this.pageAttr['page_id'], //页面ID
               container_id: this.containerId, //组件ID
-              page_size: this.posterNum //可以不传
+              page_size: 100 //可以不传
             },
           })
             .then(res => {