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

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

@@ -889,6 +889,11 @@ export default {
           } = this.defaultFilterState
           const sameList = []
           // 更多关键词
+          if (this.filters.moreKeywordsMode?.wordsMode) {
+            // this.filters.moreKeywordsMode对象在未知地方没有wordsMode属性会设置一个默认值wordsMode = '0'
+            // 所以这里对比的时候moreKeywordsMode也需要加一个，否则会永远不相等
+            moreKeywordsMode.wordsMode = '0'
+          }
           sameList.push(
             deepCompare(this.filters.moreKeywordsMode, moreKeywordsMode)
           )
@@ -927,13 +932,12 @@ export default {
           )
           // 行业
           sameList.push(deepCompare(this.filters.industry, industry))
-          console.log(
-            sameList,
-            'sameList',
-            this.filters.moreKeywordsMode,
-            moreKeywordsMode
-          )
-          // console.log(this.filters.infoType, infoType);
+          // console.log(
+          //   sameList,
+          //   'sameList',
+          //   this.filters.moreKeywordsMode,
+          //   moreKeywordsMode
+          // )
           needHighlight = sameList.includes(false)
           break
         }

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

@@ -416,7 +416,11 @@
             </tr>
           </table>
         </div>
-        <div class="to-look-more" v-show="listState.list.length > 20">
+        <div
+          class="to-look-more"
+          :class="{ 'ios-look-more': $envs.inIOS }"
+          v-show="listState.list.length > 20"
+        >
           <van-button plain size="small" type="primary" @click="dataExport"
             >查看更多</van-button
           >
@@ -1005,7 +1009,6 @@ export default {
       this.setUrlSearchGroupQuery(n)
     },
     'pageState.listTabActive'(n, o) {
-      console.log(n, o, 'listTabActive')
       if (n === 'table') {
         // toast提示
         if (this.listState.list.length) {
@@ -1353,11 +1356,7 @@ export default {
       if (Array.isArray(additionalWords) && additionalWords.length) {
         moreKeywordsModeState.tags = additionalWords
       }
-      if (
-        Array.isArray(wordsMode) &&
-        wordsMode.length &&
-        wordsMode.toString() !== 0
-      ) {
+      if (Array.isArray(wordsMode) && wordsMode.length) {
         moreKeywordsModeState.wordsMode = wordsMode.join(',')
       }
       if (Object.keys(moreKeywordsModeState).length) {
@@ -3212,6 +3211,10 @@ export default {
     rgba(255, 255, 255, 1),
     rgba(255, 255, 255, 1)
   );
+  &.ios-look-more {
+    height: 180px;
+    padding-bottom: 50px;
+  }
 }
 .sub-this-keywords {
   display: flex;