From 92e10e91acfd7d946b779b544c465153a2d676fc Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 09:08:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=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 bc766a13..8d61be82 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.1.6------------"); +console.log("版本2.1.7------------"); // 监听关闭浏览器 let time1 = ref(0); From 0dcdd14298a599234171c1de3d1e9e8a02d5253d Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 17 Mar 2023 11:52:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 20 +++++++++++++++++--- src/views/projectcenter/TaskPage.vue | 20 +++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 33db8056..ce4771f4 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2686,7 +2686,11 @@ export default { "/homeworkpage?courseId=" + item.courseId + "&type=2&id=" + - item.id; + item.id + + "&chapterOrStageId=" + + item.chapterId + + "&infoId=" + + state.routerId; } // 考试 停用 if (item.type == 5) { @@ -2698,7 +2702,13 @@ export default { window.location.protocol + process.env.VUE_APP_H5 + "/externalexam?type=2&courseId=" + - item.courseId; + item.courseId + + "&id=" + + item.id + + "&chapterOrStageId=" + + item.chapterId + + "&infoId=" + + state.routerId; } else { codeUrl = window.location.protocol + @@ -2717,7 +2727,11 @@ export default { "/liveboradcast?courseId=" + item.courseId + "&type=2&id=" + - item.id; + item.id + + "&chapterOrStageId=" + + item.chapterId + + "&infoId=" + + state.routerId; } // 外链 if (item.type == 7) { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 6957976e..50462ca9 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4638,7 +4638,11 @@ export default { "/homeworkpage?courseId=" + item.courseId + "&type=1&id=" + - item.id; + item.id + + "&chapterOrStageId=" + + item.stageId + + "&infoId=" + + state.projectId; } // 考试 停用 if (item.type == 5) { @@ -4650,7 +4654,13 @@ export default { window.location.protocol + process.env.VUE_APP_H5 + "/externalexam?type=1&courseId=" + - item.courseId; + item.courseId + + "&id=" + + item.id + + "&chapterOrStageId=" + + item.stageId + + "&infoId=" + + state.projectId; } else { codeUrl = window.location.protocol + @@ -4669,7 +4679,11 @@ export default { "/liveboradcast?courseId=" + item.courseId + "&type=1&id=" + - item.id; + item.id + + "&chapterOrStageId=" + + item.stageId + + "&infoId=" + + state.projectId; } // 外链 if (item.type == 7) { From fe2a9a69bc885f88433959a848598ce8b118fb00 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 12:54:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:returnUrl=E9=85=8D=E7=BD=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/config.js b/src/api/config.js index f7faae2f..d2d9e197 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -60,7 +60,7 @@ http.interceptors.response.use( if (code === 1000) { (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : - (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VUE_APP_BOE_API_URL + import.meta.env.VUE_APP_BASE + router.currentRoute.value.fullPath)) + (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)) return Promise.reject(response); } show && message.error(msg); From ff93d6819c35475cd9f5475f56a266d99560f984 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 13:01:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 142de566..9e16c8d1 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -100,7 +100,7 @@ >