From 71e2c4c2a394383350f4c898d00c209b7e35f479 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Sat, 22 Oct 2022 15:13:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=B6=E8=B5=B7?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/qa/Answer.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 25de703d..499d2e5d 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -78,7 +78,7 @@
                         <!--在这一层上加事件-->
                         <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 v-if="item.content.length > 170 || item.content.split('\n').length>5" @click="changeIsAll(item)">{{ item.isAll ? '收起' : '全文'
                           }}</span>
                         </div>
                         <div class="answer-time">
@@ -755,12 +755,16 @@ export default {
     hideButtons() {
       this.btnsShowRowId = '';
     },
+    
     //展示全部
     displayAll(item) {
       let content = '';
       content = item.content.replace(/(\n){2,}/,'<br>');
       item.content = content;
-      if (!item.isAll && item.content.length > 170) {
+      if (!item.isAll && item.content.length > 170 || !item.isAll && item.content.split("\n").length>5) {
+        if(!item.isAll && item.content.split("\n").length>5){
+          return item.content.slice(0, 10) + "...";
+        }
         return item.content.slice(0, 170) + "...";
       }
       return item.content;

From b311c9b17906dc4fae81c07d55a721d47065a23c Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Sat, 22 Oct 2022 15:16:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/qa/Answer.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 499d2e5d..1c4b0e44 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -755,7 +755,7 @@ export default {
     hideButtons() {
       this.btnsShowRowId = '';
     },
-    
+
     //展示全部
     displayAll(item) {
       let content = '';
@@ -1031,7 +1031,7 @@ export default {
       span {
         color: #409eff;
         cursor: pointer;
-        margin-left: 5px;
+        // margin-left: 5px;
       }
     }
 

From 898b3209b17f0330464709e4ee02e3e9cb9efb1b Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Sat, 22 Oct 2022 15:18:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index 8f69c908..3c941604 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -1008,7 +1008,6 @@
       margin-right: 30px;
       margin-bottom: 30px;
       border-radius: 8px;
-    background-color: #000000;
       
       .xindex-course-image{
        width: 340px;