feat: 阳光直采隐藏报名截止日期和报名截止状态

apps/bigmember_pc/src/views/search/sun/constant/search-filters.js

@@ -168,64 +168,64 @@ function createSearchBidBaseSchema(conf = {}) {
       // expand: vipUser ? searchScopeExpandVip : searchScopeExpandFree
       expand: searchScopeExpandVip
     },
-    {
-      key: 'bmjzzt',
-      label: '报名截止状态：',
-      defaultVal: '0',
-      _name: 'bmjzzt',
-      _type: 'component',
-      labelHeight: '25px',
-      className: {
-        'search-filter-bmjzzt-line': true
-      },
-      labelStyle: {
-        width: '98px',
-        'white-space': 'nowrap'
-      },
-      expand: {
-        component: TagSelector,
-        props: {
-          sourceList: [
-            {
-              label: '全部',
-              value: '0'
-            },
-            {
-              label: '未截止',
-              value: '1'
-            },
-            {
-              label: '已截止',
-              value: '2'
-            }
-          ],
-          showHeader: false
-        },
-        hooks: {}
-      },
-    },
-    {
-      key: 'signUpEndTime',
-      label: '报名截止日期：',
-      defaultVal: '',
-      _name: 'signUpEndTime',
-      _type: 'component',
-      labelStyle: {
-        width: '98px',
-        'white-space': 'nowrap'
-      },
-      labelHeight: isVip || !isInApp ? '22px' : '32px',
-      expand: {
-        component: SearchTimeScopeSelector,
-        props: {
-          type: 'bidDeadline',
-          exactCanHalf: true,
-          showConfirmButton: true,
-          isDateRange: true
-        },
-        hooks: {}
-      }
-    },
+    // {
+    //   key: 'bmjzzt',
+    //   label: '报名截止状态：',
+    //   defaultVal: '0',
+    //   _name: 'bmjzzt',
+    //   _type: 'component',
+    //   labelHeight: '25px',
+    //   className: {
+    //     'search-filter-bmjzzt-line': true
+    //   },
+    //   labelStyle: {
+    //     width: '98px',
+    //     'white-space': 'nowrap'
+    //   },
+    //   expand: {
+    //     component: TagSelector,
+    //     props: {
+    //       sourceList: [
+    //         {
+    //           label: '全部',
+    //           value: '0'
+    //         },
+    //         {
+    //           label: '未截止',
+    //           value: '1'
+    //         },
+    //         {
+    //           label: '已截止',
+    //           value: '2'
+    //         }
+    //       ],
+    //       showHeader: false
+    //     },
+    //     hooks: {}
+    //   },
+    // },
+    // {
+    //   key: 'signUpEndTime',
+    //   label: '报名截止日期：',
+    //   defaultVal: '',
+    //   _name: 'signUpEndTime',
+    //   _type: 'component',
+    //   labelStyle: {
+    //     width: '98px',
+    //     'white-space': 'nowrap'
+    //   },
+    //   labelHeight: isVip || !isInApp ? '22px' : '32px',
+    //   expand: {
+    //     component: SearchTimeScopeSelector,
+    //     props: {
+    //       type: 'bidDeadline',
+    //       exactCanHalf: true,
+    //       showConfirmButton: true,
+    //       isDateRange: true
+    //     },
+    //     hooks: {}
+    //   }
+    // },
   ]
 
   return SearchBidBaseSchema

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

@@ -317,9 +317,6 @@ export default function () {
       (s) => s.vipMark
     )
 
