Merge branch 'feature/v1.0.51' into dev/v1.0.51_zsy

apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -414,7 +414,10 @@ export default {
     // 处理关键词在附件中
     calcFileText() {
       const inFile = this.article.filetext_search
-      const keywords = this.getMatchKeys
+      let keywords = this.getMatchKeys
+      if (this.article?.fs_word && this.article?.fs_word[0]) {
+        keywords = this.article?.fs_word
+      }
       if (inFile) {
         const keyword = keywords[0]
         if (keyword?.length > 3) {

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

@@ -197,6 +197,12 @@ export default {
         return []
       }
     },
+    fs_keys: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     /**
      * ['string', 'string']
      * 或者
@@ -341,7 +347,10 @@ export default {
       }
     },
     setKeyLength() {
-      const key = this.keys[0]
+      let key = this.keys[0]
+      if (this.fs_keys && this.fs_keys[0]) {
+        key = this.fs_keys[0]
+      }
       if (key) {
         if (key.length > 3) {
           return key.substring(0, 3) + '...'

apps/mobile/src/views/reportAnalysis/reportdownloadDetails.vue

@@ -24,7 +24,7 @@
                 item.userType === 7
               "
             >
-              消费
+              {{ item.userType === 5 ? '作废' : '消费' }}
             </div>
             <div
               class="left color_green"
@@ -174,7 +174,7 @@ export default {
         item.userType === 7
       ) {
         return JSON.parse(item.remarks).describe
-      }else{
+      } else {
         return ''
       }
     }

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

@@ -167,6 +167,7 @@
               :title="item.title"
               :detail="filters.scope.includes('content') ? item.detail : null"
               :filetext_search="item.filetext_search"
+              :fs_keys="item.fs_word"
               :time="item.dateTime"
               v-visited:content="item.id"
               :isFile="item.isFile"