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

apps/bigmember_pc/src/components/selector/KeywordSelectorCascader.vue

@@ -47,7 +47,7 @@
                     :disabled="item.disabled"
                   ></el-checkbox>
                   <p
-                    class="name_"
+                    class="name_ ellipsis"
                     v-text="item.label"
                     @click.self="leftclick(item, index)"
                   ></p>
@@ -74,7 +74,7 @@
                     :disabled="item1.disabled"
                   ></el-checkbox>
                   <div>
-                    <p class="name_ ellipsis-2" v-text="item1.label"></p>
+                    <p class="name_ ellipsis" v-text="item1.label"></p>
                     <!-- 排除词 -->
                     <p
                       class="notkey ellipsis"
@@ -771,12 +771,20 @@ export default {
       }
     }
   }
+  .left {
+    flex: none;
+    width: 200px;
+    .name_ {
+      max-width: 144px;
+      line-height: 22px;
+    }
+  }
   .right {
     .item_ {
       padding: 4px 0;
       align-items: flex-start;
       .name_ {
-        max-width: 190px;
+        max-width: 210px;
         line-height: 22px;
       }
       .notkey {

apps/bigmember_pc/src/components/selector/TimeSelectorContent.vue

@@ -108,12 +108,12 @@ const timeSelectMap = {
       selected: false
     },
     {
-      name: '最近一周',
+      name: '最近7天',
       value: 'lately7',
       selected: false
     },
     {
-      name: '最近一月',
+      name: '最近30天',
       value: 'lately30',
       selected: false
     }

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

@@ -201,7 +201,6 @@ export default {
       } else {
         Object.assign(timeState, this.calcNotExactTime(timeState.exact))
       }
-      console.log(timeState, 'timeState')
       return timeState
     }
   }

apps/mobile/src/ui/history-list/index.vue

@@ -81,7 +81,6 @@ export default {
       return this.list
         .map((v) => {
           const stringItemTransform = typeof v === 'string' ? { label: v } : v
-          console.log(stringItemTransform, 'stringItemTransform')
           return Object.assign(
             {
               label: v?.label || v

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

@@ -677,12 +677,24 @@ export default {
         }
         case 'selectTime': {
           const same = deepCompare(this.filters.selectTime, selectTimeDefault)
-          needHighlight = !same
+          const start = this.filters.selectTime?.start
+          const end = this.filters.selectTime?.end
+          if(!start && !end) {
+            needHighlight = false
+          } else {
+            needHighlight = !same
+          }
           break
         }
         case 'publishTime': {
           const same = deepCompare(this.filters.publishTime?.exact, publishTimeDefault?.exact)
-          needHighlight = !same
+          const start = this.filters.publishTime?.start
+          const end = this.filters.publishTime?.end
+          if(!start && !end) {
+            needHighlight = false
+          } else {
+            needHighlight = !same
+          }
           break
         }
         case 'more': {
@@ -786,6 +798,20 @@ export default {
     // 重置选择器状态
     resetSelectors(type) {
       const filters = {}
+      const {
+        label,
+        selectTime,
+        publishTime,
+        moreKeywordsMode,
+        price,
+        area,
+        industry,
+        priceCheckbox,
+        infoType,
+        buyerClass,
+        winnerConcat,
+        buyerConcat
+      } = this.defaultFilterState
       switch (type) {
         case 'label': {
           const { label } = this.defaultFilterState
@@ -798,29 +824,18 @@ export default {
         }
         case 'selectTime': {
           const { selectTimeSelector } = this.$refs
-          const str = selectTimeSelector?.setState({exact: 'all'}) || {}
-          filters.selectTime = str
+          selectTimeSelector?.setState({exact: 'all'}) || {}
+          filters.selectTime = selectTime
           break
         }
         case 'publishTime': {
           const { publishTimeSelector } = this.$refs
-          const str = publishTimeSelector?.setState({exact: 'all'}) || {}
-          filters.publishTime = str
+          publishTimeSelector?.setState({exact: 'all'}) || {}
+          filters.publishTime = publishTime
           break
         }
         case 'more': {
           const { priceSelector } = this.$refs
-          const {
-            moreKeywordsMode,
-            price,
-            area,
-            industry,
-            priceCheckbox,
-            infoType,
-            buyerClass,
-            winnerConcat,
-            buyerConcat
-          } = this.defaultFilterState
           // 更多关键词
           if (moreKeywordsMode) {
             this.cacheMoreFilters.moreKeywordsMode = moreKeywordsMode

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

@@ -927,7 +927,6 @@ export default {
       const { price, moreKeywordsMode, publishTime, selectTime, label, buyerClass, winnerConcat, buyerConcat, industry } = this.filters
       // 整理wordsMode和additionalWords
       let additionalWords
-      console.log(moreKeywordsMode, 'moreKeywordsMode')
       if (moreKeywordsMode) {
         if (
           Array.isArray(moreKeywordsMode) &&
@@ -1169,7 +1168,7 @@ export default {
     },
     preSortItem(item) {
       if (!item) return
-      const { area, projectInfo } = item
+      const { area, city, projectInfo } = item
       item.star = true
       // 参标参数
       item.isCB = {
@@ -1184,13 +1183,14 @@ export default {
       if (projectInfo) {
         Object.assign(item, projectInfo)
       }
+      const region = city ? city : area
       const buyerClass =
         item?.buyerClass && item?.buyerClass !== '其它'
           ? item?.buyerClass
           : undefined
       // 标签
       item.tagList = [
-        area || '全国',
+        region || '',
         buyerClass,
         item?.type || item?.subtype,
         // 有中标金额取中标金额，没有取预算，预算没有置空

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

@@ -1685,7 +1685,7 @@ export default {
     },
     preSortItem(item) {
       if (!item) return
-      const { area, isCollected, projectInfo } = item
+      const { area, city, isCollected, projectInfo } = item
       item.star = !!isCollected
       // 参标参数
       item.isCB = {
@@ -1700,13 +1700,15 @@ export default {
       if (projectInfo) {
         Object.assign(item, projectInfo)
       }
+      const region = city ? city : area
       const buyerClass =
         item?.buyerClass && item?.buyerClass !== '其它'
           ? item?.buyerClass
           : undefined
+      
       // 标签
       item.tagList = [
-        area || '全国',
+        region || '',
         buyerClass,
         item?.type || item?.subtype,
         // 有中标金额取中标金额，没有取预算，预算没有置空