jufubao-mall 2.0.16-beta57 → 2.0.16-beta59

package/package.json

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

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -596,6 +596,9 @@
         }
         // 折扣/价格
         this.showStorePrice = gCPVal(container,'showStorePrice', 'Y');
+        if(this.showStorePrice==='Y'){
+          cusContent.push('price')
+        }
         //折扣/价格选项
         // this.showPriceType = gCPVal(container,'showPriceType', 'discount');
         // if(this.showStorePrice==='Y'){
@@ -606,6 +609,7 @@
         //   }
         // }
         this.cusContent = cusContent;
+        console.log(this.cusContent,'cusContent')
         //筛选条件状态
         let showQuery = gCPVal(container,'showQuery', 'Y');
         if(showQuery === 'Y') this.filterMode = gCPVal(container, 'filterMode', ['filter'])
@@ -781,12 +785,13 @@
           consume_mode: this.consume_mode,
           keyword: this.keyword
         }
-        
-        if(this.dimension==='business'){
-          data.namespaces = this.namespace
-        } else {
-          //当导航维度是按门店分类时，用category_id承载namespace
-          data.category_ids = this.namespace
+        if(this.showBusinessLine==='Y'){
+          if(this.dimension==='business'){
+            data.namespaces = this.namespace
+          } else {
+            //当导航维度是按门店分类时，用category_id承载namespace
+            data.category_ids = this.namespace
+          }
         }
         if(this.area_code) data.area_code = this.area_code;
         this.$xdShowLoading({});
@@ -852,6 +857,7 @@
           params['longitude'] = this.stateLocation.longitude;
           params['latitude'] = this.stateLocation.latitude;
         }
+        console.log(params,'params' )
         return params
       },
       getFilter(cb, options){
@@ -895,6 +901,9 @@
               this.searchFilterList = [];
             }else{
               this.searchFilterList = res.items || [];
+              //过滤筛选条件
+              // debugger
+              this.filterSearchMap();
               console.log(  this.searchFilterList,'  this.searchFilterList')
             }
             this.brandList = res.brands.map(item => {
@@ -928,7 +937,7 @@
             }
             // setTimeout(()=>{
             this.$nextTick(()=>{
-              this.$xdUniHelper.getWindowHeight(['.menu_wrap','.business_wrap','addr_wrap','.brand_wrap','.query_filter'], this)
+              this.$xdUniHelper.getWindowHeight(['.menu_wrap','.business_wrap','.addr_wrap','.brand_wrap','.query_filter'], this)
                 .then(res => {
                   console.log(res,'res')
                   let num = 0;let menuWrapNum;let modelTop=0;

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

@@ -13,19 +13,19 @@ import {
 export default (data, gValue, gColor, oldData) => {
   console.log(data,'dddddsss')
   let showStoreImg = 'Y'
-  let showStoreAddress = 'Y'
+  // let showStoreAddress = 'Y'
   //变化的时候
   if(oldData.layout!==data.layout){
     if(data.layout==='v3'){
       showStoreImg = 'N';
     }
-    if(data.layout==='v2'){
-      showStoreAddress = 'N';
-    }
+    // if(data.layout==='v2'){
+    //   showStoreAddress = 'N';
+    // }
   }
   else{
     if(data['showStoreImg']) showStoreImg = data['showStoreImg']
-    if(data['showStoreAddress']) showStoreAddress = data['showStoreAddress']
+    // if(data['showStoreAddress']) showStoreAddress = data['showStoreAddress']
   }
   console.log(data.layout,data.showStoreImg,data.layout==='v3',oldData,'asdasda')
   let defQuickEntry = [
@@ -263,7 +263,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '门店地址',
       ele: 'xd-cus-switch',
       valueKey: 'showStoreAddress',
-      value: showStoreAddress,
+      value: dataVal({data, key:'showStoreAddress', dValue:"Y", gValue}),
       isRefresh: true, 
       className: 'input100',
       groupKey:'content',
@@ -291,7 +291,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '折扣/价格',
       ele: 'xd-cus-switch',
       valueKey: 'showStorePrice',
-      value: dataVal({data, key:'showStorePrice', dValue:"Y", gValue}),
+      value: dataVal({data, key:'showStorePrice', dValue:"N", gValue}),
       className: 'input100',
       groupKey:'content',
       labelInline:true,