jufubao-base 1.0.289-beta6 → 1.0.289-beta9

package/package.json

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

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -68,6 +68,7 @@
               ></xd-query-sort>
           </view>
         </view>
+        <view v-show="curQueryTab" class="modal"></view>
 
         <view v-if="!isPreview" :style="{height: menuHeight}"></view>
         <view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
@@ -173,7 +174,7 @@
         filterTabIcon: [
           { value: 'area', label: '区域',icon: 'icondizhitubiao', size: 24 },
           { value: 'brand', label: '品牌',icon: 'iconxia_down', size: 18 },
-          { value: 'shop', label: '门店分类',icon: 'iconxia_down', size: 18 },
+          { value: 'shop_category', label: '门店分类',icon: 'iconxia_down', size: 18 },
           { value: 'filter', label: '筛选', icon: 'iconshaixuanbiaoji_mian', size: 24 },
           { value: 'comprehensive', label: '综合', icon: 'iconxia_down', size: 18 },
           { value: 'sort', label: '排序', icon: 'iconxia_down', size: 18 },
@@ -193,7 +194,7 @@
         showSort:false,
         brands: [],
         namespace: '',
-        sortList: []
+        sortList: [],
       }
     },
     computed: {
@@ -287,6 +288,9 @@
           allModuleItemContRadius: this.allModuleItemContRadius,
           allModuleItemContBgColor: this.allModuleItemContBgColor
         }
+      },
+      showQueryModal() {
+        return this.curQueryTab?true:false
       }
     },
     watch: {
@@ -414,8 +418,8 @@
         this.sort = '';
         if (item.filter_item && item.filter_item.tab_filter) {
           // 综合和排序的显示状态，当选中综合或排序时，下拉菜单取本地数据
-          this.showComprehensive = item.filter_item.tab_filter.find(item => item.value === 'comprehensive')
-          this.showSort = item.filter_item.tab_filter.find(item => item.value === 'sort')
+          this.showComprehensive = item.filter_item.tab_filter.find(item => item.value === 'comprehensive')?true:false;
+          this.showSort = item.filter_item.tab_filter.find(item => item.value === 'sort')?true:false;
           let filter_item = item.filter_item.tab_filter.filter(item => {
             return (item.value !== 'comprehensive'&&item.value !== 'sort')
           })
@@ -509,11 +513,11 @@
       },
       handleQueryFilter({ items, ids, labels }) {
         const maps = {
-          'brand': 'brands',
+          'brand': 'brand_ids',
           'area': 'area_codes',
           'delivery_method': 'delivery_methods',
           'shop_category': 'category_ids',
-          'business_line': 'business_lines'
+          'business_line': 'namespaces'
         };
         Object.keys(items).map(key => {
           let keys = Object.keys(maps);
@@ -616,4 +620,13 @@
       }
     }
   }
+  .modal{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    background: rgba(0, 0, 0, .4);
+    z-index: 102;
+  }
 </style>

package/src/components/JfbBaseTfkSearch/XdQueryFilter.vue

@@ -309,7 +309,7 @@ export default {
       flex-wrap: wrap;
       justify-content: flex-start;
       align-items: center;
-      max-height: 50vh;
+      // max-height: 50vh;
 
       & > ._tag{
         text-align: center;