From ef3e45dbebbd6572564106cfb0760f71068e9613 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 1 Nov 2022 18:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Article/collectList.vue    | 8 ++++++--
 src/components/Case/collectList.vue       | 8 ++++++--
 src/components/Course/collectItem.vue     | 8 ++++++--
 src/components/HomePage/favoritesNote.vue | 6 +++++-
 src/components/Qa/answerList.vue          | 2 +-
 src/components/Qa/favoritesQaList.vue     | 2 +-
 src/views/user/MyFavorites.vue            | 8 ++++----
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/components/Article/collectList.vue b/src/components/Article/collectList.vue
index 3b983ce1..9397595d 100644
--- a/src/components/Article/collectList.vue
+++ b/src/components/Article/collectList.vue
@@ -8,7 +8,7 @@
             <div @click="jump(item)" style="max-width:84%" class="article-info-title one-line-ellipsis">
               {{ item.title }}
             </div>
-            <span class="art-tit">#文章#</span>
+            <span class="art-tit" v-if="isAll">#文章#</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">
@@ -36,7 +36,11 @@ export default {
       //name,
       type: Array,
       default: () => []
-    }
+    },
+    isAll:{
+            type:Boolean,
+            default:false,
+          }
   },
   data() {
     return {};
diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index e6b1dd46..d70d0b42 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -4,7 +4,7 @@
       <div class="article-info ">
         <div class="article-info-title " >
           <div style="width:85%" class=" ">
-          <router-link :to="'/case/detail?id='+item.cases.id"  ><div class="case-tit title-line-ellipsis">{{item.cases.title}} <span class="bq-case">#案例#</span> </div>  </router-link>
+          <router-link :to="'/case/detail?id='+item.cases.id"  ><div class="case-tit title-line-ellipsis">{{item.cases.title}} <span v-if="isAll" class="bq-case">#案例#</span> </div>  </router-link>
 
           </div>
           <div class="article-info-date">
@@ -46,7 +46,11 @@
       items: { //name,
         type: Array,
         default:()=>[]
-      }
+      },
+      isAll:{
+            type:Boolean,
+            default:false,
+          }
     },
     filters:{
       timeFilter(item){
diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 7aab31d5..ae7348a9 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -9,7 +9,7 @@
       <div class="flex-between" @click="jump(item)">
         <div class="uc-course-name ">
           <div class="uc-coures-name-left  one-line-ellipsis">
-            <span >{{ item.title }} <span class="bq-coures">#课程#</span> </span>
+            <span >{{ item.title }} <span class="bq-coures" v-if="isAll">#课程#</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;font-size:14px;">
@@ -44,7 +44,11 @@ export default {
     remove: {
       type: Boolean,
       default: true
-    }
+    },
+    isAll:{
+            type:Boolean,
+            default:false,
+          }
   },
   data() {
     return {
diff --git a/src/components/HomePage/favoritesNote.vue b/src/components/HomePage/favoritesNote.vue
index aea64fe7..360d7f25 100644
--- a/src/components/HomePage/favoritesNote.vue
+++ b/src/components/HomePage/favoritesNote.vue
@@ -3,7 +3,7 @@
         <ul v-if="list.length > 0">
             <li class="note-list-index" v-for="item in list" :key="item.id">
                 <p style="margin-bottom:18px;">
-                  <span style="font-size: 16px;font-weight: 600;color: #333;">{{item.courseName || item.title}}</span> <span class="qa-bq">#笔记#</span>
+                  <span style="font-size: 16px;font-weight: 600;color: #333;">{{item.courseName || item.title}}</span> <span v-if="isAll" class="qa-bq">#笔记#</span>
                  
                   <span class="follow-hide" style="float:right">
                     <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
@@ -49,6 +49,10 @@
           personal:{
             type:Boolean,
             default:false,
+          },
+          isAll:{
+            type:Boolean,
+            default:false,
           }
         },
           data(){
diff --git a/src/components/Qa/answerList.vue b/src/components/Qa/answerList.vue
index 559f45f8..fe869af7 100644
--- a/src/components/Qa/answerList.vue
+++ b/src/components/Qa/answerList.vue
@@ -3,7 +3,7 @@
         <ul>
             <li class="answer-list-index" v-for="item in items" :key="item.id">
                 <h6 class="answer-title-info follow-home-title">
-                   <span class="pointer" @click="jumpDetail(item)">{{item.qtitle || item.title}}</span> <span style="font-weight: 400;">#回答#</span> 
+                   <span class="pointer" @click="jumpDetail(item)">{{item.qtitle || item.title}}</span> <span v-if="item.type" style="font-weight: 400;">#回答#</span> 
                     <span class="follow-hide" style="float:right">
                         <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
                     </span>
diff --git a/src/components/Qa/favoritesQaList.vue b/src/components/Qa/favoritesQaList.vue
index d99035d0..e55488a0 100644
--- a/src/components/Qa/favoritesQaList.vue
+++ b/src/components/Qa/favoritesQaList.vue
@@ -5,7 +5,7 @@
         <!-- <div class="article-info-title"> -->
           <div @click="qadetail(item)" 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>
+            <span style="padding-left: 5px">{{ item.question.title }} <span v-if="item.type" 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> -->
diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 65adfc4f..10151439 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -36,10 +36,10 @@
         </el-tab-pane> -->
         <el-tab-pane label="全部" name="all">
           <div v-for="(item, index) in dataList.list">
-            <course-items v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
-            <case-items v-if="item.type==3" @confirm="confirm" :items="[item]"></case-items>
-            <note-list v-if="item.type==6" @confirm="confirm" :list="[item]"></note-list>
-            <article-items v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
+            <course-items :isAll="true" v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
+            <case-items :isAll="true" v-if="item.type==3" @confirm="confirm" :items="[item]"></case-items>
+            <note-list :isAll="true" v-if="item.type==6" @confirm="confirm" :list="[item]"></note-list>
+            <article-items :isAll="true" v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
             <qa-items v-if="item.type==4" :items="[item]" @confirm="confirm" :collect="true" :share="false" :remove="false" :edit="false"></qa-items>
             <answer-items v-if="item.type==5" :items="[item]" @confirm="confirm"></answer-items>
           </div>