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

apps/mobile/src/components/message/message-card.vue

@@ -135,11 +135,11 @@ export default {
           offsetHeight: offsetYPx
         }
       }
-      const listItemHeight = (listItem?.offsetHeight || offsetYPx) * 2
-      this.groupHeight = (this.list.length / 2) * listItemHeight
+      const listItemHeight = listItem?.offsetHeight || offsetYPx
+      this.groupHeight = this.list.length * listItemHeight
       this.scrollInterval = setInterval(() => {
         this.offsetHeight += listItemHeight // 每次滚动的距离，根据需求调整
-        if (-this.offsetHeight <= -((this.list.length / 2) * listItemHeight)) {
+        if (-this.offsetHeight <= -(this.list.length * listItemHeight)) {
           this.offsetHeight = 0
         }
       }, this.msgData.rollingTiming * 1000) // 滚动间隔，单位为秒

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

@@ -2244,11 +2244,25 @@ export default {
           if (keyLength >= 10) {
             return this.$toast('您已经超过订阅关键字上限')
           }
+          // 设置完区域后跳至关键词订阅页面,区域设置成功后关键词要同步设置（要携带参数过去）
+          const { moreKeywordsMode } = this.filters
+          const { tags, wordsMode } = moreKeywordsMode
+          // 订阅的关键词 = 主关键词 + 多关键词
+          let formatKeyword = ''
+          if (tags && tags.length) {
+            formatKeyword = this.filters.keywords + ' ' + tags.join(' ')
+          } else {
+            formatKeyword = this.filters.keywords
+          }
           loading.clear()
           if (!isSelectArea) {
             if (isUpgrade) {
               this.toSetArea({
-                query: { url: LINKS.关键词列表[this.$env.platform] }
+                query: {
+                  url: LINKS.关键词列表[this.$env.platform],
+                  keywords: formatKeyword,
+                  wordsMode
+                }
               })
             } else {
               // 提示去升级
@@ -2258,16 +2272,6 @@ export default {
                 className: 'j-confirm-dialog',
                 confirmButtonText: '立即升级'
               })
-              // 设置完区域后跳至关键词订阅页面,区域设置成功后关键词要同步设置（要携带参数过去）
-              const { moreKeywordsMode } = this.filters
-              const { tags, wordsMode } = moreKeywordsMode
-              // 订阅的关键词 = 主关键词 + 多关键词
-              let formatKeyword = ''
-              if (tags && tags.length) {
-                formatKeyword = this.filters.keywords + ' ' + tags.join(' ')
-              } else {
-                formatKeyword = this.filters.keywords
-              }
               this.toSetArea({
                 query: {
                   url: LINKS.关键词列表[this.$env.platform],