-    console.log(SearchBidMoreSchema.value)
-
-
     function doUpdateData(schema, type) {
       const payload = schema || conf.value
       if(type === 'more') {

apps/mobile/src/components/common/ScrollNav.vue

@@ -72,6 +72,7 @@ export default {
     }
   }
   &-right {
+    flex: 1;
     padding-bottom: 48px;
     overflow-y: auto;
     background: #fff;

apps/mobile/src/components/search/sun/filters.vue

@@ -56,6 +56,28 @@
       </DropdownLayout>
     </van-dropdown-item>
     <van-dropdown-item
+      ref="jfAreaDropdown"
+      :title-class="dropdownMenuHighlight('jfArea')"
+      title="交付地点"
+      get-container="body"
+      @open="doOpen('jfArea')"
+      @opened="openedDropDown('jfArea')"
+    >
+      <DropdownLayout @cancel="onReset('jfArea')" @confirm="onConfirm('jfArea')">
+        <div class="jf=area-container">
+          <AreaCitySidebar
+            class="area-city-sidebar"
+            :tagTextOnlySelectedCount="true"
+            :disabledCitySelect="false"
+            :useProvinceCitySplit="true"
+            v-model="cacheMoreFilters.jfArea"
+            @onDisabledCityClick="onNoPower"
+            ref="jfAreaSelector"
+          ></AreaCitySidebar>
+        </div>
+      </DropdownLayout>
+    </van-dropdown-item>
+    <!-- <van-dropdown-item
       ref="bmjzztDropdown"
       :title-class="dropdownMenuHighlight('bmjzzt')"
       title="报名截止状态"
@@ -73,7 +95,7 @@
           />
         </div>
       </DropdownLayout>
-    </van-dropdown-item>
+    </van-dropdown-item> -->
     <van-dropdown-item
       ref="moreDropdown"
       :title-class="dropdownMenuHighlight('more')"
@@ -129,7 +151,7 @@
               @click="showPopup('lingyu')"
               :value="valueTextWithLingyu"
             /> -->
-            <JCell class="more-filter-item signup-time" title="报名截止日期">
+            <!-- <JCell class="more-filter-item signup-time" title="报名截止日期">
               <template #label>
                 <DateTimeList
                   ref="signUpEndTimeGroup"
@@ -139,16 +161,16 @@
                   :options="conf.signUpEndTimeOptions"
                 />
               </template>
-            </JCell>
+            </JCell> -->
 
-            <van-cell
+            <!-- <van-cell
               class="more-filter-item one-line-filter-item"
               :isLink="true"
               title="交付地点"
               :border="false"
               @click="showPopup('jfArea')"
               :value="valueTextWithJfArea"
-            ></van-cell>
+            ></van-cell> -->
             <van-cell
               class="more-filter-item one-line-filter-item"
               :isLink="true"
@@ -219,7 +241,7 @@
         </div>
       </PopupLayout>
     </van-popup>
-    <van-popup
+    <!-- <van-popup
       class="fix-pop-height"
       v-model="popup.jfArea"
       round
@@ -257,7 +279,7 @@
           </div>
         </div>
       </PopupLayout>
-    </van-popup>
+    </van-popup> -->
     <van-popup
       class="fix-pop-height"
       v-model="popup.projectArea"
@@ -443,7 +465,13 @@ export default {
   data() {
     return {
       conf: {
-        dropdownTypeList: ['scope', 'dateTime', 'bmjzzt', 'more'],
+        dropdownTypeList: [
+          'scope',
+          'dateTime',
+          'jfArea',
+          // 'bmjzzt',
+          'more'
+        ],
         bmjzzzOptions: [
           {
             label: '全部',
@@ -531,6 +559,7 @@ export default {
         searchMode: ['0'],
         dateTime: {},
         lingyu: {},
+        bmjzzt: '0',
         fileExists: ['0'],
         publisher: ['0'],
         signUpEndTime: []
@@ -727,6 +756,13 @@ export default {
           needHighlight = !same
           break
         }
+        case 'jfArea': {
+          const { jfArea } = this.filters
+          const { jfArea: jfAreaDefault } = this.defaultFilterState
+          const same = deepCompare(jfArea, jfAreaDefault)
+          needHighlight = !same
+          break
+        }
         case 'more': {
           const {
             moreKeywordsMode,
@@ -765,7 +801,7 @@ export default {
           // 联系方式
           sameList.push(deepCompare(this.filters.signUpEndTime, signUpEndTime))
 
-          sameList.push(deepCompare(this.filters.jfArea, jfArea))
+          // sameList.push(deepCompare(this.filters.jfArea, jfArea))
           // 附件
           sameList.push(
             this.filters.fileExists.toString() === fileExists.toString()
@@ -811,6 +847,11 @@ export default {
           this.cacheMoreFilters.bmjzzt = bmjzzt
           break
         }
+        case 'jfArea': {
+          const { jfArea } = this.filters
+          this.cacheMoreFilters.jfArea = jfArea
+          break
+        }
         case 'more': {
           const { dateTimeGroup, moreKeywordsGroup, signUpEndTimeGroup } = this.$refs
           const {
@@ -890,6 +931,14 @@ export default {
           }
           break
         }
+        case 'jfArea': {
+          const { jfArea } = this.defaultFilterState
+          if (jfArea) {
+            filters.jfArea = jfArea
+            this.cacheMoreFilters.jfArea = jfArea
+          }
+          break
+        }
         case 'more': {
           const { signUpEndTimeGroup } = this.$refs
           const {
@@ -978,8 +1027,13 @@ export default {
           break
         }
         case 'bmjzzt': {
-          const { industry } = this.cacheMoreFilters
-          filters.industry = industry
+          const { bmjzzt } = this.cacheMoreFilters
+          filters.bmjzzt = bmjzzt
+          break
+        }
+        case 'jfArea': {
+          const { jfArea } = this.cacheMoreFilters
+          filters.jfArea = jfArea
           break
         }
         case 'more': {
@@ -1037,7 +1091,7 @@ export default {
       this.$refs[`${type}Dropdown`]?.toggle(false)
     },
     onBmjzztChange(e) {
-      const r = Object.assign({}, this.filters, { bmjzzt: e })
+      const r = Object.assign({}, this.cacheMoreFilters, { bmjzzt: e })
       this.onChange(r)
     },
     onChange(value = {}) {
@@ -1206,21 +1260,21 @@ export default {
   .van-dropdown-menu__bar {
     padding: 0 4px;
   }
-  .van-dropdown-menu__item {
-    justify-content: flex-start;
-    &:nth-of-type(1) {
-      flex: 3;
-    }
-    &:nth-of-type(2) {
-      flex: 3;
-    }
-    &:nth-of-type(3) {
-      flex: 4;
-    }
-    &:nth-of-type(4) {
-      flex: 3;
-    }
-  }
+  // .van-dropdown-menu__item {
+  //   justify-content: flex-start;
+  //   &:nth-of-type(1) {
+  //     flex: 3;
+  //   }
+  //   &:nth-of-type(2) {
+  //     flex: 3;
+  //   }
+  //   &:nth-of-type(3) {
+  //     flex: 4;
+  //   }
+  //   &:nth-of-type(4) {
+  //     flex: 3;
+  //   }
+  // }
   .van-dropdown-menu__title {
     padding: 0 8px 0;
     color: $gray_9;