Merge branch 'dev/v1.0.53.1_tsz' of jianyu/web into hotfix/v1.0.53.1

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

@@ -868,57 +868,44 @@ export default {
         Object.keys(this.getFilters).forEach((v) => {
           if (typeof this.getFilters[v] !== 'undefined') {
             if (v === 'industry' && typeof filters[v] === 'object') {
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(this.getFilters[v]).join(',')
-              } else {
-                query[v] = ''
               }
             } else if (v === 'buyerClass' && typeof filters[v] === 'object') {
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(this.getFilters[v]).map((v) => v.split('_')[1]).join(',')
-              } else {
-                query[v] = ''
               }
             } else if (v === 'subtype' && typeof filters[v] === 'object') {
               const filterSubtype = InfoTypeTransform.mapToList(this.getFilters[v])
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = filterSubtype.length > 0 ? filterSubtype.join(',') : ''
-              } else {
-                query[v] = ''
               }
             } else {
               query[v] = this.getFilters[v]
             }
-            // query[v] = this.getFilters[v]
           }
         })
       }
       if (filters && Object.keys(filters).length > 0) {
+        console.log(filters, 'filters')
         Object.keys(filters).forEach((v) => {
           if (typeof filters[v] !== 'undefined') {
             if (v === 'industry' && typeof filters[v] === 'object') {
-              if(filters[v].length > 0) {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(filters[v]).join(',')
-              } else {
-                query[v] = ''
               }
-            } else if (v === 'buyerClass'  && typeof filters[v] === 'object') {
-              if(filters[v].length > 0) {
+            } else if (v === 'buyerClass' && typeof filters[v] === 'object') {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(filters[v]).map((v) => v.split('_')[1]).join(',')
-              } else {
-                query[v] = ''
               }
-            } else if (v === 'subtype'  && typeof filters[v] === 'object') {
+            } else if (v === 'subtype' && typeof filters[v] === 'object') {
               const filterSubtype = InfoTypeTransform.mapToList(filters[v])
-              if(filters[v].length > 0) {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = filterSubtype.length > 0 ? filterSubtype.join(',') : ''
-              } else {
-                query[v] = ''
               }
             } else {
               query[v] = filters[v]
             }
-            // query[v] = filters[v]
           }
         })
       }
@@ -927,7 +914,6 @@ export default {
         query.isEnt = true
       }
       // delete query.item  所有订阅列表都增加item参数
-  
       return query
     },
     async getList(filters) {

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

@@ -644,14 +644,6 @@ export default {
           this.filters.item = this.convertArrayToObject(oneAndtwo)
           this.filters.keyWords = two_noall.join(',')
         } else {
-          // if (one_noall.length) {
-          //   this.filters.item = {}
-          //   one_noall.forEach((s) => {
-          //     this.filters.item[s] = []
-          //   })
-          // } else {
-          //   this.filters.item = {}
-          // }
           this.filters.item = {}
           this.filters.keyWords = ''
         }