From c2c75de1ef71e13ab3c7f03d64c9c7eeaadf718e Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 28 Oct 2022 17:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/article/Detail.vue |  5 +++--
 src/views/portal/article/Index.vue  |  7 ++++---
 src/views/portal/qa/Answer.vue      |  6 +++---
 src/views/portal/qa/Index.vue       | 20 +++++++++++++++++---
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index d6a59d7a..0e1eca9a 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -49,11 +49,12 @@
          </div>
          <div class="xcontent2-minor">
           <div>
-           <div id="articleAnking">
-              <div class="portal-model-btn pointer" @click="openDialog">
+            <div class="portal-model-btn pointer" @click="openDialog">
                     <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
                     写文章
               </div>
+           <div id="articleAnking">
+              
               <div class="portal-ranking ranking-bg">
                 <p class="ranking-title">贡献榜</p>
                 <ul class="ranking-data">
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index 84960cd6..64554079 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -68,12 +68,13 @@
         </div>
         <div class="xcontent2-minor">
           <div>
-            <div id="articleAnking">
-              <div>
-                <div class="portal-model-btn pointer" @click="openDialog">
+             <div class="portal-model-btn pointer" @click="openDialog">
                       <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
                       写文章
                 </div>
+            <div id="articleAnking">
+              <div>
+               
               </div>
               <div class="portal-ranking ranking-bg">
                 <p class="ranking-title">贡献榜</p>
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index c1cd0fc4..c09112a9 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -223,12 +223,12 @@
           </div>
         </div>
         <div class="xcontent2-minor">
-
-            <div class="qa-ranking">
-                  <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
+ <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
                     <svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
                     提问题
                   </div>
+            <div class="qa-ranking">
+                 
                   <div class="portal-ranking ranking-bg">
                         <p class="ranking-title">贡献榜</p>
                         <ul class="ranking-data">
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 0d09aebf..e05b35f8 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -45,7 +45,9 @@
                         </div>
                       </div>
                       <div style="display: flex;justify-content:space-between;">
-                          <div class="qa-info-summary portal-summary-text two-line-ellipsis" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)"></div>
+                          <div class="qa-info-summary portal-summary-text" :class="qa.images==''? 'two-line-ellipsis':'four-line-ellipsis'" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)">
+
+                          </div>
                           <div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
                             <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="">
                           </div>
@@ -75,11 +77,12 @@
          </div>
          <div class="xcontent2-minor">
             <!-- <div> -->
-              <div  style="padding:0" id="qa-fixd">
-                  <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
+               <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
                     <svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
                     提问题
                   </div>
+              <div  style="padding:0" id="qa-fixd">
+                 
                     <div class="portal-ranking ranking-bg">
                         <p class="ranking-title">贡献榜</p>
                         <ul class="ranking-data">
@@ -447,6 +450,17 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.four-line-ellipsis{
+  display: -webkit-box;
+  // white-space:pre-wrap;
+  overflow: hidden;
+  line-height: 25px;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  box-sizing: border-box;
+}
+
 ::v-deep.el-input__inner {
   background-color: #fff !important;
 }