From 17cbd2b77f7444512746c964d6a8dac229de86cb Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 2 Nov 2022 19:29:30 +0800 Subject: [PATCH 1/5] =?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/components/Portal/guideBox.vue | 5 +++-- src/views/Index.vue | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index 8352e24e..839eefab 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -25,7 +25,7 @@

{{description}}

- 进入首页 + 进入首页 @@ -117,7 +117,8 @@ this.$emit('close'); }, goHome() { - this.$router.push('/index') + this.guideCollection = false; + this.$router.push('/index') }, getlist() { apiGuide.list().then(res=>{ diff --git a/src/views/Index.vue b/src/views/Index.vue index 6f6073d3..412009d4 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -5,7 +5,7 @@
- +
@@ -14,7 +14,7 @@
- +
From fbe83d7127193ade678d35aa7ee9b0c49dca88d9 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 2 Nov 2022 20:35:23 +0800 Subject: [PATCH 2/5] =?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/views/user/Noteedit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue index 0e26f339..62f1c79c 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -7,7 +7,7 @@ 历史记录
-
+
{{getHMS(editdata.playTime)}} From 5be11ae113cfec29c0df72d9383a8c5bb6b70706 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 2 Nov 2022 20:48:32 +0800 Subject: [PATCH 3/5] =?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/components/Course/myNote.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue index 0ab20b76..265823a2 100644 --- a/src/components/Course/myNote.vue +++ b/src/components/Course/myNote.vue @@ -9,8 +9,8 @@
- {{formatSeconds(play_Time)}} - + {{formatSeconds(play_Time)}}1 +
Date: Wed, 2 Nov 2022 21:07:21 +0800 Subject: [PATCH 4/5] =?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/views/portal/course/Index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 864afef3..fd1c8d46 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -489,9 +489,9 @@ export default { //console.log(this.course.pageIndex,'this.course.pageIndex'); //加此判断，是为了没有数据时的闪动问题 //if(this.course.pageIndex >1){ - if (scrollTop > 830) { + if (scrollTop > 1176) { document.querySelector("#fixd-box").style.cssText = - "position: fixed;top: -885px;width:"+outerWidth+"px"; + "position: fixed;top: -882px;width:"+outerWidth+"px"; } else { document.querySelector("#fixd-box").style.cssText = "position: static"; } From e72bcba8475bb6b294866768c60d3c1fbaa9db03 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 10:20:24 +0800 Subject: [PATCH 5/5] =?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/views/user/Mynotes.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue index d91d66b1..cbae8ce1 100644 --- a/src/views/user/Mynotes.vue +++ b/src/views/user/Mynotes.vue @@ -35,10 +35,10 @@ end-placeholder="结束"> - 全部课程 + {{courseName ? courseName: '全部课程'}} 全部 - {{cou.courseName}} + {{cou.courseName}} @@ -442,7 +442,9 @@ export default { } }, handleCommand(e) { - this.courseId = e; + this.courseId = e.courseId; + this.courseName = e.courseName; + console.log(e,'e'); this.noteData(this.num); }, Time(val){