From 0879df5fe2888090369e681b185d54de2a3fea1f Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Sat, 22 Oct 2022 11:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/courseList.vue | 9 ++++++++-
 src/components/HomePage/followList.vue | 4 ++++
 src/store/getters.js                   | 1 -
 src/store/modules/user.js              | 8 --------
 src/views/homepage/Index.vue           | 9 +++++----
 src/views/homepage/page.vue            | 9 ++++-----
 src/views/portal/follow/index.vue      | 2 +-
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
index 00b89d65..21e4f59b 100644
--- a/src/components/HomePage/courseList.vue
+++ b/src/components/HomePage/courseList.vue
@@ -26,7 +26,7 @@
                     <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                 </div>
                 <div class="btn-right">
-                    <el-button class="btn" type="primary" @click="jumpDetail(item.info)">继续学习</el-button>
+                    <el-button class="btn" type="primary" @click="jumpDetail(item.info)">{{pageId == userInfo.aid || isFollow? '继续学习' : '我也去学'}}</el-button>
                 </div>
             </div>
           </div>
@@ -43,6 +43,7 @@
   <script>
   import { toScore} from '@/utils/tools.js';
     import courseImage from "@/components/Course/courseImage.vue";
+    import { mapGetters } from 'vuex'
       export default{
           data(){
               return{
@@ -50,6 +51,9 @@
                 courseList:[]
               }
           },
+          computed:{
+        ...mapGetters(['curIdentity','identity','userInfo']),
+          },
           components: {
             courseImage,
         },
@@ -71,6 +75,9 @@
                 default:false,
             }
           },
+          mounted() {
+            this.pageId = this.$xpage.getHomeId(this.$route);
+          },
           methods:{
             emitHide(id) {
               this.$emit('hideIndex',id)
diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue
index 10628620..f9cb17e6 100644
--- a/src/components/HomePage/followList.vue
+++ b/src/components/HomePage/followList.vue
@@ -142,6 +142,10 @@ import apiUser from "@/api/system/user.js";
       },
       mounted() {
             this.pageId = this.$xpage.getHomeId(this.$route);
+            this.$bus.$on('followIndex',(num)=>{
+               console.log(num,'num');
+               this.active = num;
+            })
       },
     methods:{
       resetActive(){
diff --git a/src/store/getters.js b/src/store/getters.js
index 90a26513..999ef0c6 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,7 +11,6 @@ const getters = {
     orgId: state => state.user.orgId,
     permissions: state => state.user.permissions,
     identity: state => state.user.identity,
-    attention: state => state.user.attention,
     intTimeNote: state => state.user.intTimeNote,
     curIdentity: state => state.user.curIdentity,
     permission_routes: state => state.permission.routes,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c13ef93e..2dc659ae 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -17,7 +17,6 @@ const user = {
         curIdentity: sessionStorage.getItem("curIdentity") == null ? 1 : sessionStorage.getItem("curIdentity"), // 用户当前选择的身份  1学员 2教师 3管理员
         permissions: [],
         intTimeNote:0,
-        attention:false,
     },
     mutations: {
         SET_IntTimeNote: (state, u) => {
@@ -45,15 +44,8 @@ const user = {
         SET_PERMISSIONS: (state, permissions) => {
             state.permissions = permissions
         },
-        SET_Attention: (state, m)=>{
-            state.attention = m
-        } 
     },
     actions: {
-        // /用户触发事件
-        setAttention({ commit }, iden) {
-            commit('SET_Attention', iden);
-         },
          // /用户触发事件
          userTrigger({ commit }, event) {
            event.source='page';
diff --git a/src/views/homepage/Index.vue b/src/views/homepage/Index.vue
index 01f9351e..b284e0b5 100644
--- a/src/views/homepage/Index.vue
+++ b/src/views/homepage/Index.vue
@@ -7,11 +7,11 @@
             <router-view />
             <div class="home-page-right">
                 <ul class="total-per">
-                    <li class="per-li pointer" @click="jumpAttention()">
+                    <li class="per-li pointer" @click="jumpAttention(2)">
                         <span class="per-info">{{follow.passive}}</span>
                         <span class="per-text">关注{{self?'我':'他'}}的人</span>
                     </li>
-                    <li class="per-li pointer" @click="jumpAttention()">
+                    <li class="per-li pointer" @click="jumpAttention(1)">
                         <span class="per-info">{{follow.initiative}}</span>
                         <span class="per-text">{{self?'我':'他'}}关注的人</span>
                     </li>
@@ -94,8 +94,9 @@
         toHome(ava) {
             this.$router.push({path:this.$xpage.getHomePath(ava.aid)})
         },
-        jumpAttention() {// 点击事件跳转关注
-            this.$store.dispatch("setAttention", true);
+        jumpAttention(num) {// 点击事件跳转关注
+            // this.$store.dispatch("setAttention", true);
+            this.$bus.$emit('followIndex',num)
         },
         init(){
           this.getMedal();
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 3e867554..dfbe31a4 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -93,7 +93,7 @@
     export default{
         components:{top,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
         computed: {
-          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap','attention']),
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
         },
         data(){
             return{
@@ -137,12 +137,11 @@
                   location.href=urlPre+process.env.VUE_APP_PUBLIC_PATH+this.$xpage.getHomePath(this.pageId);
           		  }
            },
-           attention(val) {
-              this.activeName = "7";
-           },
         },
         mounted() {
-
+            this.$bus.$on('followIndex',(num)=>{
+               this.activeName = "7";
+            })
         },
         methods:{
             init(){
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index 86cba83d..d4cad39f 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -121,7 +121,7 @@
             }
         },
         computed: {
-          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap','attention']),
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
         },
         created() {
             apiFollow.list().then(res=>{