From 57a41194cda231d16eceb115f1345d0d7083a3e4 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 21 Oct 2022 18:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/phase2/stat.js                  |   2 +-
 src/components/HomePage/answerList.vue  |   8 +-
 src/components/HomePage/articleList.vue |   8 +-
 src/components/HomePage/caseList.vue    |  25 +-
 src/components/HomePage/courseList.vue  |   8 +-
 src/components/HomePage/noteList.vue    |  18 +-
 src/components/HomePage/putTo.vue       |   8 +-
 src/components/Portal/authorInfo.vue    |   1 +
 src/views/homepage/page.vue             |  13 +-
 src/views/portal/follow/index.vue       | 433 ++++++++++++++++++++++--
 10 files changed, 465 insertions(+), 59 deletions(-)

diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js
index d1c927f5..94bc97e0 100644
--- a/src/api/phase2/stat.js
+++ b/src/api/phase2/stat.js
@@ -59,7 +59,7 @@ const userDynamicList = function(data) {
  } data
  */
 const userDynamicfollows = function(data) {
-  return ajax.postJson(baseURL,'/xboe/m/stat/userdynamic/follows',data);
+  return ajax.postJson(baseURL,'/xboe/m/stat/userdynamic/follow',data);
 }
 
 /**
diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue
index 667e3691..daf122d3 100644
--- a/src/components/HomePage/answerList.vue
+++ b/src/components/HomePage/answerList.vue
@@ -3,9 +3,9 @@
         <ul v-if="list.length > 0">
             <li class="answer-list-index" v-for="item in list" :key="item.id">
                 <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
-                    <span v-if="!personal">{{item.aname}}</span>
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>
                     {{item.cusInfo}}<span style="margin-left:28px">{{item.eventTime}}</span> 
-                    <span v-if="personal && !item.hidden" class="follow-hide" style="float:right"  @click="emitHide(item.id)">
+                    <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right"  @click="emitHide(item.id)">
                         <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                 </p>
@@ -54,6 +54,10 @@
             personal:{
                 type:Boolean,
                 default:false,
+            },
+            isFollow:{
+                type:Boolean,
+                default:false,
             }
         },
           data(){
diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue
index 762f7c1e..d332469d 100644
--- a/src/components/HomePage/articleList.vue
+++ b/src/components/HomePage/articleList.vue
@@ -3,9 +3,9 @@
         <ul v-if="list.length > 0">
             <li class="article-list-index" v-for="item in list" :key="item.id">
                 <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
-                    <span v-if="!personal">{{item.aname}}</span>{{item.cusInfo}}  
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}  
                     <span style="margin-left:28px">{{item.eventTime}}</span> 
-                    <span v-if="personal && !item.hidden" class="follow-hide" style="float:right"  @click="emitHide(item.id)">
+                    <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right"  @click="emitHide(item.id)">
                         <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                 </p>
@@ -58,6 +58,10 @@
             personal:{
                 type:Boolean,
                 default:false,
+            },
+            isFollow:{//用于判断是否事我的关注页面，显示人名
+                type:Boolean,
+                default:false,
             }
         },
           data(){
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
index b5405aee..65875645 100644
--- a/src/components/HomePage/caseList.vue
+++ b/src/components/HomePage/caseList.vue
@@ -4,31 +4,32 @@
               <div :span="24" v-for="item in list" :key="item.id" class="case-list">
                 <div class="case-info">
                   <p v-if="isDynamic" class="portal-summary-text">
-                    <span v-if="!personal">{{item.aname}}</span>{{item.cusInfo}}
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
                     <span style="margin-left:28px">{{item.eventTime}}</span>
-                    <span v-if="personal && !item.hidden" class="follow-hide" style="float:right"  @click="emitHide(item.id)">
+                    <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right"  @click="emitHide(item.id)">
                       <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                   </p>
                   <div class="case-info-cont">
-                    <router-link :to="'/case/detail?id='+item.info.id">
+                   
                       <div class="case-info-title">
 
                           <div class="case-titdiv" style="">
+                            <router-link :to="'/case/detail?id='+item.info.id">
                               <span class="case-tittext" v-html="item.info.title || item.contentInfo"></span>
+                            </router-link>
                               <span class="follow-hide"  v-if="!isDynamic && personal && !item.hidden"  @click="emitHide(item.id)">
                                  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                               </span>
                           </div>
-
                       </div>
                       <div style="height:58px;padding-top:18px;display:flex">
                         <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
                        <div class="sign-text">{{ item.authorInfo.sign }}</div> 
                       </div>
                       <div class="keyword-text clearfix">
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.info.orgDomainParent) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;" v-if="item.info.orgDomain">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;" v-if="item.info.orgDomain == '' && item.info.orgDomainParent">{{ orgDomainTranslate(item.info.orgDomainParent) }}</div>
                         <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.info.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
                         <div v-if="item.info.keyword1">{{ item.info.keyword1 }}</div>
                         <div v-if="item.info.keyword2">{{ item.info.keyword2 }}</div>
@@ -36,7 +37,7 @@
                         <div v-if="item.info.keyword4">{{ item.info.keyword4 }}</div>
                         <div v-if="item.info.keyword5">{{ item.info.keyword5 }}</div>
                       </div>
-                 </router-link>
+                
                     <div class="case-info-summary two-line-ellipsis">
                       {{item.info.summary}}
                           <!-- {{displayAll(item)}}
@@ -78,11 +79,15 @@
             type:Array,
             default:()=>[]
           },
-          isDynamic:{
+          isDynamic:{// 是否全部
                 type:Boolean,
                 default:false,
             },
-          personal:{
+          personal:{//显示隐藏，
+            type:Boolean,
+            default:false,
+          },
+          isFollow:{//用于判断是否事我的关注页面，显示人名
             type:Boolean,
             default:false,
           }
@@ -93,7 +98,6 @@
               }
           },
           mounted() {
-            
           },
       methods:{
         emitHide(id) {
@@ -115,6 +119,7 @@
         },
         orgDomainTranslate(code){ // 组织领域翻译
           if(code==''){return '';}
+          console.log(code,'code');
           return this.orgDomainMap.get(code);
         },
        }
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
index 10b54d77..e78c90ca 100644
--- a/src/components/HomePage/courseList.vue
+++ b/src/components/HomePage/courseList.vue
@@ -3,9 +3,9 @@
       <ul class="data-info-ul" v-if="list.length > 0">
         <li class="data-info" v-for="item in list" :key="item.id">
           <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
-            <span v-if="!personal">{{item.aname}}</span>
+            <span v-if="!personal || isFollow">{{item.aname}}</span>
             {{item.cusInfo}}  <span style="margin-left:28px">{{item.eventTime}}</span>
-            <span v-if="personal && !item.hidden" class="follow-hide" style="float:right"  @click="emitHide(item.id)">
+            <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right"  @click="emitHide(item.id)">
               <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
             </span>
           </p>
@@ -65,6 +65,10 @@
             personal:{
               type:Boolean,
               default:false,
+            },
+            isFollow:{//用于判断是否事我的关注页面，显示人名
+                type:Boolean,
+                default:false,
             }
           },
           methods:{
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue
index f968a3a5..54c276c3 100644
--- a/src/components/HomePage/noteList.vue
+++ b/src/components/HomePage/noteList.vue
@@ -3,14 +3,14 @@
         <ul v-if="list.length > 0">
             <li class="note-list-index" v-for="item in list" :key="item.id">
                 <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
-                  <span v-if="!personal">{{item.aname}}</span>{{item.cusInfo}}  
+                  <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}  
                   <span style="margin-left:28px">{{item.eventTime}}</span> 
-                  <span v-if="personal && !item.hidden" class="follow-hide" style="float:right"  @click="emitHide(item.id)">
+                  <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right"  @click="emitHide(item.id)">
                     <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                   </span>
                 </p>
-                <h6 class="note-title-info follow-home-title pointer" @click="jumpDetail(item)">{{processNoteTitles(item.contentInfo, 1)}} <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span>  <span class="score-info" style="margin-left:22px">{{processNoteTitles(item.contentInfo, 2)}}分</span> 
-                    <span class="follow-hide" style="float:right" v-if="!isDynamic && personal && !item.hidden"  @click="emitHide(item.id)">
+                <h6 class="note-title-info follow-home-title pointer"><span  @click="jumpDetail(item)">{{processNoteTitles(item.contentInfo, 1)}}</span> <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span>  <span class="score-info" @click="jumpDetail(item)" style="margin-left:22px">{{processNoteTitles(item.contentInfo, 2)}}分</span> 
+                    <span class="follow-hide pointer" style="float:right" v-if="!isDynamic && personal && !item.hidden"  @click="emitHide(item.id)">
                           <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                 </h6>
@@ -51,6 +51,10 @@
           personal:{
             type:Boolean,
             default:false,
+          },
+          isFollow:{
+            type:Boolean,
+            default:false,
           }
         },
           data(){
@@ -63,6 +67,12 @@
           },
       methods:{
         processNoteTitles(info,num) {
+          if(info == null){
+            return
+          }
+          if(info.indexOf('&')<0) {
+            return 0;
+          }
             let data = info.split('&');
             if(num ==1) {
               return data[0];
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue
index c305ddb0..d7975253 100644
--- a/src/components/HomePage/putTo.vue
+++ b/src/components/HomePage/putTo.vue
@@ -3,9 +3,9 @@
         <ul v-if="list.length > 0">
             <li class="put-list-index" v-for="item in list" :key="item.id">
                 <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px;margin-top:10px">
-                    <span v-if="!personal">{{item.aname}}</span>{{item.cusInfo}}  
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}  
                     <span style="margin-left:28px">{{item.eventTime}}</span> 
-                    <span v-if="personal && !item.hidden" class="follow-hide" style="float:right" @click="emitHide(item.id)">
+                    <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right" @click="emitHide(item.id)">
                         <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                 </p>
@@ -49,6 +49,10 @@
             personal:{
                 type:Boolean,
                 default:false,
+            },
+            isFollow:{
+                type:Boolean,
+                default:false,
             }
         },
           data(){
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index a62330dd..c7c07b95 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -4,6 +4,7 @@
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
+     
       <div v-else class="uavatar">
         <div v-if="sex == null" style="border-radius: 50%;width: 40px;height: 40px;"></div>
         <div v-else>
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 83079d17..02ee0c33 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -9,12 +9,12 @@
             <el-tab-pane name="">
                 <span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
                 <template v-for="item in allPageList">
-                    <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="personal"></course-list>
-                    <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="personal"></case-list>
-                    <note-list v-if="item.contentType == 6" :list="[item]" :isDynamic="true" :personal="personal"></note-list>
-                    <put-list v-if="item.contentType == 4" :list="[item]" :isDynamic="true" :personal="personal"></put-list>
-                    <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="personal"></answer-list>
-                    <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal"></article-list>
+                    <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></course-list>
+                    <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></case-list>
+                    <note-list v-if="item.contentType == 6" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></note-list>
+                    <put-list v-if="item.contentType == 4" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></put-list>
+                    <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></answer-list>
+                    <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></article-list>
                 </template>
 
             </el-tab-pane>
@@ -146,7 +146,6 @@
         },
         methods:{
             init(){
-
               this.getList();
               if(this.pageId == this.userInfo.aid) {
                 this.personal = true;
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index 9976d93c..86cba83d 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -13,38 +13,38 @@
                 </div>
                 -->
                 <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane name="first" label="动态">
-                        <!-- <span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span> -->
-                        动态
+                    <el-tab-pane name="" label="全部">
+                        <template v-for="item in allPageList">
+                            <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
+                            <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
+                            <note-list v-if="item.contentType == 6" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></note-list>
+                            <put-list v-if="item.contentType == 4" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></put-list>
+                            <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
+                            <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></article-list>
+                        </template>
                     </el-tab-pane>
-                    <el-tab-pane name="second" label="课程">
-                        <!-- <span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span> -->
-                        <course-list></course-list>
+                    <el-tab-pane name="1" label="课程">
+                        <course-list :list="cousrePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
                     </el-tab-pane>
-                    <el-tab-pane name="case" label="案例">
-                        <!-- <span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span> -->
-                        <case-list></case-list>
+                    <el-tab-pane name="6" label="笔记">
+                        <note-list :list="notePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></note-list>
                     </el-tab-pane>
-                    <el-tab-pane name="note" label="笔记">
-                        <!-- <span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span> -->
-                        <note-list></note-list>
+                    <el-tab-pane name="3" label="案例">
+                        <case-list :list="casePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
                     </el-tab-pane>
-                    <el-tab-pane name="qa" label="提问">
-                        <!-- <span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span> -->
-                        <put-list></put-list>
+                    <el-tab-pane name="2" label="文章">
+                        <article-list :list="articlePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></article-list>
                     </el-tab-pane>
-                    <el-tab-pane name="answer" label="回答">
-                        <!-- <span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span> -->
-                        <answer-list></answer-list>
+                    <el-tab-pane name="4" label="提问">
+                        <put-list :list="qaPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></put-list>
                     </el-tab-pane>
-                    <el-tab-pane name="article" label="文章">
-                        <!-- <span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span> -->
-                        <article-list></article-list>
+                    <el-tab-pane name="5" label="回答">
+                        <answer-list :list="answerPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
                     </el-tab-pane>
-                    <el-tab-pane name="fourth" label="关注">
-                        <!-- <span slot="label"><svg-icon icon-class="home-follow" style="font-size: 30px;"></svg-icon><span class="tabs-info">关注</span></span> -->
+                    
+                    <!-- <el-tab-pane name="7" label="关注">
                         <follow-list></follow-list>
-                    </el-tab-pane>
+                    </el-tab-pane> -->
                     <!--
                     <el-tab-pane name="book" label="书籍">
                         <span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
@@ -52,10 +52,21 @@
                     </el-tab-pane>
                      -->
                 </el-tabs>
-                <div style="width:200px"></div>
+                <div style="text-align: center; margin-top:57px;" v-show="page.count > 0 && activeName!='7'">
+                    <el-pagination
+                    background
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="page.pageIndex"
+                    :page-sizes="[10, 20, 30, 40]"
+                    :page-size="page.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="page.count">
+                    </el-pagination>
+                </div>
+                <div style="height:200px"></div>
             </div>
         </div>
-
     </div>
   </template>
 
@@ -70,6 +81,16 @@
     import ArticleList from "@/components/HomePage/articleList.vue"
     import FollowList from "@/components/HomePage/followList.vue"
     import BookList from "@/components/HomePage/bookList.vue"
+    import apiFollow from "@/api/phase2/userfollow.js"
+    import apiStat from "@/api/phase2/stat.js"
+    import apiArticle from '@/api/modules/article.js'
+    import apiCases from '@/api/modules/cases.js'
+    import apiQa from '@/api/modules/qa.js'
+    import apiCourse from '@/api/modules/course.js'
+    import apiNote from '@/api/phase2/note.js'
+    import apiUser from "@/api/system/user.js";
+    import {cutFullName} from "@/utils/tools.js";
+    import { mapGetters,mapActions } from 'vuex';
 
     export default{
         components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
@@ -77,12 +98,366 @@
             return{
                 input:'',
                 activeName:'first',
+                page:{
+                    pageIndex:1,
+                    pageSize:10,
+                    count:0
+                },
+                input:'',
+                activeName:'',
+                pageId:'',
+                // pageList:[],
+                casePageList:[],
+                notePageList:[],
+                articlePageList:[],
+                qaPageList:[],
+                answerPageList:[],
+                cousrePageList:[],
+                allPageList:[],
+                personal:true,
+                orgData:[],
+                Profess:[],
+                ids:[],
             }
         },
+        computed: {
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap','attention']),
+        },
+        created() {
+            apiFollow.list().then(res=>{
+                if(res.status == 200) {
+                   this.ids = res.result.map(item=>item.followId);
+                   this.getList()
+                }
+            })
+            this.loadMajorType();
+            this.loadOrgDomain();
+        },
       methods:{
-        handleClick() {
+        emitInput(){
 
-        }
+        },
+        ...mapActions({
+                loadMajorType:'majorType/loadMajorTypes',
+                loadOrgDomain:'orgDomain/loadOrgDomains'
+        }),
+        dynamicHide(id){
+                apiStat.dynamicHide(id).then(res=>{
+                    if(res.status == 200){
+                      this.$message.success('动态隐藏成功')
+                      this.getList();
+                    } else {
+                      this.$message.error(res.message);
+                    }
+                })
+            },
+        handleSizeChange(val) {
+                this.page.pageSize = val;
+                this.page.pageIndex = 1;
+                this.getList();
+            },
+            handleCurrentChange(val) {
+                this.page.pageIndex = val;
+                this.getList();
+            },
+            getList(ids) {
+                let data = {
+                    pageIndex:this.page.pageIndex,
+                    pageSize:this.page.pageSize,
+                    contentType:this.activeName == 0? '':this.activeName,//内容类型
+                    aids:this.ids // 数组
+                }
+                apiStat.userDynamicfollows(data).then(res=>{
+                   if(res.status == 200) {
+                    this.page.count = res.result.count;
+                    let ids = res.result.list.map(item=>item.contentId);
+                    const noReapetIds = [...new Set(ids)];
+                    res.result.list.forEach(item=>{
+                            item.info = {};
+                            item.authorInfo = {
+                                aid: "",
+                                name: "",
+                                orgInfo: "",
+                                avatar: "",
+                                sex: null
+                            }
+                            item.isAll = false;
+                        })
+                    if(this.activeName == 0) {// 动态处理
+                        this.getAllList(res.result.list)
+                    }
+                    if(this.activeName == 1){
+                      this.cousrePageList = res.result.list
+                      this.getCourse(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 2) {
+                        this.articlePageList = res.result.list;
+                        this.getArticle(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 3) {
+                        this.casePageList = res.result.list;
+                        this.getCase(noReapetIds,res.result.list);
+                        console.log(this.casePageList,'this.casePageList');
+                    }
+                    if(this.activeName == 6) { // 笔记
+                        this.getNote(noReapetIds,res.result.list);
+                        this.notePageList = res.result.list;
+                    }
+                    if(this.activeName == 4) { // 提问
+                        this.qaPageList = res.result.list;
+                        this.getQa(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 5) { // 回答
+                        this.answerPageList = res.result.list;
+                        this.getAnswer(ids,res.result.list);
+                    }
+                   }
+                })
+            },
+            getAllList(list) {
+                this.allPageList = [];
+                let casePageList=[];
+                let notePageList=[];
+                let articlePageList=[];
+                let qaPageList=[];
+                let answerPageList=[];
+                let cousrePageList=[];
+                list.forEach(item=>{
+                    if(item.contentType == 1) {
+                        cousrePageList.push(item);
+                    }
+                    if(item.contentType == 2) {
+                        articlePageList.push(item);
+                    }
+                    if(item.contentType == 3) {
+                        casePageList.push(item);
+                    }
+                    if(item.contentType == 4) {
+                        qaPageList.push(item);
+                    }
+                    if(item.contentType == 5) {
+                        answerPageList.push(item);
+                    }
+                    if(item.contentType == 6) {
+                        notePageList.push(item);
+                    }
+                })
+                let caseIds = casePageList.map(item=>item.contentId);
+                const noReapetCaseIds = [...new Set(caseIds)];
+                let articleIds = articlePageList.map(item=>item.contentId);
+                const noReapetArticleIds = [...new Set(articleIds)];
+                let cousreIds = cousrePageList.map(item=>item.contentId);
+                const noReapetCousreIds = [...new Set(cousreIds)];
+                let qaIds = qaPageList.map(item=>item.contentId);
+                const noReapetQaIds = [...new Set(qaIds)];
+                let anwerIds = answerPageList.map(item=>item.contentId);
+                const noReapetAnwerIds = [...new Set(anwerIds)];
+                let noteIds = notePageList.map(item=>item.contentId);
+                const noReapetNoteIds = [...new Set(noteIds)];
+                if(noReapetCaseIds.length > 0) {
+                    this.getCase(noReapetCaseIds,casePageList);
+                }
+                if(noReapetArticleIds.length > 0) {
+                    this.getArticle(noReapetArticleIds,articlePageList);
+                }
+                if(noReapetCousreIds.length > 0) {
+                    this.getCourse(noReapetCousreIds,cousrePageList);
+                }
+                if(noReapetQaIds.length > 0) {
+                    this.getQa(noReapetQaIds,qaPageList);
+                }
+                if(noReapetAnwerIds.length > 0) {
+                    this.getAnswer(noReapetAnwerIds,answerPageList);
+                }
+                if(noReapetNoteIds.length > 0) {
+                    this.getNote(noReapetNoteIds,notePageList);
+                }
+                this.allPageList.push(...casePageList,...articlePageList,...cousrePageList,...qaPageList,...answerPageList,...notePageList);
+                this.allPageList.sort(this.pcompare("eventTime", false))
+            },
+            pcompare(prop, rev) {
+                if (rev === undefined) {
+                    rev = 1;
+                } else {
+                    rev = rev ? 1 : -1;
+                }
+                return function(obj1, obj2) {
+                    let val1 = obj1[prop],
+                    val2 = obj2[prop];
+                    return val1 < val2 ? rev * -1 : rev * 1;
+                };
+            },
+            getAnswer(ids,list){
+                if(ids.length == 0){
+                   return
+                }
+                apiQa.answerIds(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                })
+            },
+            getQa(ids,list){
+                apiQa.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                    })
+            },
+            getNote(ids,list) {
+                apiNote.ids(ids).then(res=>{
+                  if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                   }
+                })
+            },
+            getCase(ids,list){
+                apiCases.ids(ids).then(res=>{
+                   if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                        this.getCaseUserData(list);
+                   }
+                })
+            },
+            getCaseUserData(list) {
+                // let ids = caseList.map((item, index) => {
+                //     return item.info.authorId;
+                // });
+                // const noReapetIds = [...new Set(ids)];
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.authorId != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.authorId;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.authorId) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getArticle(ids,list){
+                apiArticle.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                        this.getArticleUserData(list);
+                   }
+                })
+            },
+            getArticleUserData(list) {
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.sysCreateAid != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.sysCreateAid;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.sysCreateAid) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getCourse(ids,list) {
+                apiCourse.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                        // this.getArticleUserData(list);
+                   }
+                })
+            },
+            handleClick() {
+                if(this.activeName == '7') {
+                  //单独的分页，所以这里不与当前页面的分页共用
+                  this.$refs.followList.resetActive();
+                  this.$refs.followList.getPage();
+                  return
+                }
+                if(this.activeName == '8') {
+                    this.page.count = 0;
+                   return
+                }
+                this.getList();
+            }
        }
       }
   </script>
@@ -93,7 +468,7 @@
     }
      .follow-page{
         background: #FFFFFF;
-        height: 100vh;
+        // height: 100%;
        ::v-deep .el-tabs__active-bar{
           height: 4px;
           border-radius: 3px;