From f9dbd84643416099d873c5c872ffd54a7a7d77e6 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 14 Jul 2022 10:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/comments.vue |  8 +++++---
 src/views/portal/qa/Answer.vue     | 10 +++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 68017b34..19c57bb5 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -96,7 +96,7 @@
                <div class="comment-body" >
                     <div class="comment-info" @mouseover="showButtons(com.id)" @mouseout="hideButtons()">
                       <div class="comment-content" @click="cancelReply()">
-                          {{displayAll(com)}}
+                          <span style="color: #303133" v-html="displayAll(com)"></span>
                           <span v-if="com.content.length>170" @click="changeIsAll(com)">
                             {{com.isAll?'收起':'全文'}}
                           </span>
@@ -137,7 +137,7 @@
                               <div class="comment-body" @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
                                 <div class="comment-info" >
                                    <div class="comment-content"  @click="cancelReply()">
-                                        {{displayAll(reply)}}
+                                        <span style="color: #303133" v-html="displayAll(reply)"></span>
                                         <span v-if="reply.content.length>170" @click="changeIsAll(reply)">
                                           {{reply.isAll?'收起':'全文'}}
                                         </span>
@@ -532,7 +532,9 @@
       },
       //展示全部
       displayAll(item) {
-        //console.log(item,'item');
+        let content = '';
+        content = item.content.replace(/(\n){2,}/,'<br>');
+        item.content = content;
         if(!item.isAll && item.content && item.content.length > 170) {
             return item.content.slice(0, 170) + "...";
         }
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index b5d4f305..70961039 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -89,7 +89,8 @@
                     <div class="answer-body">
                       <div @mouseover="showButtons(item.id)" @mouseout="hideButtons()">
                         <!--在这一层上加事件-->
-                        <div class="answer-text">{{ displayAll(item) }}
+                        <div class="answer-text">
+                          <span style="color: #303133" v-html="displayAll(item)"></span>
                           <span v-if="item.content.length > 170" @click="changeIsAll(item)">{{ item.isAll ? '收起' : '全文'
                           }}</span>
                         </div>
@@ -146,7 +147,7 @@
                           <div class="comment-body">
                             <div class="comment-info" @mouseover="showButtons(con.id)" @mouseout="hideButtons()">
                               <div class="comment-content">
-                                {{ displayAll(con) }}
+                                <span style="color: #303133" v-html="displayAll(con)"></span>
                                 <span v-if="con.content.length > 170" @click="changeIsAll(con)">
                                   {{ con.isAll ? '收起' : '全文' }}
                                 </span>
@@ -189,7 +190,7 @@
                                 <div class="comment-body">
                                   <div class="comment-info" @mouseover="showButtons(row.id)" @mouseout="hideButtons()">
                                     <div class="comment-content">
-                                      {{ displayAll(row) }}
+                                      <span style="color: #303133" v-html="displayAll(row)"></span> 
                                       <span v-if="row.content.length > 170" @click="changeIsAll(row)">
                                         {{ row.isAll ? '收起' : '全文' }}
                                       </span>
@@ -714,6 +715,9 @@ export default {
     },
     //展示全部
     displayAll(item) {
+      let content = '';
+      content = item.content.replace(/(\n){2,}/,'<br>');
+      item.content = content;
       if (!item.isAll && item.content.length > 170) {
         return item.content.slice(0, 170) + "...";
       }