From fdcc735f592755dce0254191f39476599d442473 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 11 Oct 2022 18:58:45 +0800
Subject: [PATCH] =?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/components/Article/collectList.vue | 44 ++++++++++++++++++--------
 src/components/Case/collectList.vue    |  2 +-
 src/components/Course/collectItem.vue  |  4 +--
 src/components/Qa/favoritesQaList.vue  | 39 +++++++++++++++--------
 4 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/components/Article/collectList.vue b/src/components/Article/collectList.vue
index feb4bba4..047ace41 100644
--- a/src/components/Article/collectList.vue
+++ b/src/components/Article/collectList.vue
@@ -4,16 +4,22 @@
       <div class="article-info-date"></div>
       <div @click="jump(item)">
         <div class="article-info">
-          <div class="article-info-title one-line-ellipsis">
-            {{ item.title }}
+          <div class="art-hear one-line-ellipsis">
+            <span class="article-info-title">
+              {{ item.title }}
+              <span class="art-tit">#文章#</span>
+            </span>
+            <el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-star-on">取消收藏</el-button>
+          </div>
+           <div class="article-info-tools">
+            <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
+            <!-- <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span> -->
+            <!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
           </div>
           <div class="article-info-summary two-line-ellipsis">{{ item.summary || item.content}}</div>
-          <div class="article-info-tools">
-            <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
-            <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span>
-            <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
-            <el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
-          </div>
+            <interactBar   :type="2" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
+
+         
         </div>
       </div>
     </div>
@@ -68,6 +74,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.art-hear{
+  display: flex;
+  button{
+    margin-left: auto;
+  }
+}
+.art-tit{
+  font-size: 16px;
+  color: #333333;
+  margin-left: 5px;
+  font-weight: 400;
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;
@@ -108,18 +126,18 @@ export default {
 }
 .article-info {
   .article-info-title {
-    font-size: 18px;
-    font-weight: 400;
+    font-size: 16px;
+    font-weight: 600;
     margin-bottom: 5px;
     color: #333;
   }
   .article-info-summary {
     // height: 65px;
-    color: #999999;
+    color: #333;
     margin-bottom: 15px;
     margin-top: 10px;
-
-    line-height: 25px;
+    font-size: 14px;
+    line-height: 20px;
   }
   .article-info-tools {
     color: #999999;
diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index 830df179..4ff7c53d 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -8,7 +8,7 @@
           
           </div>
           <div class="article-info-date">
-            <el-button @click="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
+            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
           </div>
         </div>
         <div class="article-info-tools">
diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 7d1acc29..2c4a8510 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -12,7 +12,7 @@
             <span >{{ item.title }} <span class="bq-coures">#课程#</span> </span>
           </div>
         <div class="canfavo">
-        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6;">
+        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6;font-size:14px;">
           取消收藏
         </el-button>
       </div>
@@ -227,7 +227,7 @@ export default {
     }
     .canfavo{
       margin-left:auto;
-      width: 100px;
+      // width: 100px;
       button{
         font-size: 12px;
 
diff --git a/src/components/Qa/favoritesQaList.vue b/src/components/Qa/favoritesQaList.vue
index 9ef02669..cdf6b076 100644
--- a/src/components/Qa/favoritesQaList.vue
+++ b/src/components/Qa/favoritesQaList.vue
@@ -3,23 +3,25 @@
     <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="qadetail(item)">
       <div class="article-info">
         <!-- <div class="article-info-title"> -->
-          <div class="article-info-title" style="line-height: 30px;">
-            <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span>
-            <span style="padding-left: 5px">{{ item.question.title }}</span>
+          <div class="art-head article-info-title" style="line-height: 30px;">
+            <!-- <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span> -->
+            <span style="padding-left: 5px">{{ item.question.title }} <span class="qa-bq">#问答#</span> </span>
+          <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
           </div>
         <!-- </div> -->
         <div class="article-info-summary two-line-ellipsis">{{ item.question.content }}</div>
-        <div v-if="item.question.isResolve" style=";color: #5a5a5a;display:flex;margin-bottom:10px">
-          <div style="width:90px"><span>最佳回答:</span></div>
+        <div v-if="item.question.isResolve" style=";color: #333330;display:flex;margin-bottom:10px">
+          <!-- <div style="width:90px"><span>最佳回答:</span></div> -->
 
-          <div class="one-line-ellipsis" style="color: #5a5a5a;padding-top:1px">{{ item.question.bestAnswer }}</div>
-        </div>
-        <div class="article-info-tools">
-          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
-          <span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span>
-          <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
-          <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6">取消收藏</el-button>
+          <div class="one-line-ellipsis" style="color: #333330;font-size: 14px;padding-top:1px">{{ item.question.bestAnswer }}</div>
         </div>
+      <interactBar   :type="4" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
+
+        <!-- <div class="article-info-tools"> -->
+          <!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo> -->
+          <!-- <span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span> -->
+          <!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
+        <!-- </div> -->
       </div>
     </div>
   </div>
@@ -94,6 +96,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.qa-bq{
+  font-size: 16px;
+  color: #333333;
+}
+.art-head{
+  display: flex;
+  button{
+    margin-left: auto;
+  }
+}
 // .one-line-ellipsis {
 //   display: -webkit-box;
 //   white-space:pre-wrap;
@@ -161,8 +173,9 @@ export default {
   }
   .article-info-summary {
     line-height: 25px;
+    font-size: 14px;
     margin: 10px 0;
-    color: #666;
+    color: #333;
   }
   .article-info-tools {
     color: #999999;