From 4e85783a185650aa78b668a211f89c23a80b0793 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 13:46:56 +0800 Subject: [PATCH 1/6] =?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/medal/Index.vue | 1 - src/views/portal/article/Detail.vue | 2 +- src/views/portal/article/Index.vue | 2 +- src/views/portal/qa/Answer.vue | 2 +- src/views/portal/qa/Index.vue | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue index a9ef05a1..68ff3f90 100644 --- a/src/views/medal/Index.vue +++ b/src/views/medal/Index.vue @@ -118,7 +118,6 @@ return item.medalId == 3; }) } - console.log(data,'data'); return data; } }, diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 9bb2fb76..6c88bd9f 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -75,7 +75,7 @@ - {{ item.sysCreateUname }} ({{ item.orinfo }}) + {{ item.sysCreateUname }} {{ item.orinfo }} diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue index 63a7fbfc..0a38ff0a 100644 --- a/src/views/portal/article/Index.vue +++ b/src/views/portal/article/Index.vue @@ -96,7 +96,7 @@ - {{ item.sysCreateUname }}({{ item.orinfo }}) + {{ item.sysCreateUname }}{{ item.orinfo }} diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index 93c6bcc4..0514671d 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -248,7 +248,7 @@ - {{ item.sysCreateUname }} ({{ item.orinfo }}) + {{ item.sysCreateUname }} {{ item.orinfo }} diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue index a74d313d..f03f7e21 100644 --- a/src/views/portal/qa/Index.vue +++ b/src/views/portal/qa/Index.vue @@ -102,7 +102,7 @@ - {{ item.sysCreateUname }}({{ item.orinfo }}) + {{ item.sysCreateUname }}{{ item.orinfo }} From 4c305d5fbaf93e195b93167f1ef78aae1510e528 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 3 Nov 2022 13:57:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 6682b96b..fc939619 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -146,7 +146,7 @@
排名
姓名
-
学习时长:小时
+
学习时长:小时
From f680b5b1c0875c2084f7e6bc890b6700c2b5d61d Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 14:13:23 +0800 Subject: [PATCH 3/6] =?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 62f1c79c..b18b58ff 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -29,7 +29,7 @@
公开私密 私密 - 保存 + 保存 取消
From 2c3a0a99725b5c214cce4cb707d3ca97412e8bcf Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 14:48:06 +0800 Subject: [PATCH 4/6] =?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/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index 1915e2c9..8036beca 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -52,7 +52,7 @@
-
+
最近学习： {{lastStudy.courseName}} From 885e8b1de0bc5fa74aec6a2385eed397a7446970 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 15:07:22 +0800 Subject: [PATCH 5/6] =?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/interactBar.vue | 7 +++++-- src/components/Portal/noteComment.vue | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 612ca517..ba6c7a3e 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -270,12 +270,15 @@ export default { if(this.type==30){ content='案例评论' } - if(this.type==60 || this.type==10 || this.type==20 || this.type==30) { - content=sendName+typeText+content + // 评论点赞通知没有关联id,评论通知暂时关闭 + if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) { + return; + // content=sendName+typeText+content } else { content=sendName+typeText+content+'-'+title } + let message={ content, refId, diff --git a/src/components/Portal/noteComment.vue b/src/components/Portal/noteComment.vue index 0d9dbcde..85a6aabb 100644 --- a/src/components/Portal/noteComment.vue +++ b/src/components/Portal/noteComment.vue @@ -20,7 +20,7 @@
-
{{com.id}} +
{{ getHMS(com.playTime) }} From 3d4b8c0b47bf4d908b966ba8dbcb7b2c442963d1 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 3 Nov 2022 16:01:52 +0800 Subject: [PATCH 6/6] =?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 | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index 839eefab..b0113d75 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -15,6 +15,14 @@
+
+ + + + + + +
@@ -52,9 +60,14 @@ guideCollection:false,// 兴趣采集 guideList:[], resonimg:[], + resonimgTow:[], + swiperOptiontwo: { + autoplay: false, + // noSwiping: true, + }, swiperOption: { autoplay: { - disableOnInteraction: false , + disableOnInteraction: false, delay: 2000, }, speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms） @@ -131,9 +144,15 @@ showImg(item) { this.resonimg = []; + this.resonimgTow = []; if(item){ this.description = item.description; - this.resonimg = item.images; + if(item.images.length > 1) { + this.resonimg = item.images; + } else { + this.resonimgTow = item.images; + } + } }, notYet() {