fix：处理行业二级分类筛选查询及导出参数

apps/bigmember_pc/src/components/push-list/PushList.vue

@@ -329,7 +329,8 @@ import {
   dateFromNow,
   replaceKeyword,
   moneyUnit,
-  openLinkInWorkspace
+  openLinkInWorkspace,
+  formatFilterApiOther
 } from '@/utils/'
 import { getEventTarget } from '@/utils/jq-help'
 import { mixinVisited } from '@/utils/mixins/visited'
@@ -926,7 +927,10 @@ export default {
         query.isEnt = true
       }
       // delete query.item  所有订阅列表都增加item参数
-
+      // PS:行业二级分类有“其他”的时候 提交时需要再增加个“其它”
+      if(query.industry) {
+        query.industry = formatFilterApiOther(query.industry)
+      }
       return query
     },
     async getList(filters) {

apps/bigmember_pc/src/views/collection/model/modules/data-collect-actions.js

@@ -58,6 +58,7 @@ export function dataCollectActionModel (gParams) {
         if (res.data) {
           // 更新列表收藏状态
           $bus.$emit('bidding:updateListCollectStatus')
+          $bus.$emit('bidding:updateCollect')
           that.$toast('已取消收藏', 1000)
         } else {
           that.$toast(res.error_msg, 1000)

apps/bigmember_pc/src/views/collection/model/modules/data-export-actions.js

@@ -8,7 +8,7 @@ import {
 } from '@/api/modules/'
 
 import { useStore } from '@/store'
-import  { FilterHistoryViewModel2AjaxModel, openOuterLink } from '@/utils'
+import  { FilterHistoryViewModel2AjaxModel, openOuterLink, formatFilterApiOther } from '@/utils'
 
 // 是否登录
 const isLogin = computed(() => {
@@ -24,6 +24,13 @@ export function dataExportActionsModel () {
 
   async function dataExport (config) {
     const { listState, selectCheckboxCount, selectIds, filter } = config
+    const { selectTime, publishTime } = filter
+    if (selectTime.indexOf('_') > -1) {
+      filter.selectTime = selectTime.replace('_', '-')
+    }
+    if(publishTime.indexOf('_') > -1) {
+      filter.publishTime = publishTime.replace('_', '-')
+    }
     // 未登录跳转登录
     if (!isLogin.value) {
       $bus.$emit('bidding:goLogin')
@@ -72,6 +79,9 @@ export function dataExportActionsModel () {
       const params = Object.assign(dParams, {
         selectIds: selectIds ? selectIds.join(',') : null
       })
+      if (params.industry) {
+        params.industry = formatFilterApiOther(params.industry)
+      }
       const { data } = await biddingCollectExport(params)
       const { _id } = data
       if (!_id) return

apps/bigmember_pc/src/views/collection/model/modules/filter.js

@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import { FilterHistoryViewModel2AjaxModel, infoTypeMapFormat } from '@/utils'
+import { FilterHistoryViewModel2AjaxModel, infoTypeMapFormat, formatFilterApiOther } from '@/utils'
 
 export function useSearchFilterModel(conf) {
   const { isFree,isInApp, isBidField } = conf
@@ -64,7 +64,7 @@ export function useSearchFilterModel(conf) {
       keyWords: filterState.value.keyWords,
       publishTime: rPublishTime,
       subtype: rSubtype,
-      industry: rIndustry,
+      industry: formatFilterApiOther(rIndustry),
       province: area,
       city,
       district,

apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -706,7 +706,6 @@ export default function () {
       return
     }
     beforeSearchSomthing (pageNum)
-
     // Ajax请求
     return doRunQuery(getParams(params)).then((res) => {
       // 搜索重新获取搜索历史

apps/bigmember_pc/src/views/search/bidding/model/modules/data-export-actions.js

@@ -9,7 +9,7 @@ import {
 } from '@/api/modules/'
 
 import { useStore } from '@/store'
-import  { FilterHistoryViewModel2AjaxModel, openOuterLink } from '@/utils'
+import  { FilterHistoryViewModel2AjaxModel, openOuterLink, formatFilterApiOther } from '@/utils'
 
 // 是否登录
 const isLogin = computed(() => {
@@ -75,6 +75,9 @@ export function dataExportActionsModel () {
       const params = Object.assign(dParams, {
         selectIds: selectIds ? selectIds.join(',') : null
       })
+      if (params.industry) {
+        params.industry = formatFilterApiOther(params.industry)
+      }
       const { _id } = await searchIndexDataExport(params)
       if (!_id) return
       const link = `/front/dataExport/toCreateOrderPage/${_id}`

apps/bigmember_pc/src/views/search/bidding/model/modules/filter.js

@@ -2,7 +2,8 @@ import { ref, computed } from 'vue'
 import  {
   FilterHistoryViewModel2AjaxModel,
   areaObjTwoToSingle,
-  infoTypeMapFormat
+  infoTypeMapFormat,
+  formatFilterApiOther
 } from '@/utils'
 
 export function useSearchFilterModel(conf) {
@@ -93,11 +94,10 @@ export function useSearchFilterModel(conf) {
     console.log(filterState.value)
     const { area, city, district } = FilterHistoryViewModel2AjaxModel.formatAreaCity(regionMap)
     const rPublishTime = publishTime?.indexOf('_') > -1 ? FilterHistoryViewModel2AjaxModel.formatExactTime(publishTime, '-') :  FilterHistoryViewModel2AjaxModel.formatTime(publishTime, true, '-')
-    const rIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(industry, ',', true)
+    const rIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(industry)
     const rBuyerClass = FilterHistoryViewModel2AjaxModel.formatBuyerClass(buyerclass)
     const rSubtype = FilterHistoryViewModel2AjaxModel.formatInfoType(subtype)
     const expandTag = {}
-    console.log(rIndustry, 'rIndustry')
     if(typeof (_expand) === 'object' && Object.keys(_expand).length > 0) {
       for(let key in _expand) {
         expandTag[key] = filterState.value[key]
@@ -114,7 +114,7 @@ export function useSearchFilterModel(conf) {
       buyer: filterState.value.buyer.join(','),
       winner: filterState.value.winner.join(','),
       agency: filterState.value.agency.join(','),
-      industry: rIndustry,
+      industry: formatFilterApiOther(rIndustry),
       province: area,
       city,
       district,