jufubao-base 1.0.289-beta5 → 1.0.289-beta7

package/package.json

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

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -40,7 +40,7 @@
               <xd-font-icon size="24" icon="iconxia_down" color="#333"></xd-font-icon>
             </view>
             <view @click="handleGetFilterItem({value:'sort'})" v-if="showSort" class="menu_filter_item" >
-              <view>{{sortData.label || '排序'}}</view>
+              <view>{{sortData.label || '综合'}}</view>
               <xd-font-icon size="24" icon="iconxia_down" color="#333"></xd-font-icon>
             </view>
             <view class="menu_filter_item" @click="handleGetFilterItem(item)" v-for="(item,index) in filterTab" :key="index">
@@ -173,7 +173,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 },
@@ -409,12 +409,13 @@
         this.filterType = item.type
         this.curQueryTab = '';
         this.searchFilterParams = {};
+        this.selectFilterParams = {};
         this.sortData = {};
         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')
           })
@@ -454,8 +455,9 @@
           this.curQueryTab = item.value;
         }
         if (this.curQueryTab === 'sort') {
+          this.sort = 'default'
           this.sortList = [{
-            label: "排序",
+            label: "综合",
             key: "default",
             value: "default"
           }]
@@ -520,6 +522,8 @@
             if (this.$xdUniHelper.checkVarType(ids[key]) === 'array') {
               if (ids[key].length === 0) {
                 this.searchFilterParams[maps[key]] = ''
+              } else {
+                this.searchFilterParams[maps[key]] = ids[key].join(',')
               }
             }
           }

package/src/components/JfbBaseTfkSearch/XdQueryFilter.vue

@@ -216,16 +216,9 @@ export default {
     setChooseTag(tab, item){
       //单选
       if(!tab.multiple) {
-        //取消
-        if(this.selectedIds[tab.value] && this.selectedIds[tab.value].includes(item.value)) {
-          this.setSelectData(tab.value, '', '', '')
-        }
-        //新增
-        else {
-          this.setSelectData(tab.value, item.value, item, item.label);
-          //单选直接触发返回数据
-          if(this.isShowBtn === false) this.onConfirm();
-        }
+        this.setSelectData(tab.value, item.value, item, item.label);
+        //单选直接触发返回数据
+        if(this.isShowBtn === false) this.onConfirm();
       }
       //多选
       else {