From bd204b1203e23b67ab0ccef201d9ba0e8e374eda Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 24 Oct 2022 17:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=20=20---?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=B3=E4=BE=A7=20=20=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BA=BA=20=20=E6=88=91=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=20=20=E8=B7=B3=E8=BD=AC=E5=88=B0=E2=80=9C?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E2=80=9D=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=20=20=20=20=E5=AE=9E=E9=99=85=E4=B8=8A?=
 =?UTF-8?q?=E6=98=AF=E6=9C=89=E5=86=85=E5=AE=B9=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/followList.vue | 4 ++--
 src/views/homepage/Index.vue           | 9 +++++----
 src/views/homepage/page.vue            | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue
index f6f5f53c..482d785a 100644
--- a/src/components/HomePage/followList.vue
+++ b/src/components/HomePage/followList.vue
@@ -5,7 +5,7 @@
         <li class="follow-home-title tabs-index" @click="tagTab(2)">{{userInfo.aid == pageId ?'关注我的人':'关注他的人'}}<span v-if="active == 2" class="line"></span></li>
     </ul>
     <div v-show="active ==1">
-        <div class="follow-list" v-for="item in follow.list" :key="item.id">
+        <div class="follow-list" v-for="(item,index) in follow.list" :key="index">
             <div style="width:60px;height:60">
               <el-avatar shape="circle" style="width:60px;height:60px" size="small" :src="baseUrl+item.authorInfo.avatar" v-if="item.authorInfo.avatar"></el-avatar>
               <div v-else class="uavatar">
@@ -66,7 +66,7 @@
                 </p>
                 <p class="portal-summary-text">{{maPage.userFollow.authorInfo.sign}}</p>
             </div>
-            <div v-if="Id == userInfo.aid">
+            <div v-if="pageId == userInfo.aid">
                 <el-button class="btn" icon="el-icon-plus" v-if="maPage.has">已关注</el-button>
                 <el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(maPage)">关注他</el-button>
             </div>
diff --git a/src/views/homepage/Index.vue b/src/views/homepage/Index.vue
index 954abf89..f8e71220 100644
--- a/src/views/homepage/Index.vue
+++ b/src/views/homepage/Index.vue
@@ -238,6 +238,7 @@
                 .ach-ul{
                     display: flex;
                     flex-wrap: wrap;
+                    justify-content: flex-start;
                     border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
                     padding-bottom: 4px;
                     ::v-deep .ach-box{
@@ -245,11 +246,11 @@
                         width: 58px;
                         // margin: 0 auto;/
                         text-align: center;
-                        margin-left: 4px;
-                        margin-right: 40px;
+                        margin-left: 22px;
+                        margin-right:22px;
                         margin-bottom: 18px;
-                        &:nth-child(3){
-                            // margin-right: 0px;
+                        &:nth-child(1){
+                            margin-left: 0px;
                         }
                         .medal-text{
                             font-size: 12px;
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index d2af2d3d..4bdc2df6 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -140,6 +140,8 @@
         mounted() {
             this.$bus.$on('followIndex',(num)=>{
                this.activeName = "7";
+               this.$refs.followList.resetActive();
+               this.$refs.followList.getPage();
             })
         },
         methods:{