Merge branch 'dev/v1.0.53_tsz' of jianyu/web into feature/v1.0.53

apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -1377,6 +1377,7 @@ export default {
       .search-schema-filter-box{
         padding: 0 16px;
         border: 1px dashed #C98F37;
+        border-radius: 4px;
         background: linear-gradient(to right , rgba(255, 247, 220, 1), rgba(255, 247, 220, 0))
       }
       .filter-layout .select-prefix{

apps/mobile/src/views/collection/index.vue

@@ -953,9 +953,6 @@ export default {
         }
       }
       this.filters.keyWords = additionalWords
-      const rexIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(
-        industry
-      )
 
       const params = {
         pageNum: this.listState.pageNum,
@@ -978,7 +975,7 @@ export default {
         ),
         label: label.join(','), // 个人标签
         price: FilterHistoryViewModel2AjaxModel.formatPrice(price),
-        industry: FilterHistoryViewModel2AjaxModel.formatFilterApiOther(rexIndustry), // 行业
+        industry: FilterHistoryViewModel2AjaxModel.formatIndustry(industry), // 行业
         buyerClass: buyerClass.join(','),
         winnerTel: winnerConcat.join(','),
         buyerTel: buyerConcat.join(','),
@@ -1435,9 +1432,6 @@ export default {
           additionalWords = moreKeywordsMode.tags.join(',')
         }
       }
-      const rexIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(
-        this.filters.industry
-      )
 
       const params = {
         label: this.filters.label.join(','), // 个人标签
@@ -1446,7 +1440,7 @@ export default {
         city,
         district,
         keyWords: additionalWords,
-        industry: FilterHistoryViewModel2AjaxModel.formatFilterApiOther(rexIndustry), // 行业
+        industry: FilterHistoryViewModel2AjaxModel.formatIndustry(this.filters.industry), // 行业
         minprice: this.filters.price.start,
         maxprice: this.filters.price.end,
         publishTime: FilterHistoryViewModel2AjaxModel.formatTime(

apps/mobile/src/views/search/middle/buyer/index.vue

@@ -96,7 +96,7 @@ export default {
         if (!this.isLogin) return
         const res = await getHistoryQuery({ type: '4,5' })
         if (res.success) {
-          this.buyerSearchHistory = res?.res.search || []
+          this.buyerSearchHistory = res?.search || []
           this.processBrowseHistory(res.browse)
         } else {
           // 处理success为false的情况，例如记录日志、提示用户等

apps/mobile/src/views/search/result/bidding/index.vue

@@ -1371,10 +1371,6 @@ export default {
         }
       }
 
-      const rexIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(
-        this.filters.industry
-      )
-
       const params = {
         pageNum: this.listState.pageNum,
         pageSize: this.listState.pageSize,
@@ -1396,7 +1392,9 @@ export default {
         additionalWords,
         selectType: this.filters.scope.join(','), // 搜索范围
         price: FilterHistoryViewModel2AjaxModel.formatPrice(price),
-        industry: FilterHistoryViewModel2AjaxModel.formatFilterApiOther(rexIndustry), // 行业
+        industry: FilterHistoryViewModel2AjaxModel.formatIndustry(
+          this.filters.industry
+        ), // 行业
         buyerClass: this.filters.buyerClass.join(','),
         winnerTel: this.filters.winnerConcat.join(','),
         buyerTel: this.filters.buyerConcat.join(','),
@@ -1961,9 +1959,6 @@ export default {
           additionalWords = moreKeywordsMode.tags.join(',')
         }
       }
-      const rexIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(
-        this.filters.industry
-      )
       const params = {
         searchvalue: this.topSearch.input,
         selectType: this.filters.scope.join(','), // 搜索范围
@@ -1971,7 +1966,9 @@ export default {
         area, // 地区省份(保存筛选接口用到)
         city,
         district,
-        industry: FilterHistoryViewModel2AjaxModel.formatFilterApiOther(rexIndustry), // 行业
+        industry: FilterHistoryViewModel2AjaxModel.formatIndustry(
+          this.filters.industry
+        ), // 行业
         minprice: this.filters.price.start,
         maxprice: this.filters.price.end,
         publishtime: FilterHistoryViewModel2AjaxModel.formatTime(