Merge branch 'master' of http://192.168.3.207:10080/jianyu/jy-docs

jydocs-mobile/src/components/Recharge.vue

@@ -6,7 +6,7 @@
                     <img :src="detailData.previewImgId" class="thumbnail_img" alt="">
                 </div>
                 <div class="recharge_t_right">
-                    <div class="t_right_name">{{detailData.docName}}</div>
+                    <div class="t_right_name van-multi-ellipsis--l2">{{detailData.docName}}</div>
                     <div class="t_right_active">
                         <span>{{detailData.price}}剑鱼币</span>
                         <span>共{{detailData.docPageSize}}页</span>

jydocs-mobile/src/components/docs-card/Card.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="doc-container van-hairline--bottom" @click="clickCard">
-    <div class="docs-card oneline" :class="highlightKey.length === 0 ? '' : 'highlight'" v-if="cardType === 'oneline'" key="docs-card">
+    <div class="docs-card oneline" v-if="cardType === 'oneline'" key="docs-card">
       <div class="docs-header flex-r-c center">
         <van-icon :name="docTypeIcon" />
         <div class="d-title flex van-ellipsis" v-html="hightLightTitle"></div>
         <Price :price="price" />
       </div>
     </div>
-    <div class="docs-card image flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else-if="cardType === 'image'" key="docs-card">
+    <div class="docs-card image flex-r-c" v-else-if="cardType === 'image'" key="docs-card">
       <div class="image-container">
         <img v-lazy="imageSrc" />
         <van-icon class="doc-type-icon" :name="docTypeIcon" />
@@ -32,7 +32,7 @@
         </div>
       </div>
     </div>
-    <div class="docs-card" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else key="docs-card">
+    <div class="docs-card" v-else key="docs-card">
       <div class="docs-header flex-r-c">
         <van-icon :name="docTypeIcon" />
         <div class="d-title flex van-ellipsis" v-html="hightLightTitle"></div>
@@ -129,13 +129,11 @@ export default class DocsCard extends Vue {
     }
   }
 
-  &.highlight {
-    .docs-desc,
-    .d-title {
-      ::v-deep {
-        em {
-          color: $color_main;
-        }
+  .docs-desc,
+  .d-title {
+    ::v-deep {
+      em {
+        color: $color_main;
       }
     }
   }

jydocs-mobile/src/views/Search.vue

@@ -43,7 +43,6 @@
             :title="item.docName"
             :desc="item.docSummary"
             :docType="item.docFileType"
-            :highlightKey="highlightKey"
             :price="item.price"
             :subInfo="calcSubInfo(item)"
             @onClick="toDocDetail(item)"
@@ -147,10 +146,6 @@ export default class extends Vue {
     })
   }
 
-  get highlightKey () {
-    return this.listState.value.split(/\s+/)
-  }
-
   created () {
     this.restored = this.reStoreState()
     if (!this.restored) {

jydocs-pc/src/components/doc-item-card/Card.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="docs-card-container" @click="clickCard">
-    <div class="docs-card hover flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-if="cardType === 'oneline'" key="docs-card">
+    <div class="docs-card hover flex-r-c" v-if="cardType === 'oneline'" key="docs-card">
       <div class="docs-card-header flex-r-c flex">
         <span class="card-title-icon" :class="docTypeIcon"></span>
         <span class="card-title flex" v-html="hightLightTitle"></span>
@@ -17,7 +17,7 @@
         </slot>
       </div>
     </div>
-    <div class="docs-card hover flex-r-c" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else-if="cardType === 'image'" key="docs-card">
+    <div class="docs-card hover flex-r-c" v-else-if="cardType === 'image'" key="docs-card">
       <div class="image-container">
         <el-image :src="imageSrc" lazy></el-image>
         <span class="doc-type-icon" :class="docTypeIcon"></span>
@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <div class="docs-card hover" :class="highlightKey.length === 0 ? '' : 'highlight'" v-else key="docs-card">
+    <div class="docs-card hover" v-else key="docs-card">
       <div class="docs-card-header flex-r-c left">
         <span class="card-title-icon" :class="docTypeIcon"></span>
         <span class="card-title flex" v-html="hightLightTitle"></span>
@@ -155,13 +155,11 @@ export default {
   border-bottom: 1px solid rgba($color: #000, $alpha: 0.05);
   cursor: pointer;
 
-  &.highlight {
-    .card-desc,
-    .card-title {
-      ::v-deep {
-        em {
-          color: $color-text--highlight;
-        }
+  .card-desc,
+  .card-title {
+    ::v-deep {
+      em {
+        color: $color-text--highlight;
       }
     }
   }

jydocs-pc/src/views/Search.vue

@@ -22,7 +22,6 @@
           :desc="item.docSummary + '...'"
           :docType="item.docFileType"
           :price="item.price"
-          :highlightKey="highlightKey"
           :subInfo="calcSubInfo(item)"
           @onClick="toDocDetail(item)"
         />
@@ -104,9 +103,6 @@ export default {
       return this.sortTypeList.find(item => {
         return item.active
       })
-    },
-    highlightKey () {
-      return this.searchQuery.text.split(/\s+/)
     }
   },
   methods: {