Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/fd/AppAnswer/Search.vue

@@ -13,7 +13,7 @@
           <i>{{ item.createUserId === user.id ? '我' : item.createUserName  }} </i>
           <span>于{{ item.createTime }} 提问</span>
         </div>
-        <p>{{ item.content }}</p>
+        <p v-html="item.content"></p>
         <div class="item-bottom">
           <div class="left">
             <span>共</span>
@@ -41,7 +41,6 @@
       return {
         search: {
           current: 1,
-          title: '',
           size: 10
         },
         content: '',
@@ -94,9 +93,21 @@
         }).then(res => {
           if (res.code == 0) {
             if (this.search.current > 1) {
-              this.list = [...this.list, ...res.data.records]
+              this.list = [...this.list, ...res.data.records.map(v => {
+                if (v.content.indexOf(this.content) > -1) {
+                  v.content = v.content.replaceAll(this.content, `<i style="font-style: normal; color: #3975C6;" class="keyworld">${this.content}</i>`)
+                }
+
+                return v
+              })]
             } else {
-              this.list = res.data.records
+              this.list = res.data.records.map(v => {
+                if (v.content.indexOf(this.content) > -1) {
+                  v.content = v.content.replaceAll(this.content, `<i style="font-style: normal; color: #3975C6;" class="keyworld">${this.content}</i>`)
+                }
+
+                return v
+              })
             }
 
             uni.hideLoading()
@@ -187,6 +198,11 @@
         border-radius: 16px;
         background: #fff;
 
+        .keyworld {
+          font-style: normal;
+          color: #3975C6;
+        }
+
         .item-bottom {
           display: flex;
           align-items: center;