From bbc4502527678bf78f66eade71c9fc34bbc5cca3 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 20:00:44 +0800 Subject: [PATCH 1/9] -- bug --- src/views/roadmap/PathDetails.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 839e4a8..6d27dc9 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -88,7 +88,7 @@
当前进度
-
- {{ value.currentRatio * 100 }}% + {{ value.currentRatio }}%
From 44431655ba627a51aff961733781234d3db140a0 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 20:31:15 +0800 Subject: [PATCH 2/9] -- bug --- src/views/roadmap/PathDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 6d27dc9..c94ed16 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -118,7 +118,7 @@
- {{ value.currentRatio === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }} + {{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
From e2bf8e8bb865a02a774a04fac74d433f06284875 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 21:00:44 +0800 Subject: [PATCH 3/9] =?UTF-8?q?--=20=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PathDetailImage.vue | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue index cc58d73..1cca01b 100644 --- a/src/components/PathDetailImage.vue +++ b/src/components/PathDetailImage.vue @@ -3,7 +3,9 @@
+ class="nameClass" + :title="item.name" + :style="{background: `url('${current===i?currentBack:nameBack}')`,backgroundSize:'100%',width:`${current===i?107:93}px`,height:`${current===i?80:70}px`,lineHeight:'50px',color:'#FFF'}"> {{ item.name }}
@@ -31,11 +33,12 @@ const imageAttrs = { width: 1437, height: 594, positions: [ - {left: 84, top: 518}, - {left: 307, top: 370}, - {left: 848, top: 275}, - {left: 617, top: 69}, - {left: 1047, top: 42}, + {left: 63, top: 503}, + {left: 828, top: 455}, + {left: 268, top: 325}, + {left: 1087, top: 183}, + {left: 647, top: 84}, + {left: 1180, top: 40}, ] } } @@ -79,4 +82,12 @@ function close() { position: absolute; cursor: pointer; } +.nameClass{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + padding:0 20px 0 50px; + font-size: 12px; +} \ No newline at end of file From 9cf5525c9f7e0c74155f83520c94366a56591698 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 21:27:01 +0800 Subject: [PATCH 4/9] -- bug --- src/views/project/ProjectDetails.vue | 2 +- src/views/roadmap/PathDetails.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 19abed3..a0d9776 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -451,7 +451,7 @@ function toFinish(d, sName, chapterOrStageId) { return; } if (d.type == 3 || d.type == 7) { - request(STUDY_RECORD, { + d.status || request(STUDY_RECORD, { studentId: data.value.userInfoBo.userId, targetId: data.value.routerId, logo: 2, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index c94ed16..62fbba8 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -460,7 +460,7 @@ function toFinish(d) { } } if (d.type === 3 || d.type === 7) { - request(STUDY_RECORD, { + d.status || request(STUDY_RECORD, { studentId: userInfo.value.id, targetId: data.value.routerId, logo: 1, From c3850ee02a80c35f644483142284c616c716f28f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 21:54:20 +0800 Subject: [PATCH 5/9] -- bug --- src/views/faceteach/FaceTeachSignUp.vue | 829 ++++++++++++------------ 1 file changed, 415 insertions(+), 414 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index ce4d1a1..19869f3 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -1,504 +1,505 @@ From 71c8637bede27669f3a5b168f45fc3efdf3b9abe Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 22:03:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?--=20=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 19869f3..e50dbab 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -39,8 +39,7 @@
{{ data.planDto?.address }}
- 立即报名 - + {{data.isSignUp?'已报名':'立即报名'}}
@@ -170,7 +169,7 @@ let timer = null; // 报名 function onLineSignUp() { - request(FACETEACH_SIGNUP, {courseId}).then(() => { + data.value.isSignUp || request(FACETEACH_SIGNUP, {courseId}).then(() => { ElMessage.success("报名成功"); router.push({path: 'faceteach', query: {courseId}}) }).catch(err => { From 627c62d47f7de13ba862bf8188c96a8f1955e622 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 00:33:08 +0800 Subject: [PATCH 7/9] -- bug --- src/views/project/ProjectDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index a0d9776..d85c454 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -455,7 +455,7 @@ function toFinish(d, sName, chapterOrStageId) { studentId: data.value.userInfoBo.userId, targetId: data.value.routerId, logo: 2, - stageOrChapterId: chapterId, + stageOrChapterId: chapterOrStageId, taskId: d.projectTaskId, }); } From d4dd3599cd16757da994dc847901405686ea3385 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 01:07:30 +0800 Subject: [PATCH 8/9] -- bug --- src/views/roadmap/PathDetails.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 62fbba8..9ec08a1 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -477,8 +477,8 @@ function toFinish(d) { router.push({ path: types.value.path[d.type], query: { - // id: d.routerTaskId, - id: routerId, + id: d.routerTaskId, + // id: routerId, type: 1, taskId: routerId, taskIds: routerId, From 559878570cff101b0dfd831b760ec457483c44f6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 09:08:36 +0800 Subject: [PATCH 9/9] =?UTF-8?q?--=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 61e36da..b147a29 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import {useStore} from "vuex"; import {onMounted} from "vue"; import router from "@/router"; -console.log("版本1.0.5------------"); +console.log("版本1.0.6------------"); const store = useStore(); onMounted(() => { getUserInfo();