From a7559813c9d8955ac9d4ca1cf5f68245981f8427 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Tue, 24 Aug 2021 22:33:42 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=85=B3=E6=B3=A8=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/_article_id.vue | 21 +++++++--------------
 pages/user/_account.vue       |  7 ++++---
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pages/article/_article_id.vue b/pages/article/_article_id.vue
index e0d5e32..1d8350c 100644
--- a/pages/article/_article_id.vue
+++ b/pages/article/_article_id.vue
@@ -44,7 +44,7 @@
                 </el-col>
                 <el-col v-if="user" :span="12" style="text-align: right;">
                   <template v-if="user.idUser !== article.articleAuthorId">
-                    <el-button size="mini" v-if="isFollow" @click="cancelFollowUser(article.articleAuthorId)" plain>
+                    <el-button size="mini" v-if="isFollower(article.articleAuthorId)" @click="cancelFollowUser(article.articleAuthorId)" plain>
                       取消关注
                     </el-button>
                     <el-button size="mini" v-else @click="followUser(article.articleAuthorId)" plain>关注</el-button>
@@ -139,7 +139,7 @@
     </el-col>
     <el-col>
       <comment-box :fetching="isFetching" :user="user" :avatar="avatar" :title="article.articleTitle"
-                   :post-id="routeArticleId" :authorId="article.articleAuthorId"></comment-box>
+                   :post-id="routeArticleId" :authorId="article.articleAuthorId" @gotoLogin="gotoLogin"></comment-box>
     </el-col>
     <el-col>
       <el-dialog :visible.sync="dialogVisible">
@@ -249,7 +249,6 @@ export default {
       loading: false,
       isShare: false,
       dialogVisible: false,
-      isFollow: false,
       isPerfect: false,
       shareData: {}
     }
@@ -308,6 +307,7 @@ export default {
           followingType: 0
         }).then(function (res) {
           _ts.$set(_ts, 'isFollow', res);
+          _ts.$store.dispatch('follow/fetchUserFollowingList');
         })
       } else {
         _ts.gotoLogin();
@@ -321,6 +321,7 @@ export default {
           followingType: 0
         }).then(function (res) {
           _ts.$set(_ts, 'isFollow', res);
+          _ts.$store.dispatch('follow/fetchUserFollowingList');
         })
       } else {
         _ts.gotoLogin();
@@ -388,6 +389,9 @@ export default {
           }
         }
       })
+    },
+    isFollower(idUser) {
+      return this.$store.getters["follow/isFollower"](idUser)
     }
   },
   mounted() {
@@ -417,17 +421,6 @@ export default {
       });
       _ts.$set(_ts, 'isPerfect', _ts.article.articlePerfect === '1')
     })
-
-    if (_ts.user) {
-      _ts.$axios.$get('/api/follow/is-follow', {
-        params: {
-          followingId: _ts.article.articleAuthorId,
-          followingType: 0
-        }
-      }).then(function (res) {
-        _ts.$set(_ts, 'isFollow', res);
-      })
-    }
   }
 
 }
diff --git a/pages/user/_account.vue b/pages/user/_account.vue
index 50ffddf..ef39d54 100644
--- a/pages/user/_account.vue
+++ b/pages/user/_account.vue
@@ -79,10 +79,10 @@
       <portfolio-list :portfolios="portfolios" @currentChange="currentChangePortfolio"></portfolio-list>
     </el-col>
     <el-col v-else-if="activeTab === '2'" class="tab-content">
-      <user-list :users="followings" @currentChange="currentChangeFollowing"></user-list>
+      <user-list :users="followings" @currentChange="currentChangeFollowing" @followUser="followUser" @cancelFollowUser="cancelFollowUser"></user-list>
     </el-col>
     <el-col v-else-if="activeTab === '3'" class="tab-content">
-      <user-list :users="followers" @currentChange="currentChangeFollower"></user-list>
+      <user-list :users="followers" @currentChange="currentChangeFollower" @followUser="followUser" @cancelFollowUser="cancelFollowUser"></user-list>
     </el-col>
   </el-row>
 </template>
@@ -202,7 +202,6 @@ export default {
       this.$router.push({
         path: `/user/${this.$route.params.account}?tab=${key}&page=${page}`
       })
-
     },
     gotoChats() {
       let _ts = this;
@@ -218,6 +217,7 @@ export default {
           followingType: 0
         }).then(function (res) {
           _ts.$set(_ts, 'isFollow', res);
+          _ts.$store.dispatch('follow/fetchUserFollowingList');
         })
       } else {
         _ts.login()
@@ -231,6 +231,7 @@ export default {
           followingType: 0
         }).then(function (res) {
           _ts.$set(_ts, 'isFollow', res);
+          _ts.$store.dispatch('follow/fetchUserFollowingList');
         })
       } else {
         _ts.login()