feat: 标讯收藏时间选择逻辑调整

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>

apps/mobile/src/api/modules/public.js

@@ -47,6 +47,15 @@ export function ajaxGetNewUserAD(data) {
   })
 }
 
+// 获取历史记录
+export function ajaxGetHistory(data) {
+  return request({
+    url: '/publicapply/history/get',
+    method: 'get',
+    params: data
+  })
+}
+
 // 新用户广告已读上报接口 只显示一次
 export function ajaxSetNewUserADRead(data) {
   return request({

apps/mobile/src/components/selector/date-time-list/index.vue

@@ -92,6 +92,7 @@ export default {
           return this.useKeys.includes(o.key)
         })
       }
+      console.log(this.checkboxOptions, 'checkboxOptions')
       this.calcLastTime()
       this.setDefaultSelected()
     },
@@ -137,6 +138,7 @@ export default {
     },
     setTimeListState(value) {
       this.state = [value]
+      console.log(value, 'value')
     },
     clearDateTimePicker() {
       const { dateTimeGroup } = this.$refs

apps/mobile/src/data/bidding.js

@@ -77,7 +77,7 @@ export const biddingSearchTime = [
 export const collectionSearchTime = [
   {
     label: '全部',
-    key: ''
+    key: 'all'
   },
   {
     label: '今天',

apps/mobile/src/views/collection/components/filters.vue

@@ -429,10 +429,10 @@ export default {
             end: ''
           },
           selectTime: {
-            exact: 'lately-7'
+            exact: ''
           },
           publishTime: {
-            exact: 'thisyear'
+            exact: ''
           },
           infoType: [],
           buyerClass: [],
@@ -529,53 +529,27 @@ export default {
     },
     getTimeOptions() {
       const list = this.conf.dateTime
-      if (this.noLoginOrFree) {
-        list.forEach((item) => {
-          if (item.needPower) {
-            this.$set(item, 'disabled', true)
-            this.$set(item, 'tag', '开通')
-          }
-        })
-      } else {
-        list.forEach((item) => {
-          if (item.needPower) {
-            this.$set(item, 'disabled', false)
-            this.$set(item, 'tag', '')
-          }
-        })
-      }
-      if (this.isLogin) {
-        return list
-      } else {
-        return list.filter((s) => !s.disabled)
-      }
+      list.forEach((item) => {
+        if (item.needPower) {
+          this.$set(item, 'disabled', false)
+          this.$set(item, 'tag', '')
+        }
+      })
+      return list
     },
     getPulishTimeOptions() {
       let list = [{
         label: '全部',
-        key: ''
+        key: 'all'
       }]
       list = list.concat(biddingSearchTime)
-      if (this.noLoginOrFree) {
-        list.forEach((item) => {
-          if (item.needPower) {
-            this.$set(item, 'disabled', true)
-            this.$set(item, 'tag', '开通')
-          }
-        })
-      } else {
-        list.forEach((item) => {
-          if (item.needPower) {
-            this.$set(item, 'disabled', false)
-            this.$set(item, 'tag', '')
-          }
-        })
-      }
-      if (this.isLogin) {
-        return list
-      } else {
-        return list.filter((s) => !s.disabled)
-      }
+      list.forEach((item) => {
+        if (item.needPower) {
+          this.$set(item, 'disabled', false)
+          this.$set(item, 'tag', '')
+        }
+      })
+      return list
     },
     getConcatOptions() {
       const list = this.conf.concatOptions
@@ -691,7 +665,7 @@ export default {
           break
         }
         case 'publishTime': {
-          const same = deepCompare(this.filters.publishTime, publishTimeDefault)
+          const same = deepCompare(this.filters.publishTime?.exact, publishTimeDefault?.exact)
           needHighlight = !same
           break
         }
@@ -729,11 +703,11 @@ export default {
     // 从filters中恢复选择器状态
     openedDropDown(type) {
       const { tagSelector, selectTimeSelector, priceSelector, publishTimeSelector, moreKeywordsGroup, areaSelector } = this.$refs
-      const { label, selectTime, publishTime } = this.filters
+      let { label, selectTime, publishTime } = this.filters
       switch (type) {
         case 'label': {
-          console.log(label, 'label')
           tagSelector?.setState(label)
+          this.conf.label = label
           break
         }
         case 'selectTime': {
@@ -758,7 +732,6 @@ export default {
             winnerConcat,
             buyerConcat,
           } = this.filters
-          console.log(this.filters, 'filtersfilters')
           // 更多关键词
           this.cacheMoreFilters.moreKeywordsMode = moreKeywordsMode
           try {
@@ -803,19 +776,19 @@ export default {
           const { tagSelector } = this.$refs
           if (Array.isArray(label)) {
             filters.label = label
-            tagSelector?.setState(label)
+            tagSelector?.setState()
           }
           break
         }
         case 'selectTime': {
           const { selectTimeSelector } = this.$refs
-          const str = selectTimeSelector?.setState() || {}
+          const str = selectTimeSelector?.setState({exact: 'all'}) || {}
           filters.selectTime = str
           break
         }
         case 'publishTime': {
           const { publishTimeSelector } = this.$refs
-          const str = publishTimeSelector?.setState() || {}
+          const str = publishTimeSelector?.setState({exact: 'all'}) || {}
           filters.publishTime = str
           break
         }
@@ -910,7 +883,6 @@ export default {
         case 'publishTime': {
           const { publishTimeSelector } = this.$refs
           const str = publishTimeSelector?.getState() || {}
-          console.log(str, 'str')
           filters.publishTime = str
           break
         }
@@ -957,7 +929,6 @@ export default {
     },
     confirmModelChange(type) {
       const filters = this.confirmSelectors(type)
-      console.log(filters, 'filters')
       this.onChange(filters)
     },
     onConfirm(type) {
@@ -1054,7 +1025,6 @@ export default {
           const { areaSelector } = this.$refs
           const state = areaSelector?.getState()
           this.$set(this.cacheMoreFilters, 'area', state)
-          console.log(this.cacheMoreFilters, 'cacheMoreFilters')
           break
         }
         case 'industry': {

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

@@ -90,8 +90,9 @@
               :detailList="item.detailList"
               @click="goToDetail(item)"
               :title="item.title"
+              :detail="item.detail"
               :filetext_search="item.filetext_search"
-              :time="item.publishTime"
+              :time="item.publishtime * 1000"
               v-visited:content="item.id"
               :isFile="item.isFile"
               :keys="pageState.splitKeys"
@@ -131,23 +132,6 @@
                 </div>
               </template>
             </ProjectCell>
-            <div
-              v-else-if="isLogin"
-              :key="[item.id, index].join('-')"
-              v-show="item.show"
-              class="middle-list-container"
-            >
-              <AdSingle
-                :class="item.className"
-                :ad="getContentAdID"
-                :showCloseIcon="true"
-                cache
-                key="ad-item"
-                :beforeOpen="beforeOpenAd"
-                @close="onListAdClose(item)"
-                class="ad-container"
-              />
-            </div>
           </template>
         </div>
         <div class="max-see-more" v-if="showMoreThanMaxCount">
@@ -387,7 +371,10 @@ export default {
             end: ''
           },
           publishTime: {
-            exact: 'thisyear'
+            exact: 'all'
+          },
+          selectTime: {
+            exact: 'all'
           },
           infoType: [],
           buyerClass: [],
@@ -510,7 +497,8 @@ export default {
     defaultFilterState() {
       const { defaultFilterState } = this.conf
       if (!this.isFree) {
-        defaultFilterState.publishTime.exact = 'fiveyear'
+        defaultFilterState.publishTime.exact = 'all'
+        defaultFilterState.selectTime.exact = 'all'
       }
       return defaultFilterState
     },
@@ -912,7 +900,7 @@ export default {
       }
       // 重置页码
       this.resetListState()
-      this.saveDefaultScope()
+      // this.saveDefaultScope()
       this.filters.keywords = ''
       this.pageState.splitKeywords = ''
       this.listState.loading = true
@@ -1161,8 +1149,8 @@ export default {
     },
     preSortItem(item) {
       if (!item) return
-      const { area, isCollected, projectInfo } = item
-      item.star = !!isCollected
+      const { area, projectInfo } = item
+      item.star = true
       // 参标参数
       item.isCB = {
         id: '',