Merge branch 'dev/v1.0.67_yf' of jianyu/web into feature/v1.0.67

apps/mobile/src/components/ad/SwipeFloor.vue

@@ -237,7 +237,7 @@ $swiper-floor-item-font-size: 11px;
     color: $swiper-floor-item-color;
     .van-image {
       width: $swiper-floor-item-width;
-      height: 40px;
+      height: 44px;
     }
     span {
       margin-top: 4px;

apps/mobile/src/components/home/list.vue

@@ -219,7 +219,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('user', ['mySelectEntInfo', 'isSubCount']),
+    ...mapState('user', ['mySelectEntInfo']),
     entId() {
       return this.mySelectEntInfo?.ent_id
     },
@@ -236,7 +236,7 @@ export default {
     showToSettingTip() {
       return this.showTip === 2 && this.showSetTip
     },
-    ...mapGetters('user', ['isLogin', 'isFree', 'vSwitch'])
+    ...mapGetters('user', ['isLogin', 'isFree', 'vSwitch', 'isSubCount'])
   },
   watch: {
     showToSettingTip(n) {

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

@@ -1398,7 +1398,6 @@ export default {
       }, 300)
     },
     handleScroll: throttle(function () {
-      console.log(this.markClickScroll, 'scroll')
       if (this.markClickScroll) return
       const cellItems = document.querySelectorAll('.more-filter-item')
       const offsetTopArr = []
@@ -1463,6 +1462,8 @@ export default {
     .cell-title {
       display: flex;
       align-items: center;
+      font-size: 12px;
+      font-weight: bold;
     }
   }
 }
@@ -1491,6 +1492,7 @@ export default {
     .j-row-cell-content {
       padding: 12px 0;
     }
+    .j-row-cell-hd .cell-title,
     .cell-title-text,
     .van-cell__title,
     .search-mode-filter-label-text {

apps/mobile/src/ui/project-cell/index.vue

@@ -19,7 +19,7 @@
         </span>
         <span v-html="getTitle"></span>
         <span v-if="filetext_search" style="padding-left: 8px"
-          >(<span class="highlight-text-orange">{{ setKeyLength }}</span
+          >(<span class="highlight-text-orange-bd">{{ setKeyLength }}</span
           >在附件中)</span
         >
       </div>

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

@@ -38,7 +38,7 @@
         @confirm="onFilterConfirm"
         @reset="doSearch"
         @open="doOpen"
-        :defaultFilterState="defaultFilterState"
+        :defaultFilterState="noChangeDefaultFilterState"
         :dropdownMenuMaxHeight="conf.maxHeight"
         :infoTypeSourceConf="activeSearchGroupInfo"
         :topSearch="topSearch"
@@ -2373,8 +2373,14 @@ export default {
     // 保存筛选条件
     async saveFilterToHistory() {
       const params = this.getSaveFilterToHistoryParams()
-
-      if (!params.searchvalue) {
+      // 如未输入关键词（包含顶部搜索框及更多筛选条件设置的多关键词、采购单位、中标单位和招标代理机构）则toast提示“请输入关键词”
+      if (
+        !params.searchvalue &&
+        !params.additionalWords &&
+        !params.buyer &&
+        !params.winner &&
+        !params.agency
+      ) {
         return this.$toast('请先输入关键词')
       }
       const { savedFilterListMaxCount: maxCount } = this.conf
@@ -2476,26 +2482,24 @@ export default {
        * */
       let labelList = formattedList
         .filter((v) => {
-          if (v.label === '信息类型：') {
+          if (v.label.includes('信息类型')) {
             const isChecked = deepCompareInfoType(v.text)
             v.text = isChecked ? '' : v.text
           }
           if (this.topSearch.input) {
             return v && v.text
           } else {
-            return (
-              v.label !== '搜索范围：' && v.label !== '信息类型：' && v.text
-            )
+            return !v.label.includes('搜索范围') && v.text
           }
         })
         .map((item) => item.text)
       if (searchModeText && this.topSearch.input) {
         labelList = [searchModeText].concat(labelList)
       }
+      // console.log(formattedList, 'formattedList')
       const isHaveInfoType = formattedList.some((v) =>
         v.label.includes('信息类型')
       )
-      // console.log(isHaveInfoType, 'isHaveInfoType')
       if (searchGroup > 0 && !isHaveInfoType) {
         labelList = labelList.concat(this.activeSearchGroupInfo.title)
       }