From 642df1d995dd6cec9212affe81848a93c63f2d46 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Sat, 29 Oct 2022 11:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=80=E8=BF=91=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss |  6 ++---
 src/views/Index.vue                 | 34 +++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index 61b8a74b..f9f8bc96 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -744,7 +744,7 @@
     .personal-box{
         // margin-left: 16px;
         margin-top: 20px;
-        margin-bottom: 28px;
+        margin-bottom: 16px;
     }
   }
   .xindex-course{
@@ -1014,7 +1014,7 @@
     padding: 30px 45px;
     .personal-box{
         margin-top: 20px;
-        margin-bottom: 28px;
+        margin-bottom: 16px;
     }
   }
   .xindex-course{
@@ -1259,7 +1259,7 @@
     padding: 30px 45px;
     .personal-box{
         margin-top: 20px;
-        margin-bottom: 28px;
+        margin-bottom: 16px;
     }
   }
   .medal-index{ // 勋章规则控制
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 8b27ea5d..8dede21d 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -51,6 +51,14 @@
             <!-- <img class="personal-box-img" :src="`${webBaseUrl}/images/homeWu/agency.png`" alt="" srcset=""> -->
           </div>
         </a>
+        <div class="last-study-info"> 
+          <div class="one-line-ellipsis">
+            <router-link :to="'/course/detail?id='+lastStudy.courseId" >最近学习：{{lastStudy.courseName}} </router-link>
+          </div>
+          <div class="tobe-icon">
+            <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt="">
+          </div>
+        </div>
         <ul class="personal-ul">
           <li>
             <router-link to="/user/ranking">
@@ -421,6 +429,7 @@
 
 <script>
   import { mapGetters } from 'vuex';
+  import apicourseStudy from "@/api/modules/courseStudy.js"
   import portalHeader from '@/components/PortalHeader.vue';
   import portalFooter from '@/components/PortalFooter.vue';
   import portalFloatTools from '@/components/PortalFloatTools.vue';
@@ -473,6 +482,8 @@
     },
     data() {
       return {
+        lastStudy:{},
+        overlayShow:false,
         userData: {  uvalue:0, totalStudyHour:0  },
         userHobby:{
           needShow:false,
@@ -553,12 +564,12 @@
       this.getAnkingData();
       this.getLevel();
       this.getQaAnswers();
+      this.getLastStudy();
 
       //检查兴趣爱好是否已填报,
       //先检查本地session和 local 15天, 这两个值是在组件中设置的
       let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid);
       let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid);
-      console.log("sessionHobby:"+sessionHobby);
       if(!sessionHobby){ //只有session中不存在，才会验证
           //本地15天验证,localHobby,后续完善
             let flag=true;//请求检查
@@ -597,6 +608,20 @@
       }
     },
     methods: {
+      // 上次学习记录
+      getLastStudy() {
+				apicourseStudy.lastStudy().then(res => {
+					if (res.status === 200) {
+						this.lastStudy = res.result;
+            console.log(this.lastStudy,'this.lastStudy');
+						if (res.result != '' && res.result.courseId) {
+							this.overlayShow = true;
+						}
+					} else {
+						this.$message.error(res.message);
+					}
+				})
+			},
       //检查并弹出引导页
       checkAndShowGuide(){
         //引导页弹框是否显示
@@ -1112,7 +1137,12 @@
       color: #000000;
       margin-top: 10px;
     }
-
+  .last-study-info{
+    display: flex;
+    justify-content: space-between;
+    padding: 0 10px;
+    font-size: 16px;
+  }
     .personal-box {
       width: 100%;
       height: 47px;