From 835c22e9e87b6f15c389e003bfaa1c5e4fa92f45 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 28 Oct 2022 17:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/answerList.vue  |  3 ++-
 src/components/HomePage/articleList.vue |  3 ++-
 src/components/HomePage/caseList.vue    |  3 ++-
 src/components/HomePage/courseList.vue  |  3 ++-
 src/components/HomePage/noteList.vue    |  3 ++-
 src/components/HomePage/putTo.vue       |  3 ++-
 src/views/portal/follow/index.vue       | 13 ++-----------
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue
index ac042c7e..c216c19a 100644
--- a/src/components/HomePage/answerList.vue
+++ b/src/components/HomePage/answerList.vue
@@ -30,7 +30,8 @@
         </ul>
         <div v-else class="home-no-list">
             <img class="img" :src="`${webBaseUrl}/images/homeWu/no-answer.png`" alt="" srcset="">
-            <p class="text">还没有回答</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有回答</p>
         </div>
     </div>
   </template>
diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue
index ec4d5c40..d0c24669 100644
--- a/src/components/HomePage/articleList.vue
+++ b/src/components/HomePage/articleList.vue
@@ -33,7 +33,8 @@
         </ul>
         <div v-else class="home-no-list">
             <img class="img" style="width:150px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-article.png`" alt="" srcset="">
-            <p class="text">还没有文章</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有文章</p>
         </div>
     </div>
   </template>
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
index 77354958..80a98859 100644
--- a/src/components/HomePage/caseList.vue
+++ b/src/components/HomePage/caseList.vue
@@ -57,7 +57,8 @@
             </div>
         <div v-else class="home-no-list">
             <img class="img" :src="`${webBaseUrl}/images/homeWu/no-case.png`" alt="" srcset="">
-            <p class="text">还没有案例</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有案例</p>
         </div>
     </div>
   </template>
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
index a090a6cc..061ca2da 100644
--- a/src/components/HomePage/courseList.vue
+++ b/src/components/HomePage/courseList.vue
@@ -35,7 +35,8 @@
       </ul>
       <div v-else class="home-no-list">
             <img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
-            <p class="text">还没有课程</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有课程</p>
       </div>
     </div>
   </template>
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue
index e9eedc78..68884c04 100644
--- a/src/components/HomePage/noteList.vue
+++ b/src/components/HomePage/noteList.vue
@@ -26,7 +26,8 @@
         </ul>
         <div v-else class="home-no-list">
             <img class="img" :src="`${webBaseUrl}/images/homeWu/no-note.png`" alt="" srcset="">
-            <p class="text">还没有笔记</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有笔记</p>
         </div>
     </div>
   </template>
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue
index fcbf641a..9e49c5f5 100644
--- a/src/components/HomePage/putTo.vue
+++ b/src/components/HomePage/putTo.vue
@@ -25,7 +25,8 @@
         </ul>
         <div v-else class="home-no-list">
             <img class="img" style="width:204px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-put.png`" alt="" srcset="">
-            <p class="text">还没有提问</p>
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有提问</p>
         </div>
     </div>
   </template>
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index a0e64829..4eb84766 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -52,7 +52,7 @@
                     </el-tab-pane>
                      -->
                 </el-tabs>
-                <div style="text-align: center; margin-top:57px;" v-show="page.count > 0 && activeName!='7'">
+                <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
                     <el-pagination
                     background
                     @size-change="handleSizeChange"
@@ -457,16 +457,7 @@
                 })
             },
             handleClick() {
-                if(this.activeName == '7') {
-                  //单独的分页，所以这里不与当前页面的分页共用
-                  this.$refs.followList.resetActive();
-                  this.$refs.followList.getPage();
-                  return
-                }
-                if(this.activeName == '8') {
-                    this.page.count = 0;
-                   return
-                }
+                this.page.count = 0;
                 this.getList();
             }
        }