Merge branch 'dev/v1.0.34.5_tsz' of jianyu/web into hotfix/v1.0.34.5

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

@@ -340,10 +340,13 @@ export default {
         return `${this.index}. ${hightLightedTitle}`
       }
     },
-    // 处理正文显示，有匹配词才显示正文
+    // 处理正文显示，有匹配词且匹配上才显示正文
     calcDetail() {
-      const extractDetail = extractKeywords(this.article.detail, this.article.matchKeys)
-      if (this.article.matchKeys && this.article.matchKeys.length) {
+      const extractDetail = extractKeywords(
+        this.article.detail,
+        this.article.matchKeys
+      )
+      if (extractDetail) {
         return replaceKeyword(extractDetail, this.article.matchKeys, [
           '<span class="highlight-text">',
           '</span>'

apps/bigmember_pc/src/utils/globalFunctions.js

@@ -781,10 +781,10 @@ export function getAssetsFile(url) {
  */
 export function  extractKeywords(text, keywords, n = 10) {
   if (!text) return
-  if (!keywords || !keywords.length) return text
+  if (!keywords || !keywords.length) return ''
   const value = Array.isArray(keywords) ? keywords[0] : keywords
   const regex = new RegExp("(.{0," + n + "}" + value + ".*)")
   const result = text.match(regex)
   // 输出结果
-  return result && result[1] ? result[1] : text
+  return result && result[1] ? result[1] : ''
 }

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

@@ -299,8 +299,8 @@ export default {
       return replaceKeyword(this.title, this.keys)
     },
     getDetail() {
-      // 有匹配词才显示正文
-      if (this.keys && this.keys.length) {
+      // 有匹配词且匹配上才显示正文
+      if (this.setDetailText) {
         return replaceKeyword(this.setDetailText, this.keys)
       } else {
         return ''
@@ -315,10 +315,10 @@ export default {
         if (postion - 10 > 0) {
           return detail.substring(postion - 10)
         } else {
-          return detail
+          return ''
         }
       } else {
-        return detail
+        return ''
       }
     },
     getTime() {