fix: 修改在线求购接口筛选参数

package.json

@@ -52,7 +52,7 @@
     "bizcharts": "^4.0.14",
     "copy-to-clipboard": "^3.3.1",
     "crypto-js": "^4.0.0",
-    "god": "0.2.4",
+    "god": "^0.2.4",
     "immutability-helper": "^3.1.1",
     "lingxi-design": "^1.0.8",
     "lingxi-design-ui": "^1.1.16",
@@ -92,8 +92,8 @@
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
-    "god-upload-scp": "^1.2.0",
-    "god-yapi2ts": "1.9.0",
+    "god-upload-scp": "1.0.1",
+    "god-yapi2ts": "^1.0.0",
     "gulp": "^4.0.2",
     "gulp-git": "^2.10.1",
     "http-proxy-middleware": "^1.0.5",

src/constants/index.ts

@@ -58,7 +58,11 @@ export enum LAYOUT_TYPE {
   /**
    * 店铺列表
    */
-  shopList = 'shopList'
+  shopList = 'shopList',
+  /**
+   * 在线求购
+   */
+  purchaseOnline = 'purchaseOnline'
 }
 
 // 本地环境跳过权限校验
@@ -84,6 +88,10 @@ export enum FILTER_TYPE {
    */
   category = 'category',
   /**
+   * 分类名称
+   */
+  categoryName = 'categoryName',
+  /**
    * 会员品类
    */
   customerCategory = 'customerCategory',

src/pages/lxMall/components/Filter/components/Category/index.tsx

@@ -67,6 +67,7 @@ const Category: React.FC<CategoryPropsType> = (props) => {
      */
     switch (layoutType) {
       case LAYOUT_TYPE.mall:
+      case LAYOUT_TYPE.purchaseOnline:
         getCategoryListFn = PublicApi.getSearchShopEnterpriseGetCategoryTree
         break
       case LAYOUT_TYPE.shop:
@@ -216,6 +217,13 @@ const Category: React.FC<CategoryPropsType> = (props) => {
           title: typeof title === 'string' ? title : name
         })
         break
+      case LAYOUT_TYPE.purchaseOnline:
+         onFilter({
+          type: FILTER_TYPE.categoryName,
+          key: typeof title === 'string' ? title : name,
+          title: typeof title === 'string' ? title : name
+        })
+        break
       default:
         onFilter({
           type: FILTER_TYPE.customerCategory,

src/pages/lxMall/components/Filter/components/UseArea/index.tsx

@@ -14,8 +14,7 @@ interface UseAreaPropsType {
   memberId?: number;
 }
 
-
-interface useAreaType {
+interface UseAreaType {
   /**
    * 省份名称
    */
@@ -42,16 +41,16 @@ interface useAreaType {
 const UseArea: React.FC<UseAreaPropsType> = (props) => {
   const { layoutType = LAYOUT_TYPE.mall, shopId, memberId } = props
   const { onFilter, filterList } = props.FilterStore
-  const [areaList, setAreaList] = useState<useAreaType[]>([])
+  const [areaList, setAreaList] = useState<UseAreaType[]>([])
   const [selectCity, setSelectCity] = useState<string[]>([])
 
   useEffect(() => {
     if (isEmpty(filterList)) {
       setSelectCity([])
     } else {
-      let initKeys = []
+      const initKeys = []
       if (layoutType !== LAYOUT_TYPE.shopList) {
-        for (let item of filterList) {
+        for (const item of filterList) {
           if (item.type === FILTER_TYPE.province) {
             initKeys.push(item.key)
           } else if (item.type === FILTER_TYPE.city) {
@@ -65,11 +64,12 @@ const UseArea: React.FC<UseAreaPropsType> = (props) => {
 
   useEffect(() => {
     let getAreaFn
-    let param: any = {}
+    const param: any = {}
     let headers = {}
     switch (layoutType) {
       case LAYOUT_TYPE.mall:
       case LAYOUT_TYPE.shopList:
+      case LAYOUT_TYPE.purchaseOnline:
         getAreaFn = PublicApi.getSearchShopEnterpriseGetArea
         break
       case LAYOUT_TYPE.shop:
@@ -106,12 +106,12 @@ const UseArea: React.FC<UseAreaPropsType> = (props) => {
   }, [layoutType])
 
   const initAreaData = (data: GetSearchShopEnterpriseGetAreaResponse) => {
-    if (!!data) {
+    if (data) {
       return data.map(item => {
         return {
           label: item.provinceName,
           value: item.provinceCode,
-          children: !!item.cityList ? item.cityList.map(childItem => {
+          children: item.cityList ? item.cityList.map(childItem => {
             return {
               label: childItem.cityName,
               value: childItem.cityCode,
@@ -171,7 +171,7 @@ const UseArea: React.FC<UseAreaPropsType> = (props) => {
 
   const getProvinceText = (code: string) => {
     let result = ""
-    for (let item of areaList) {
+    for (const item of areaList) {
       if (item.value === code) {
         result = item.label
       }

src/pages/lxMall/purchaseOnline/index.tsx

 import React, { useState, useEffect } from 'react'
 import { CaretUpOutlined, CaretDownOutlined, UnorderedListOutlined, AppstoreOutlined, CloseOutlined } from '@ant-design/icons'
 import Filter from '../components/Filter'
-import { FILTER_TYPE } from '@/constants'
+import { FILTER_TYPE, LAYOUT_TYPE } from '@/constants'
 import cx from 'classnames'
 import SearchNoResult from '../components/SearchNoResult'
 import { Pagination, message } from 'antd'
@@ -10,7 +10,6 @@ import { useLocalStore, observer } from 'mobx-react'
 import { store } from '@/store'
 import isEmpty from 'lodash/isEmpty'
 import { PublicApi } from '@/services/api'
-import { LAYOUT_TYPE } from '@/constants'
 import { GetOrderRequisitionFormOnlineShoppingListResponseDetail } from '@/services/OrderApi'
 import styles from './index.less'
 
@@ -178,7 +177,7 @@ const PurchaseOnline: React.FC<PurchaseOnlinePropsType> = (props) => {
     <div className={styles.purchaseOnline}>
       <div className={styles.mall_container}>
         <div className={styles.commodity_container}>
-          <Filter filterConfig={filterConfig}  {...props} />
+          <Filter filterConfig={filterConfig}  {...props} layoutType={LAYOUT_TYPE.purchaseOnline} />
           <div className={styles.commodity_main}>
             <div className={styles.tool_bar}>
               <div className={styles.tool_bar_left}>

src/store/filter/index.ts

-import { action, observable, runInAction } from 'mobx'
-import { PublicApi } from '@/services/api'
-import { FILTER_TYPE } from '@/constants'
-
-interface FilterValueType {
-  key: any;
-  title: string;
-  type: FILTER_TYPE;
-}
-
-interface FilterQuery {
-  current: number;
-  pageSize: number;
-  name?: string;
-  categoryId?: number;
-  customerCategoryId?: number;
-  provinceCode?: number;
-  cityCode?: number;
-  brandId?: number;
-  customerAttributeList?: any;
-  Min?: number;
-  Max?: number;
-  priceType?: number;
-
-}
-
-const styleOptions = [
-  { label: '只看现价商品', value: 1 },
-  { label: '只看询价商品', value: 2 },
-];
-
-const getItemText = (key: number) => {
-  let result = ""
-  for (const item of styleOptions) {
-    if (item.value === key) {
-      result = item.label
-    }
-  }
-  return result
-}
-
-const changeAttributeDate = (list, change = false) => {
-  if (!list) {
-    return []
-  }
-  let result = list.filter(item => item.customerAttributeValueList.length > 0)
-  if (change) {
-    result = result.map(item => {
-      return {
-        id: item.customerAttributeId,
-        name: item.customerAttributeName,
-        customerAttributeValueList: item.customerAttributeValueList
-      }
-    })
-  }
-  return result
-}
-
-class FilterStore {
-  /**
-   * 筛选条件列表
-   */
-  @observable filterList = []
-  @observable filterUpdate = false
-  @observable filterParam: FilterQuery | {} = {}
-  @observable commonlyUseFilter: any = [] // 常用筛选项
-  @observable commonlyUseFilterId = null
-  /**
-   * 筛选
-   * @param filterValue
-   */
-  @action.bound
-  public onFilter = (filterValue: FilterValueType) => {
-    const filteState = this.filterList.some(item => item.type === filterValue.type)
-    let tempFilterList = [...this.filterList]
-    if (filteState) {
-      if (!filterValue.key) {
-        tempFilterList = tempFilterList.filter(item => {
-          if (item.type === filterValue.type) {
-            return item.key === filterValue.key
-          }
-          return true
-        })
-
-      } else {
-        tempFilterList = tempFilterList.map(item => {
-          if (item.type === filterValue.type) {
-            return filterValue
-          }
-          return item
-        })
-      }
-    } else {
-      tempFilterList = [...tempFilterList, filterValue]
-    }
-    this.filterUpdate = true
-    this.filterList = tempFilterList
-    this.commonlyUseFilterId = null
-  }
-  /**
-   * 重置筛选项
-   */
-  @action.bound
-  public onResetFilter = () => {
-    this.filterList = []
-    this.filterUpdate = true
-    this.commonlyUseFilterId = null
-  }
-
-  /**
-   * 删除筛选选项
-   * @param key
-   * @param type
-   */
-  @action.bound
-  public onDeleteFilterItem = (key: string, type: FILTER_TYPE) => {
-    let tempFilterList = [...this.filterList]
-    tempFilterList = tempFilterList.filter(item => {
-      if (item.type === type) {
-        return String(item.key) !== String(key)
-      }
-      return true
-    })
-    this.filterList = tempFilterList
-    this.filterUpdate = true
-    this.commonlyUseFilterId = null
-  }
-
-  /**
-   * 筛选条件修改
-   * @param newFilterList
-   */
-  @action.bound
-  public onFilterParamChange = (newFilterList: any) => {
-    const tempFilterParam: any = {}
-    for (const filterItem of newFilterList) {
-      switch (filterItem.type) {
-        case FILTER_TYPE.category:
-          if(Number(filterItem.key[0])) {
-            tempFilterParam.categoryId = Number(filterItem.key[0])
-          }
-          break
-        case FILTER_TYPE.customerCategory:
-          tempFilterParam.customerCategoryId = Number(filterItem.key[0])
-          break
-        case FILTER_TYPE.commodityType:
-          tempFilterParam.priceTypeList = [filterItem.key]
-          break
-        case FILTER_TYPE.minPoints:
-        case FILTER_TYPE.minPrice:
-          tempFilterParam.min = filterItem.key
-          break
-        case FILTER_TYPE.maxPoints:
-        case FILTER_TYPE.maxPrice:
-          tempFilterParam.max = filterItem.key
-          break
-        case FILTER_TYPE.brand:
-          tempFilterParam.brandId = filterItem.key
-          break
-        case FILTER_TYPE.province:
-          tempFilterParam.provinceCode = filterItem.key
-          break
-        case FILTER_TYPE.city:
-          tempFilterParam.cityCode = filterItem.key
-          break
-         case FILTER_TYPE.sort:
-          switch(filterItem.key) {
-            case 'soldSort':
-              tempFilterParam.orderType = 1
-              break
-            case 'creditSort':
-              tempFilterParam.orderType = 2
-              break
-            case 'priceSortHighToLow':
-              tempFilterParam.orderType = 3
-              break
-            case 'priceSortLowToHigh':
-              tempFilterParam.orderType = 4
-              break
-          }
-          break
-        case FILTER_TYPE.soldSort:
-          tempFilterParam.orderType = 1
-          break
-        case FILTER_TYPE.creditSort:
-          tempFilterParam.orderType = 2
-          break
-        case FILTER_TYPE.priceSortHighToLow:
-          tempFilterParam.orderType = 3
-          break
-        case FILTER_TYPE.priceSortLowToHigh:
-          tempFilterParam.orderType = 4
-          break
-        case FILTER_TYPE.attribute:
-          let attributeList = filterItem.key
-          attributeList = changeAttributeDate(attributeList)
-          tempFilterParam.customerAttributeList = attributeList
-          break
-        case FILTER_TYPE.shopArea:
-          tempFilterParam.areaCode = filterItem.key
-          break
-        default:
-          break
-      }
-    }
-    if (JSON.stringify(this.filterParam) === JSON.stringify(tempFilterParam)) {
-      return
-    }
-    this.filterParam = tempFilterParam
-  }
-
-  /**
-   * 新增常用筛选
-   */
-  @action.bound
-  public async saveCommonlyUsedFilter(name: string) {
-    return new Promise((resolve, reject) => {
-      const tempFilterParam: any = {}
-      tempFilterParam.name = name
-      for (const filterItem of this.filterList) {
-        switch (filterItem.type) {
-          case FILTER_TYPE.category:
-            tempFilterParam.customerCategoryId = filterItem.key[0]
-            tempFilterParam.customerCategoryName = filterItem.title
-            break
-          case FILTER_TYPE.customerCategory:
-            tempFilterParam.customerCategoryId = filterItem.key[0]
-            tempFilterParam.customerCategoryName = filterItem.title
-            break
-          case FILTER_TYPE.brand:
-            tempFilterParam.brandId = filterItem.key
-            tempFilterParam.brandName = filterItem.title
-            break
-          case FILTER_TYPE.commodityType:
-            tempFilterParam.priceTypeList = [filterItem.key]
-            break
-          case FILTER_TYPE.minPrice:
-            tempFilterParam.min = filterItem.key
-            break
-          case FILTER_TYPE.maxPrice:
-            tempFilterParam.max = filterItem.key
-            break
-          case FILTER_TYPE.province:
-            tempFilterParam.provinceCode = filterItem.key
-            tempFilterParam.provinceName = filterItem.title
-            break
-          case FILTER_TYPE.city:
-            tempFilterParam.cityCode = filterItem.key
-            tempFilterParam.cityName = filterItem.title
-            break
-          case FILTER_TYPE.attribute:
-            let attributeList = filterItem.key
-            attributeList = changeAttributeDate(attributeList, true)
-            tempFilterParam.customerAttributeList = attributeList
-            break
-          default:
-            break
-        }
-      }
-      PublicApi.postSearchShopOftenSelectSaveOrUpdateOftenSelect(tempFilterParam).then(res => {
-        if (res.code === 1000) {
-          this.getCommonlyUsedFilterList()
-          resolve()
-        } else {
-          reject()
-        }
-      })
-    })
-  }
-
-  /**
-   * 查询常用筛选列表
-   */
-  @action.bound
-  public async getCommonlyUsedFilterList() {
-    const param: any = {
-      current: 1,
-      pageSize: 50,
-    }
-    const res = await PublicApi.getSearchShopOftenSelectGetOftenSelectList(param)
-    runInAction(() => {
-      if (res.code === 1000) {
-        this.commonlyUseFilter = res.data.data || []
-      }
-    })
-  }
-
-  /**
-   * 删除常用筛选项
-   */
-  @action.bound
-  public async deleteCommonlyUsedFilterItem(id: number) {
-    return new Promise((resolve, reject) => {
-      PublicApi.postSearchShopOftenSelectDeleteOftenSelect({ id }).then(res => {
-        if (res.code === 1000) {
-          this.getCommonlyUsedFilterList()
-          resolve()
-        } else {
-          reject()
-        }
-      })
-    })
-  }
-
-  /**
- * 删除常用筛选项
- */
-  @action.bound
-  public async useCommonlyFilter(id: number) {
-    if (this.commonlyUseFilterId === id) {
-      return
-    } else {
-      this.commonlyUseFilterId = id
-    }
-    const param: any = {
-      id
-    }
-    const res = await PublicApi.getSearchShopOftenSelectGetOftenSelect(param)
-    runInAction(() => {
-      if (res.code === 1000) {
-        const data = res.data
-        const tempFilter = []
-        if (data.customerCategoryId && data.customerCategoryName) {
-          tempFilter.push({
-            type: FILTER_TYPE.category,
-            title: data.customerCategoryName,
-            key: [data.customerCategoryId]
-          })
-        }
-        if (data.brandId && data.brandName) {
-          tempFilter.push({
-            type: FILTER_TYPE.brand,
-            title: data.brandName,
-            key: data.brandId
-          })
-        }
-        if (data.min || data.min === 0) {
-          tempFilter.push({
-            type: FILTER_TYPE.minPrice,
-            title: `最低 ¥ ${data.min} `,
-            key: data.min
-          })
-        }
-        if (data.max) {
-          tempFilter.push({
-            type: FILTER_TYPE.maxPrice,
-            title: `最高 ¥ ${data.max} `,
-            key: data.max
-          })
-        }
-
-        if (data.provinceCode && data.provinceName) {
-          tempFilter.push({
-            type: FILTER_TYPE.province,
-            title: data.provinceName,
-            key: data.provinceCode
-          })
-        }
-        if (data.cityCode && data.cityName) {
-          tempFilter.push({
-            type: FILTER_TYPE.city,
-            title: data.cityName,
-            key: data.cityCode
-          })
-        }
-        if (data.priceType) {
-          tempFilter.push({
-            type: FILTER_TYPE.commodityType,
-            title: [getItemText(data.priceType)],
-            key: data.priceType
-          })
-        }
-        if (data.customerAttributeList) {
-          const newCustomerAttributeList = data.customerAttributeList.map(item => {
-            return {
-              customerAttributeId: item.id,
-              customerAttributeName: item.name,
-              customerAttributeValueList: item.customerAttributeValueList
-            }
-          })
-          tempFilter.push({
-            type: FILTER_TYPE.attribute,
-            title: `${data.customerAttributeList.map((tsItem: any) => {
-              return `${tsItem.name}：${tsItem.customerAttributeValueList.map(cabItem => cabItem.name)}`
-            }).join('；')}`,
-            key: newCustomerAttributeList
-          })
-        }
-        this.filterList = tempFilter
-      }
-    })
-  }
-
-
-}
-
-export default FilterStore
+import { action, observable, runInAction } from 'mobx'
+import { PublicApi } from '@/services/api'
+import { FILTER_TYPE } from '@/constants'
+
+interface FilterValueType {
+  key: any;
+  title: string;
+  type: FILTER_TYPE;
+}
+
+interface FilterQuery {
+  current: number;
+  pageSize: number;
+  name?: string;
+  categoryId?: number;
+  customerCategoryId?: number;
+  provinceCode?: number;
+  cityCode?: number;
+  brandId?: number;
+  customerAttributeList?: any;
+  Min?: number;
+  Max?: number;
+  priceType?: number;
+
+}
+
+const styleOptions = [
+  { label: '只看现价商品', value: 1 },
+  { label: '只看询价商品', value: 2 },
+];
+
+const getItemText = (key: number) => {
+  let result = ""
+  for (const item of styleOptions) {
+    if (item.value === key) {
+      result = item.label
+    }
+  }
+  return result
+}
+
+const changeAttributeDate = (list, change = false) => {
+  if (!list) {
+    return []
+  }
+  let result = list.filter(item => item.customerAttributeValueList.length > 0)
+  if (change) {
+    result = result.map(item => {
+      return {
+        id: item.customerAttributeId,
+        name: item.customerAttributeName,
+        customerAttributeValueList: item.customerAttributeValueList
+      }
+    })
+  }
+  return result
+}
+
+class FilterStore {
+  /**
+   * 筛选条件列表
+   */
+  @observable filterList = []
+  @observable filterUpdate = false
+  @observable filterParam: FilterQuery | {} = {}
+  @observable commonlyUseFilter: any = [] // 常用筛选项
+  @observable commonlyUseFilterId = null
+  /**
+   * 筛选
+   * @param filterValue
+   */
+  @action.bound
+  public onFilter = (filterValue: FilterValueType) => {
+    const filteState = this.filterList.some(item => item.type === filterValue.type)
+    let tempFilterList = [...this.filterList]
+    if (filteState) {
+      if (!filterValue.key) {
+        tempFilterList = tempFilterList.filter(item => {
+          if (item.type === filterValue.type) {
+            return item.key === filterValue.key
+          }
+          return true
+        })
+
+      } else {
+        tempFilterList = tempFilterList.map(item => {
+          if (item.type === filterValue.type) {
+            return filterValue
+          }
+          return item
+        })
+      }
+    } else {
+      tempFilterList = [...tempFilterList, filterValue]
+    }
+    this.filterUpdate = true
+    this.filterList = tempFilterList
+    this.commonlyUseFilterId = null
+  }
+  /**
+   * 重置筛选项
+   */
+  @action.bound
+  public onResetFilter = () => {
+    this.filterList = []
+    this.filterUpdate = true
+    this.commonlyUseFilterId = null
+  }
+
+  /**
+   * 删除筛选选项
+   * @param key
+   * @param type
+   */
+  @action.bound
+  public onDeleteFilterItem = (key: string, type: FILTER_TYPE) => {
+    let tempFilterList = [...this.filterList]
+    tempFilterList = tempFilterList.filter(item => {
+      if (item.type === type) {
+        return String(item.key) !== String(key)
+      }
+      return true
+    })
+    this.filterList = tempFilterList
+    this.filterUpdate = true
+    this.commonlyUseFilterId = null
+  }
+
+  /**
+   * 筛选条件修改
+   * @param newFilterList
+   */
+  @action.bound
+  public onFilterParamChange = (newFilterList: any) => {
+    const tempFilterParam: any = {}
+    for (const filterItem of newFilterList) {
+      switch (filterItem.type) {
+        case FILTER_TYPE.category:
+          if(Number(filterItem.key[0])) {
+            tempFilterParam.categoryId = Number(filterItem.key[0])
+          }
+          break
+        case FILTER_TYPE.customerCategory:
+          tempFilterParam.customerCategoryId = Number(filterItem.key[0])
+          break
+        case FILTER_TYPE.commodityType:
+          tempFilterParam.priceTypeList = [filterItem.key]
+          break
+        case FILTER_TYPE.minPoints:
+        case FILTER_TYPE.minPrice:
+          tempFilterParam.min = filterItem.key
+          break
+        case FILTER_TYPE.maxPoints:
+        case FILTER_TYPE.maxPrice:
+          tempFilterParam.max = filterItem.key
+          break
+        case FILTER_TYPE.brand:
+          tempFilterParam.brandId = filterItem.key
+          break
+        case FILTER_TYPE.province:
+          tempFilterParam.provinceCode = filterItem.key
+          break
+        case FILTER_TYPE.city:
+          tempFilterParam.cityCode = filterItem.key
+          break
+         case FILTER_TYPE.sort:
+          switch(filterItem.key) {
+            case 'soldSort':
+              tempFilterParam.orderType = 1
+              break
+            case 'creditSort':
+              tempFilterParam.orderType = 2
+              break
+            case 'priceSortHighToLow':
+              tempFilterParam.orderType = 3
+              break
+            case 'priceSortLowToHigh':
+              tempFilterParam.orderType = 4
+              break
+          }
+          break
+        case FILTER_TYPE.soldSort:
+          tempFilterParam.orderType = 1
+          break
+        case FILTER_TYPE.creditSort:
+          tempFilterParam.orderType = 2
+          break
+        case FILTER_TYPE.priceSortHighToLow:
+          tempFilterParam.orderType = 3
+          break
+        case FILTER_TYPE.priceSortLowToHigh:
+          tempFilterParam.orderType = 4
+          break
+        case FILTER_TYPE.attribute:
+          let attributeList = filterItem.key
+          attributeList = changeAttributeDate(attributeList)
+          tempFilterParam.customerAttributeList = attributeList
+          break
+        case FILTER_TYPE.shopArea:
+          tempFilterParam.areaCode = filterItem.key
+          break
+        case FILTER_TYPE.creditSortLowToHigh:
+          tempFilterParam.sortCredit = 1
+          break
+        case FILTER_TYPE.creditSortHighToLow:
+          tempFilterParam.sortCredit = 2
+          break
+        case FILTER_TYPE.dateSortLowToHigh:
+          tempFilterParam.sortTime = 1
+          break
+        case FILTER_TYPE.dateSortHighToLow:
+          tempFilterParam.sortTime = 2
+          break
+        case FILTER_TYPE.categoryName:
+          tempFilterParam.category = filterItem.key
+          break
+        default:
+          break
+      }
+    }
+    if (JSON.stringify(this.filterParam) === JSON.stringify(tempFilterParam)) {
+      return
+    }
+    this.filterParam = tempFilterParam
+  }
+
+  /**
+   * 新增常用筛选
+   */
+  @action.bound
+  public async saveCommonlyUsedFilter(name: string) {
+    return new Promise((resolve, reject) => {
+      const tempFilterParam: any = {}
+      tempFilterParam.name = name
+      for (const filterItem of this.filterList) {
+        switch (filterItem.type) {
+          case FILTER_TYPE.category:
+            tempFilterParam.customerCategoryId = filterItem.key[0]
+            tempFilterParam.customerCategoryName = filterItem.title
+            break
+          case FILTER_TYPE.customerCategory:
+            tempFilterParam.customerCategoryId = filterItem.key[0]
+            tempFilterParam.customerCategoryName = filterItem.title
+            break
+          case FILTER_TYPE.brand:
+            tempFilterParam.brandId = filterItem.key
+            tempFilterParam.brandName = filterItem.title
+            break
+          case FILTER_TYPE.commodityType:
+            tempFilterParam.priceTypeList = [filterItem.key]
+            break
+          case FILTER_TYPE.minPrice:
+            tempFilterParam.min = filterItem.key
+            break
+          case FILTER_TYPE.maxPrice:
+            tempFilterParam.max = filterItem.key
+            break
+          case FILTER_TYPE.province:
+            tempFilterParam.provinceCode = filterItem.key
+            tempFilterParam.provinceName = filterItem.title
+            break
+          case FILTER_TYPE.city:
+            tempFilterParam.cityCode = filterItem.key
+            tempFilterParam.cityName = filterItem.title
+            break
+          case FILTER_TYPE.attribute:
+            let attributeList = filterItem.key
+            attributeList = changeAttributeDate(attributeList, true)
+            tempFilterParam.customerAttributeList = attributeList
+            break
+          default:
+            break
+        }
+      }
+      PublicApi.postSearchShopOftenSelectSaveOrUpdateOftenSelect(tempFilterParam).then(res => {
+        if (res.code === 1000) {
+          this.getCommonlyUsedFilterList()
+          resolve()
+        } else {
+          reject()
+        }
+      })
+    })
+  }
+
+  /**
+   * 查询常用筛选列表
+   */
+  @action.bound
+  public async getCommonlyUsedFilterList() {
+    const param: any = {
+      current: 1,
+      pageSize: 50,
+    }
+    const res = await PublicApi.getSearchShopOftenSelectGetOftenSelectList(param)
+    runInAction(() => {
+      if (res.code === 1000) {
+        this.commonlyUseFilter = res.data.data || []
+      }
+    })
+  }
+
+  /**
+   * 删除常用筛选项
+   */
+  @action.bound
+  public async deleteCommonlyUsedFilterItem(id: number) {
+    return new Promise((resolve, reject) => {
+      PublicApi.postSearchShopOftenSelectDeleteOftenSelect({ id }).then(res => {
+        if (res.code === 1000) {
+          this.getCommonlyUsedFilterList()
+          resolve()
+        } else {
+          reject()
+        }
+      })
+    })
+  }
+
+  /**
+ * 删除常用筛选项
+ */
+  @action.bound
+  public async useCommonlyFilter(id: number) {
+    if (this.commonlyUseFilterId === id) {
+      return
+    } else {
+      this.commonlyUseFilterId = id
+    }
+    const param: any = {
+      id
+    }
+    const res = await PublicApi.getSearchShopOftenSelectGetOftenSelect(param)
+    runInAction(() => {
+      if (res.code === 1000) {
+        const data = res.data
+        const tempFilter = []
+        if (data.customerCategoryId && data.customerCategoryName) {
+          tempFilter.push({
+            type: FILTER_TYPE.category,
+            title: data.customerCategoryName,
+            key: [data.customerCategoryId]
+          })
+        }
+        if (data.brandId && data.brandName) {
+          tempFilter.push({
+            type: FILTER_TYPE.brand,
+            title: data.brandName,
+            key: data.brandId
+          })
+        }
+        if (data.min || data.min === 0) {
+          tempFilter.push({
+            type: FILTER_TYPE.minPrice,
+            title: `最低 ¥ ${data.min} `,
+            key: data.min
+          })
+        }
+        if (data.max) {
+          tempFilter.push({
+            type: FILTER_TYPE.maxPrice,
+            title: `最高 ¥ ${data.max} `,
+            key: data.max
+          })
+        }
+
+        if (data.provinceCode && data.provinceName) {
+          tempFilter.push({
+            type: FILTER_TYPE.province,
+            title: data.provinceName,
+            key: data.provinceCode
+          })
+        }
+        if (data.cityCode && data.cityName) {
+          tempFilter.push({
+            type: FILTER_TYPE.city,
+            title: data.cityName,
+            key: data.cityCode
+          })
+        }
+        if (data.priceType) {
+          tempFilter.push({
+            type: FILTER_TYPE.commodityType,
+            title: [getItemText(data.priceType)],
+            key: data.priceType
+          })
+        }
+        if (data.customerAttributeList) {
+          const newCustomerAttributeList = data.customerAttributeList.map(item => {
+            return {
+              customerAttributeId: item.id,
+              customerAttributeName: item.name,
+              customerAttributeValueList: item.customerAttributeValueList
+            }
+          })
+          tempFilter.push({
+            type: FILTER_TYPE.attribute,
+            title: `${data.customerAttributeList.map((tsItem: any) => {
+              return `${tsItem.name}：${tsItem.customerAttributeValueList.map(cabItem => cabItem.name)}`
+            }).join('；')}`,
+            key: newCustomerAttributeList
+          })
+        }
+        this.filterList = tempFilter
+      }
+    })
+  }
+
+
+}
+
+export default FilterStore