From e0fcec18f4bd362abc63a300218022a48d722ac0 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 22 Oct 2022 16:35:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=94=B6=E8=B5=B7=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/MyFavorites.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue index cfc68b62..9ea9e43e 100644 --- a/src/views/user/MyFavorites.vue +++ b/src/views/user/MyFavorites.vue @@ -453,7 +453,7 @@ export default { if(res.status==200){ - + this.dataList.count=res.result.count; if(res.result.length!=0){ let courseIds=[]; @@ -470,6 +470,7 @@ export default { item.question.content=item.content; item.question.bestAnswer=item.bestAnswer; item.question.id=item.id; + } if(item.type == 3){ item.cases = {title:'',summary:''}; @@ -479,7 +480,10 @@ export default { } }) this.loadCouserTeacher(res.result.list,courseIds); - this.dataList.list = res.result.list; + res.result.list.forEach(item=>{ + item.isAll = false; + }) + this.dataList.list.push(...res.result.list); this.getAllUserData(res.result.list); }else{ this.dataList.list=[] From 0620a3958f11b68d5020ab615e417fba86873f06 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Sat, 22 Oct 2022 17:04:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal.scss | 12 +++++++++++ src/components/Portal/interactBar.vue | 6 +++--- src/icons/svg/collectedCourse.svg | 12 +++++------ src/icons/svg/collectionCourse.svg | 16 +++++++++++++++ src/views/Index.vue | 29 ++++++++++++++++++--------- src/views/portal/course/Index.vue | 9 ++++----- 6 files changed, 60 insertions(+), 24 deletions(-) create mode 100644 src/icons/svg/collectionCourse.svg diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index 88bb3a10..91d1a1ba 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -162,6 +162,12 @@ body {margin: 0px;padding: 0px;} // margin-bottom: 36px; background: #fff; border-radius: 8px; + position: relative; + .course-card-favorite{ + position: absolute; + right:25px; + bottom: 72px; + } // margin-right: 35px; // .cor-icon { @@ -338,6 +344,12 @@ body {margin: 0px;padding: 0px;} .course-card { padding:20px; margin-right: 20px; + position: relative; + .course-card-favorite{ + position: absolute; + right:20px; + bottom: 72px; + } .course-image-box { width:218; height: 122px; diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index f064c8b7..f95be3bb 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -37,10 +37,10 @@
- + - {{ data.favorites}} + {{ data.favorites}}
@@ -245,7 +245,7 @@ export default { content='案例' } if(this.type==4){ - content='问答' + content='提问' } if(this.type==5){ content='回答' diff --git a/src/icons/svg/collectedCourse.svg b/src/icons/svg/collectedCourse.svg index 2254b67f..e298c4f5 100644 --- a/src/icons/svg/collectedCourse.svg +++ b/src/icons/svg/collectedCourse.svg @@ -1,12 +1,12 @@ - 收藏 + 编组 18备份 - - - - - + + + + + diff --git a/src/icons/svg/collectionCourse.svg b/src/icons/svg/collectionCourse.svg new file mode 100644 index 00000000..2254b67f --- /dev/null +++ b/src/icons/svg/collectionCourse.svg @@ -0,0 +1,16 @@ + + + 收藏 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/Index.vue b/src/views/Index.vue index bb0732ee..b4c7dc27 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -83,16 +83,18 @@ 录播课
-
高效谈判系列课
+
+
高效谈判系列课
+
+ +
+
3000+人学习
-
- -
5.0分 @@ -103,7 +105,12 @@
-
+
+
+ + + +
@@ -117,11 +124,7 @@ {{formatNum(course.studys)}}人学习