From 040548f15fef5da13fc1583e6a04871914ee7db8 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Sat, 22 Oct 2022 10:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=8A=9F=E8=83=BD=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage/articleList.vue |  4 ++--
 src/components/HomePage/caseList.vue    |  2 +-
 src/components/HomePage/courseList.vue  |  2 +-
 src/components/HomePage/homePage.vue    |  2 +-
 src/views/homepage/page.vue             | 21 ++++++++++++++++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue
index d332469d..9419f35a 100644
--- a/src/components/HomePage/articleList.vue
+++ b/src/components/HomePage/articleList.vue
@@ -9,8 +9,8 @@
                         <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
                 </p>
-                <h6 class="article-title-info follow-home-title" @click="jumpDetail(item)">{{item.info.title || item.contentInfo}}
-                    <span class="follow-hide" style="float:right" v-if="!isDynamic && personal && !item.hidden"  @click="emitHide(item.id)">
+                <h6 class="article-title-info follow-home-title"><span  @click="jumpDetail(item)">{{item.info.title || item.contentInfo}}</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>
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
index 65875645..4a48b47b 100644
--- a/src/components/HomePage/caseList.vue
+++ b/src/components/HomePage/caseList.vue
@@ -18,7 +18,7 @@
                             <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)">
+                              <span class="follow-hide pointer"  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>
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
index e78c90ca..00b89d65 100644
--- a/src/components/HomePage/courseList.vue
+++ b/src/components/HomePage/courseList.vue
@@ -22,7 +22,7 @@
                 <p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
             </div> 
             <div style="width:150px">
-                <div class="follow-hide" style="text-align: right;" v-if="!isDynamic && personal && !item.hidden"  @click="emitHide(item.id)">
+                <div class="follow-hide pointer" style="text-align: 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>隐藏
                 </div>
                 <div class="btn-right">
diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
index 865a539d..13d2ac36 100644
--- a/src/components/HomePage/homePage.vue
+++ b/src/components/HomePage/homePage.vue
@@ -51,7 +51,7 @@
              <div class="learning-qus">我的U币（累计）</div>
              <div class="learning-an"><span>{{statData.uvalue}}</span></div>
           </div>
-          <div class="learning-info">
+          <div class="learning-info" v-if="userInfo.aid == pageId">
               <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
           </div>
         </div>
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 02ee0c33..3e867554 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -16,7 +16,6 @@
                     <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>
             <el-tab-pane name="1">
                 <span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
@@ -80,6 +79,7 @@
     import BookList from "@/components/HomePage/bookList.vue"
     import apiStat from '@/api/phase2/stat.js';
     import apiCourse from '@/api/modules/course.js'
+    import apiCourseStudy from '@/api/modules/courseStudy.js'
     import apiArticle from '@/api/modules/article.js'
     import apiCases from '@/api/modules/cases.js'
     import apiQa from '@/api/modules/qa.js'
@@ -157,6 +157,7 @@
                 apiStat.dynamicHide(id).then(res=>{
                     if(res.status == 200){
                       this.$message.success('动态隐藏成功')
+                      this.getList();
                     } else {
                       this.$message.error(res.message);
                     }
@@ -189,6 +190,8 @@
                     let ids = res.result.list.map(item=>item.contentId);
                     const noReapetIds = [...new Set(ids)];
                     res.result.list.forEach(item=>{
+                            item.lastTime = '';
+                            item.progress = null;
                             item.info = {};
                             item.authorInfo = {
                                 aid: "",
@@ -205,6 +208,7 @@
                     if(this.activeName == 1){
                       this.cousrePageList = res.result.list
                       this.getCourse(noReapetIds,res.result.list);
+                      this.getCourseProgress(noReapetIds,res.result.list);
                     }
                     if(this.activeName == 2) {
                         this.articlePageList = res.result.list;
@@ -302,6 +306,21 @@
                     return val1 < val2 ? rev * -1 : rev * 1;
                 };
             },
+            getCourseProgress(ids,list) {
+                apiCourseStudy.ids(ids).then((res)=>{
+                    console.log(res,'res');
+                    // list.forEach((item, index) => {
+                    //     res.result.some(con => {
+                    //     if (con.id == item.contentId) {
+                    //         item.info = con;
+                    //         return true;
+                    //     } else {
+                    //         return false;
+                    //     }
+                    //     });
+                    // });
+                })
+            },
             getAnswer(ids,list){
                 if(ids.length == 0){
                    return