From 6b78bebff1e86efc3e3197f38efe526fb35db0ae Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 20 Oct 2022 17:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss    | 13 ++++++++-----
 src/components/Course/myNote.vue       |  2 +-
 src/components/HomePage/courseList.vue |  2 +-
 src/components/HomePage/noteList.vue   | 10 +++++++++-
 src/components/Portal/guideBox.vue     |  9 +++++----
 src/views/homepage/page.vue            |  7 -------
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index a7ef6a8d..be3343a0 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -986,14 +986,17 @@
     
     }
   }
+  .gui-box-left{
+    width: 160px;
+  }
   .gui-box-right{//资源引导位宽度
-    width: 697px;
+    width: 742px;
     .swiper-slide{
-       width: 576px;
-       height: 500px;
+       width: 500px;
+       height: 400px;
        text-align: center;
        .banner-img{
-          width: 576px;
+          width: 500px;
           height: 100%;
        }
     }
@@ -1001,7 +1004,7 @@
   .gui-box{
     .close-right{
         right:28px;
-        top:25px;
+        top:28px;
     }
   }
   .medal-index{ // 勋章规则控制
diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue
index e7491e35..0e4a167e 100644
--- a/src/components/Course/myNote.vue
+++ b/src/components/Course/myNote.vue
@@ -369,7 +369,7 @@ export default {
                             content: "编辑了笔记",//this.mynoteData.content,//事件的内容
                             objId: res.result.id,//关联的id
                             objType: "6",//关联的类型
-                            objInfo: this.data.name +''+ this.score,
+                            objInfo: this.data.name +'&'+ this.score,
                             aid: this.userInfo.aid, //当前登录人的id
                             aname: this.userInfo.name,//当前人的姓名
                             status: 1 //状态，直接写1
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
index e9cedc15..10b54d77 100644
--- a/src/components/HomePage/courseList.vue
+++ b/src/components/HomePage/courseList.vue
@@ -19,7 +19,7 @@
                 <h6 class="course-tit portal-title-tow">{{item.info.name || item.contentInfo}} <span class="score-info">{{toScore(item.info.score)}}分</span> </h6>
                 <p class="title-info">{{item.info.summary}}</p>
                 <div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="50"></el-progress></div></div>
-                <p class="portal-time">最新一次学习时间：2022-5-28 22:30:28</p>
+                <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)">
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue
index 65a3ebe5..f968a3a5 100644
--- a/src/components/HomePage/noteList.vue
+++ b/src/components/HomePage/noteList.vue
@@ -9,7 +9,7 @@
                     <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)">{{item.contentInfo}} <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span>  <span class="score-info" style="margin-left:22px">{{toScore(item.score)}}分</span> 
+                <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)">
                           <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
                     </span>
@@ -62,6 +62,14 @@
           mounted() {
           },
       methods:{
+        processNoteTitles(info,num) {
+            let data = info.split('&');
+            if(num ==1) {
+              return data[0];
+            } else {
+              return this.toScore(Number(data[1]));
+            }
+        },
         jumpDetail(item){
           this.$router.push('/course/detail?id='+item.info.courseId)
         },
diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue
index 222608df..d6eb2a88 100644
--- a/src/components/Portal/guideBox.vue
+++ b/src/components/Portal/guideBox.vue
@@ -74,10 +74,10 @@
     created() {
       let width = document.body.clientWidth;
       console.log(width,'width');
-      if(width > 1920) {
+      if(width > 1921) {
         this.clientWidth = '1088px';
       }
-      if(width > 1681 && width < 1920) {
+      if(width > 1681 && width < 1921) {
         this.clientWidth = '888px';
       }
       if(width > 1367 && width < 1680) {
@@ -181,9 +181,10 @@
         }
         .gui-box-left{
           padding-top: 90px;
-          width: 190px;
+          // width: 190px;
         //   background: #387DF7;
-          background: url('../../../public/images/homeWu/guide-bg.png') no-repeat 101% / 101%;
+          background: url('../../../public/images/homeWu/guide-bg.png') no-repeat;
+          background-size: 100% 100%;
           border-radius: 10px 0 0 10px;
           .left-title{
             width: 190px;
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 0ecb08ec..83079d17 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -342,11 +342,6 @@
                 apiNote.ids(ids).then(res=>{
                   if(res.status == 200) {
                     list.forEach((item, index) => {
-                        let score = item.contentInfo.substr(item.contentInfo.length -1,1);
-                            if(Number(score) > 0) {
-                               item.score = score;
-                            }
-
                             res.result.some(con => {
                             if (con.id == item.contentId) {
                                 item.info = con;
@@ -355,8 +350,6 @@
                                 return false;
                             }
                             });
-                            item.contentInfo = item.contentInfo.slice(0,item.contentInfo.length -1);
-
                         });
                    }
                 })