jufubao-mall 2.0.16-beta1 → 2.0.16-beta2

package/package.json

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

package/src/components/JfbMallNewShopList/Api.js

@@ -30,7 +30,7 @@ module.exports = [
     title: "获取搜索过滤条件",
     path: "/mall/v1/msearch/search-filter",
     isRule: true,
-    params: {
+    data: {
       type:['搜类型', 'String', '必选','sell'],
       filter_item:['过滤参数', 'String', '必选','area,brand,shop_category'],
       keyword: ['关键字', 'String', '必选'],

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -15,11 +15,12 @@
       </view>
     </view>
     <!-- #endif -->
-    <view class="jfb-mall-new-shop-list__body">
+    <view class="jfb-mall-new-shop-list__body" >
       <!--搜索条件-->
       <view v-if="showQuery === 'Y' && isFixed" :style="{height:cateFixedHeight + 'rpx'}"></view>
       <view
         class="query_wrap"
+        :class="{isFixed:isFixed}"
         v-if="showQuery === 'Y' && searchFilterList.length > 0"
         :style="[queryWrapStyle]"
       >
@@ -176,6 +177,10 @@
         }
       },
 
+      searchFilterList(val){
+        debugger
+      }
+
     },
     filters:{
       filterLabels(val){
@@ -184,7 +189,7 @@
         else str = val.join(',');
         let maxStr = 9;
         if($vm.filterItemsComp.length === 3) maxStr = 7;
-        if($vm.filterItemsComp.length === 4) maxStr = 5;
+        if($vm.filterItemsComp.length === 4) maxStr = 4;
         if(str.length > maxStr) return str.substring(0,maxStr) + '...'
         return str;
       },
@@ -214,7 +219,7 @@
 
       queryWrapStyle(){
         let top = this.layoutInfo.top;
-        if(this.isFixed) top  = (this.layoutInfo.top + this.cateFixedHeight) + 'rpx';
+        if(this.isFixed) top  = (this.layoutInfo.top) + 'rpx';
         return{
           zIndex: this.showQueryModal ? 1002 : 1,
           backgroundColor: this.filterBgcColor|| '#fff',
@@ -225,13 +230,13 @@
       },
 
       contStyleComp(){
-        //let height = this.layoutInfo.bodyMinHeightRpx  - 72;
+        let height = this.layoutInfo.bodyMinHeightRpx  - 80;
         //大于一个标签显示标签
         //if(this.titleList.length > 1) height = height - 100;
         //if(this.mapIsExtend) height = height - 400;
-        //height = height - this.getPMValue(this.bodyPadding, 'TB', 0);
+        height = height - this.getPMValue(this.bodyPadding, 'TB', 0);
         return {
-          // height: height + 'rpx',
+          minHeight: height + 'rpx',
           padding: this.getMarginAndPadding(this.bodyPadding, 0),
           backgroundColor: this.contentBgColor
         }
@@ -248,6 +253,7 @@
     },
     created() {
       this.isPreview = this.$configProject.isPreview;
+      this.isFixed = !this.isPreview
       this.init(this.container);
       $vm= this;
     },
@@ -281,7 +287,6 @@
         }
         this.cusNames = cusNames;
         this.cusEntry = cusEntry;
-        debugger
 
         //内容显示
         let cusContent = [];
@@ -289,6 +294,7 @@
         if(gCPVal(container,'showStoreAddress','Y') === 'Y') cusContent.push('address'); //门店地址
         if(gCPVal(container,'showStoreDistance','Y') === 'Y') cusContent.push('distance'); //地址
         if(gCPVal(container,'showStorePrice','Y') === 'Y') cusContent.push('price'); // 折扣/价格
+        cusContent.push('image');
         this.cusContent = cusContent;
 
         //style
@@ -365,7 +371,6 @@
           params['longitude'] = this.stateLocation.longitude;
           params['latitude'] = this.stateLocation.latitude;
         }
-
         return params
       },
 
@@ -503,9 +508,12 @@
 
         let data = {
           ...this.options,
-          namespace: this.xnamespace,
+          namespace: 'cake',//this.xnamespace,
           keyword: this.keyword,
           city_code: this.stateCity.city_code,
+          type:'sell',
+          filter_item: this.filterMode.filter(item=>item !== 'filter').join(','),
+
         }
         jfbRootExec("getNewSearchFilterList", {
           vm: this,
@@ -566,8 +574,8 @@
       onJfbLoad(options) {
 
         //测试数据
-        options['brand_id'] = '1007871,100535';
-        options['shop_category_ids'] = 'book,cake';
+        // options['brand_id'] = '1007871,100535';
+        // options['shop_category_ids'] = 'book,cake';
 
         //删除空参数
         if(!baseIsEmpty(options)){
@@ -596,14 +604,12 @@
         }
 
         this.options = this.$xdUniHelper.cloneDeep(options);
-
         this.getSearchFilterList();
         this.getList();
       },
       onJfbReachBottom(options) {
         if(this.loading) return;
         if(this.hasNextPage){
-          this.page_token = this.next_page_token;
           this.getList();
         }
       },
@@ -633,6 +639,11 @@
         position: relative;
         z-index: 103;
         height: 80rpx;
+        box-sizing: border-box;
+        &.isFixed {
+          position: fixed;
+          width: 100%;
+        }
 
         &_tabs {
           display: flex;

package/src/components/JfbMallNewShopList/XdQueryFilter.vue

@@ -4,7 +4,7 @@
       <view
         class="filter_item"
         v-for="tab in filterTabs"
-        :key="tab.title"
+        :key="tab.value"
         :style="[contStyleComp]"
       >
         <view class="filter_title">