cuiyalong 7 kuukautta sitten
vanhempi
commit
e1bc8668e2

+ 11 - 4
apps/mobile/src/components/search/bidding/SearchSchemaFilter.vue

@@ -316,10 +316,15 @@ export default {
             return `${prefix}${value.length}个`
           }
         } else {
-          if (Object.keys(value).length) {
+          const keyLength = Object.keys(value).length
+          if (keyLength) {
             // 取所有二级分类的长度
             const level2 = [].concat(Object.values(value)).flat()
-            return `${prefix}${level2.length}个`
+            if (level2.length === 0) {
+              return `${prefix}${keyLength}个`
+            } else {
+              return `${prefix}${level2.length}个`
+            }
           } else {
             return `${prefix}${allText}`
           }
@@ -475,10 +480,12 @@ export default {
 .fix-pop-height {
   height: 100%;
   ::v-deep {
-    .j-main,
-    .default-sidebar-height {
+    .j-main {
       height: 100%;
     }
+    // .default-sidebar-height {
+    //   height: 100%;
+    // }
   }
 }
 

+ 20 - 12
apps/mobile/src/views/search/result/bidding-custom/index.vue

@@ -41,7 +41,6 @@
         :dropdown-menu-max-height="conf.maxHeight"
         @confirm="onFilterConfirm"
         @cancel="onFilterCancel"
-        @reset="doSearch"
         @open="doOpen"
       />
 
@@ -156,7 +155,7 @@
             >
               <template #buyerText="{ item }">
                 <span
-                  class="buyer-item link-clickable"
+                  class="buyer-item"
                   @click.stop="toToBuyerProfile(item.text)"
                   >{{ item.text }}</span
                 >
@@ -165,7 +164,7 @@
                 <span
                   v-for="(winner, index) in item.children"
                   :key="index"
-                  class="winner-item link-clickable j-splitter"
+                  class="winner-item j-splitter"
                   data-j-splitter="、"
                   @click.stop="toToEntProfile(winner.id)"
                   >{{ winner.text }}</span
@@ -1093,7 +1092,7 @@ export default {
         {
           label: '投标截止日期',
           splitter: ':',
-          text: item.expurasingtime
+          text: item.bidendtime
             ? dateFormatter(item.bidendtime * 1000, 'yyyy-MM-dd')
             : ''
         },
@@ -1104,13 +1103,13 @@ export default {
         //     ? dateFormatter(item.signendtime * 1000, 'yyyy-MM-dd')
         //     : ''
         // },
-        // {
-        //   label: '预计采购时间',
-        //   splitter: ':',
-        //   text: item.expurasingtime
-        //     ? dateFormatter(item.expurasingtime * 1000, 'yyyy-MM-dd')
-        //     : ''
-        // },
+        {
+          label: '预计采购时间',
+          splitter: ':',
+          text: item.expurasingtime
+            ? dateFormatter(item.expurasingtime * 1000, 'yyyy-MM-dd')
+            : ''
+        },
         // {
         //   label: '招标文件购买金额',
         //   splitter: ':',
@@ -1255,7 +1254,14 @@ export default {
       const { listTabActiveStorageKey } = this.conf
       this.$storage.set(listTabActiveStorageKey, name)
     },
+    resetFilters() {
+      const searchFilters = this.$refs.searchFilters
+      if (searchFilters) {
+        searchFilters.resetFilters()
+      }
+    },
     onSearchGroupChange() {
+      this.resetFilters()
       this.doSearch()
     },
     setUrlSearchGroupQuery(s) {
@@ -1272,7 +1278,9 @@ export default {
     onFilterConfirm() {
       this.doSearch()
     },
-    onFilterCancel() {},
+    onFilterCancel() {
+      this.doSearch()
+    },
     restoreSearchGroupFromLocal() {
       const params = this.$storage.get(
         BIDDING_SEARCH_CUSTOM_GROUP_LAST_CACHE_KEY,