From 0a48442744526cd9d76d8b9984f3a6a4453343fb Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 11 Jun 2025 16:47:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style(forgot):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E6=A1=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 fui-form-item 组件的 label 属性，简化了代码结构- 保持了其他功能和样式不变，仅进行了微小调整 --- pages/student/login/forgot.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/student/login/forgot.vue b/pages/student/login/forgot.vue index f26877b..3d3a13c 100644 --- a/pages/student/login/forgot.vue +++ b/pages/student/login/forgot.vue @@ -18,7 +18,7 @@ - + From a24a5cac4605425e5ff7196487dfcf1484aa0963 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 11 Jun 2025 17:22:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(components):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20AQTabber=20=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F-=20=E5=B0=86=20un?= =?UTF-8?q?i.navigateTo=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20uni.redirectTo?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=B0=E9=A1=B5=E9=9D=A2=20-=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=9A=84=20console.log=20?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=BB=A5=E7=A1=AE=E8=AE=A4=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AQ/AQTabber.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue index 87de67a..16c5e41 100644 --- a/components/AQ/AQTabber.vue +++ b/components/AQ/AQTabber.vue @@ -157,9 +157,13 @@ //跳转tabBar页面 uni.setStorageSync('tabBerIndex', e.index) console.log('qqq', e.urlPath) - uni.navigateTo({ - url: e.urlPath - }) + + //关闭当前页面跳转新页面 + uni.redirectTo({ + url: e.urlPath + }) + + console.log('qqq2,执行完了') }else{ this.show = true } From e49d5ac7fd1ad6999a24121cee6af4a109ec0f3f Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 11 Jun 2025 19:42:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(navigation):=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 Vue 原型上添加 $navigateTo 方法，用于全局页面跳转 - 当页面栈超过 4 层时，自动使用 reLaunch 关闭所有页面并跳转- 否则使用 navigateTo正常跳转 - 在多个页面中替换原有的 uni.navigateTo 为 this.$navigateTo，以使用新的跳转逻辑 --- components/AQ/AQTabber.vue | 5 +++ main.js | 54 +++++++++++++++++++++++++ pages/coach/class/info.vue | 4 +- pages/coach/class/list.vue | 2 +- pages/coach/course/info.vue | 2 +- pages/coach/course/info_list.vue | 4 +- pages/coach/course/list.vue | 2 +- pages/coach/home/index.vue | 8 ++-- pages/coach/job/add.vue | 3 +- pages/coach/job/list.vue | 2 +- pages/coach/my/arrival_statistics.vue | 2 +- pages/coach/my/due_soon.vue | 4 +- pages/coach/my/exam_results.vue | 2 +- pages/coach/my/gotake_exam.vue | 2 +- pages/coach/my/index.vue | 16 ++++---- pages/coach/my/schooling_statistics.vue | 2 +- pages/coach/my/set_up.vue | 4 +- pages/coach/my/teaching_management.vue | 4 +- pages/coach/my/update_pass.vue | 2 +- pages/coach/student/info.vue | 8 ++-- pages/common/my_message.vue | 4 +- pages/common/sys_msg_list.vue | 2 +- pages/market/clue/add_clues.vue | 7 ++-- pages/market/clue/clue_info.vue | 8 ++-- pages/market/clue/edit_clues.vue | 7 ++-- pages/market/clue/index.vue | 4 +- pages/market/clue/new_task.vue | 3 +- pages/market/clue/writing_followUp.vue | 3 +- pages/market/data/index.vue | 14 +++---- pages/market/my/index.vue | 20 ++++----- pages/market/my/set_up.vue | 4 +- pages/market/my/signed_client_list.vue | 2 +- pages/market/my/update_pass.vue | 5 ++- pages/student/index/index.vue | 10 ++--- pages/student/index/job_list.vue | 2 +- pages/student/login/forgot.vue | 3 +- pages/student/login/login.vue | 4 +- pages/student/my/my.vue | 16 ++++---- pages/student/my/set_up.vue | 4 +- pages/student/my/update_pass.vue | 2 +- pages/student/timetable/index.vue | 4 +- pages/student/timetable/info.vue | 2 +- pages/student/timetable/list.vue | 2 +- 43 files changed, 165 insertions(+), 99 deletions(-) diff --git a/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue index 16c5e41..2c29176 100644 --- a/components/AQ/AQTabber.vue +++ b/components/AQ/AQTabber.vue @@ -163,6 +163,11 @@ url: e.urlPath }) + //关闭全部页面 + // uni.reLaunch({ + // url: e.urlPath + // }) + console.log('qqq2,执行完了') }else{ this.show = true diff --git a/main.js b/main.js index 8d266d4..f046e2a 100644 --- a/main.js +++ b/main.js @@ -21,6 +21,60 @@ Vue.prototype.$getimg = Api_url Vue.mixin(minxin) + +/** + * 全局封装跳转方法：this.$navigateTo({ url: 'xxx' }) + * 支持在页面栈 >= 8 层时，关闭全部页面打开页面 + */ +Vue.prototype.$navigateTo = function (options) { + // 只接受 { url: 'xxx' } 的形式作为参数 + if (typeof options !== 'object' || !options.url) { + console.error('跳转参数错误', options); + // uni.showToast({ title: '参数错误', icon: 'none' }); + return; + } + + const url = options.url; // 获取要跳转的页面路径 + const maxStackSize = 4; // 页面栈最大保留数量 + + const pages = getCurrentPages(); // 获取当前页面栈 + const currentPage = pages[pages.length - 1]; + const currentRoute = currentPage.route; + + + console.log('view-页面栈长度:',pages.length) + + // 判断当前页面栈是否已满 + if (pages.length >= maxStackSize) { + // 页面栈已满，使用 reLaunch 关闭所有页面并跳转 + uni.reLaunch({ + url, + success: () => { + // 可选：用于调试 + // console.log('已通过 reLaunch 跳转到:', url); + }, + fail: (err) => { + console.error('reLaunch 跳转失败:', err); + // uni.showToast({ title: '页面跳转失败', icon: 'none' }); + } + }); + } else { + // 页面栈未满，正常使用 navigateTo 正常跳转 + uni.navigateTo({ + url, + success: () => { + // 可选：用于调试 + // console.log('当前页面栈：', getCurrentPages().map(p => p.route)); + }, + fail: (err) => { + console.error('navigateTo 跳转失败:', err); + // uni.showToast({ title: '页面跳转失败', icon: 'none' }); + } + }); + } +}; + + const app = new Vue({ store, ...App diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue index d130daf..245ff5d 100644 --- a/pages/coach/class/info.vue +++ b/pages/coach/class/info.vue @@ -322,14 +322,14 @@ //打开课程详情 openViewCourseInfo(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/course/info_list?id=${id}` }) }, //打开学员详情页 openViewStudentInfo(item) { let students_id = item.student.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/info?students_id=${students_id}` }) }, diff --git a/pages/coach/class/list.vue b/pages/coach/class/list.vue index 3da09fb..6ac9e2a 100644 --- a/pages/coach/class/list.vue +++ b/pages/coach/class/list.vue @@ -156,7 +156,7 @@ export default { //打开班级详情页 openViewClassInfo(item){ let class_id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/class/info?class_id=${class_id}` }) }, diff --git a/pages/coach/course/info.vue b/pages/coach/course/info.vue index 54b244e..4efe2bc 100644 --- a/pages/coach/course/info.vue +++ b/pages/coach/course/info.vue @@ -137,7 +137,7 @@ export default { //打开课时详情页 openViewCourseInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, diff --git a/pages/coach/course/info_list.vue b/pages/coach/course/info_list.vue index 43886a4..f6eef69 100644 --- a/pages/coach/course/info_list.vue +++ b/pages/coach/course/info_list.vue @@ -227,7 +227,7 @@ //打开课时详情页 openViewCourseInfo(item) { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, @@ -238,7 +238,7 @@ //跳转页面-作业详情 openViewWorkDetails(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/work_details?id=${id}` }) }, diff --git a/pages/coach/course/list.vue b/pages/coach/course/list.vue index 872d074..987078e 100644 --- a/pages/coach/course/list.vue +++ b/pages/coach/course/list.vue @@ -233,7 +233,7 @@ //打开课时详情页 openViewCourseInfoList(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/course/info_list?id=${id}` }) }, diff --git a/pages/coach/home/index.vue b/pages/coach/home/index.vue index 799bc30..df7226e 100644 --- a/pages/coach/home/index.vue +++ b/pages/coach/home/index.vue @@ -199,14 +199,14 @@ export default { //打开-发布作业页 openObjAddView(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/job/add' }) }, //打开作业列表页 openObjListView(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/job/list' }) }, @@ -214,7 +214,7 @@ export default { //跳转页面-课程详情 openViewCourseInfoList(item){ let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/course/info_list?id=${id}` }) }, @@ -222,7 +222,7 @@ export default { //跳转页面-作业详情 openViewWorkDetails(item){ let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/work_details?id=${id}` }) }, diff --git a/pages/coach/job/add.vue b/pages/coach/job/add.vue index bff5e65..af4e45f 100644 --- a/pages/coach/job/add.vue +++ b/pages/coach/job/add.vue @@ -351,7 +351,8 @@ export default { }) //延迟1s setTimeout(() => { - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: '/pages/coach/home/index' }) }, 1000) diff --git a/pages/coach/job/list.vue b/pages/coach/job/list.vue index 8f31169..dc3c9b4 100644 --- a/pages/coach/job/list.vue +++ b/pages/coach/job/list.vue @@ -130,7 +130,7 @@ export default { //跳转页面-作业详情 openViewWorkDetails(item){ let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/work_details?id=${id}` }) }, diff --git a/pages/coach/my/arrival_statistics.vue b/pages/coach/my/arrival_statistics.vue index 9c903f1..f39f1b7 100644 --- a/pages/coach/my/arrival_statistics.vue +++ b/pages/coach/my/arrival_statistics.vue @@ -156,7 +156,7 @@ export default { //打开课程详情 openViewCourseInfo(item){ let id= item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/course/info_list?id=${id}` }) }, diff --git a/pages/coach/my/due_soon.vue b/pages/coach/my/due_soon.vue index b456977..4b4a5af 100644 --- a/pages/coach/my/due_soon.vue +++ b/pages/coach/my/due_soon.vue @@ -189,13 +189,13 @@ export default { //打开课程详情 openViewCourseInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, //打开学员详情页 openViewStudentInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/student/info' }) }, diff --git a/pages/coach/my/exam_results.vue b/pages/coach/my/exam_results.vue index 1e1083c..12b757f 100644 --- a/pages/coach/my/exam_results.vue +++ b/pages/coach/my/exam_results.vue @@ -34,7 +34,7 @@ }, methods: { back() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/teaching_management' }) } diff --git a/pages/coach/my/gotake_exam.vue b/pages/coach/my/gotake_exam.vue index e675ceb..c8f9bff 100644 --- a/pages/coach/my/gotake_exam.vue +++ b/pages/coach/my/gotake_exam.vue @@ -105,7 +105,7 @@ }) const res = await apiRoute.submitTestPaper({optionList: this.optionList,testPaperId: this.testPaperId, id: this.zid}); if(res.code === 1) { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/exam_results?error=' + res.data.error + '&success=' + res.data.success + '&num=' + res.data.num }) } else { diff --git a/pages/coach/my/index.vue b/pages/coach/my/index.vue index 26ed68b..ff88060 100644 --- a/pages/coach/my/index.vue +++ b/pages/coach/my/index.vue @@ -152,56 +152,56 @@ export default { //打开到课率统计 openViewArrivalStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/arrival_statistics' }) }, //打开即将到期 openViewDueSoon(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/due_soon' }) }, //打开授课统计 openViewSchoolingStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/schooling_statistics' }) }, //打开教研管理 teachingResearchManagement(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/teaching_management' }) }, //打开意见反馈 openViewFeedback(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/feedback' }) }, //打开个人资料 openViewMyInfo(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/info' }) }, //打开设置 openViewSetUp(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/set_up' }) }, //跳转页面-我的考勤 openViewMyAttendance(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/my_attendance' }) }, diff --git a/pages/coach/my/schooling_statistics.vue b/pages/coach/my/schooling_statistics.vue index adc0cef..9072f4c 100644 --- a/pages/coach/my/schooling_statistics.vue +++ b/pages/coach/my/schooling_statistics.vue @@ -141,7 +141,7 @@ export default { //打开课时详情页 openViewCourseInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, diff --git a/pages/coach/my/set_up.vue b/pages/coach/my/set_up.vue index 0785c35..40ee02d 100644 --- a/pages/coach/my/set_up.vue +++ b/pages/coach/my/set_up.vue @@ -27,12 +27,12 @@ }, privacy_agreement(type){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/privacy_agreement?type='+type }) }, update_pass(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/update_pass' }) } diff --git a/pages/coach/my/teaching_management.vue b/pages/coach/my/teaching_management.vue index 7b1d912..16826cb 100644 --- a/pages/coach/my/teaching_management.vue +++ b/pages/coach/my/teaching_management.vue @@ -104,7 +104,7 @@ return this.tableTypeName[text] }, info(id) { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/teaching_management_info?id=' + id }) }, @@ -127,7 +127,7 @@ }) }, goTake(id,zid) { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/my/gotake_exam?id=' + id + '&zid=' + zid }) } diff --git a/pages/coach/my/update_pass.vue b/pages/coach/my/update_pass.vue index 3544848..99b14fa 100644 --- a/pages/coach/my/update_pass.vue +++ b/pages/coach/my/update_pass.vue @@ -64,7 +64,7 @@ this.tset_style = 2 }, forgot() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/login/forgot' }) }, diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue index d8e314b..9540b1d 100644 --- a/pages/coach/student/info.vue +++ b/pages/coach/student/info.vue @@ -292,13 +292,13 @@ export default { //打开课程详情 openViewCourseInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, //打开学员详情页 openViewStudentInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/student/info' }) }, @@ -306,14 +306,14 @@ export default { //打开体测报告 openViewPhysicalExamination(item){ let survey_id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/physical_examination?survey_id=${survey_id}` }) }, //打开作业任务 opebViewWorkDetails(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/student/work_details' }) }, diff --git a/pages/common/my_message.vue b/pages/common/my_message.vue index 5ab28e7..58c0f01 100644 --- a/pages/common/my_message.vue +++ b/pages/common/my_message.vue @@ -248,7 +248,7 @@ export default { //跳转页面-系统消息列表 openViewSysMsgList(e){ let hair_staff_id = e.hair_staff_id//发信人id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/sys_msg_list?hair_staff_id=${hair_staff_id}` }) }, @@ -271,7 +271,7 @@ export default { to_id = e.personnel_id } - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}` }) } diff --git a/pages/common/sys_msg_list.vue b/pages/common/sys_msg_list.vue index 8e24630..6905270 100644 --- a/pages/common/sys_msg_list.vue +++ b/pages/common/sys_msg_list.vue @@ -134,7 +134,7 @@ export default { openViewArticleInfo(item) { let id = item.id let redirect = item.redirect//重定向地址 - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/article_info?id=${id}` }) }, diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue index b92c090..d102967 100644 --- a/pages/market/clue/add_clues.vue +++ b/pages/market/clue/add_clues.vue @@ -952,7 +952,7 @@ export default { return; } - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}` }) }, @@ -961,7 +961,7 @@ export default { openViewMyMessage(item) { let from_id = this.userInfo.id//发送者的id let to_id = item.customerResource.id//接收者ID - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}` }) }, @@ -1337,7 +1337,8 @@ export default { //延迟1s执行 setTimeout(() => { //跳转页面-线索列表 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/market/clue/index` }) }, 1000) diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index 1bcae69..78a09b7 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -354,14 +354,14 @@ //跳转页面-添加跟进记录 openViewWritingFollowUp() { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/writing_followUp` }) }, //跳转页面-编辑客户详情 openViewEditClues(){ let resource_sharing_id = this.resource_sharing_id//共享资源表id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/edit_clues?resource_sharing_id=${resource_sharing_id}` }) }, @@ -369,14 +369,14 @@ //跳转页面-客户信息修改记录 openViewEditCluesLog() { let resource_id = this.clientInfo.resource_id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/edit_clues_log?resource_id=${resource_id}` }) }, //跳转页面-转接跟进任务 openViewNewTask() { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/new_task` }) }, diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue index fe6aee4..f1030a9 100644 --- a/pages/market/clue/edit_clues.vue +++ b/pages/market/clue/edit_clues.vue @@ -1032,7 +1032,7 @@ export default { //跳转页面-客户详情 openViewClueInfo(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/clue_info?id=${id}` }) }, @@ -1040,7 +1040,7 @@ export default { //跳转页面-我的消息 openViewMyMessage(item) { let hair_staff_id = item.hair_staff_id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}` }) }, @@ -1407,7 +1407,8 @@ export default { //延迟1s执行 setTimeout(() => { //跳转页面-客户详情列表 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}` }) }, 1000) diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 3ad30de..2163f43 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -453,7 +453,7 @@ export default { openViewMyMessage(item) { let from_id = this.userInfo.id//发送者的id let to_id = item.customerResource.id//接收者ID - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}` }) }, @@ -503,7 +503,7 @@ export default { //客户详情 clue_info(item) { let resource_sharing_id = item.id///共享资源表id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}` }) }, diff --git a/pages/market/clue/new_task.vue b/pages/market/clue/new_task.vue index 4ea2c82..86181d3 100644 --- a/pages/market/clue/new_task.vue +++ b/pages/market/clue/new_task.vue @@ -287,7 +287,8 @@ import memberApi from '@/api/member.js'; //延迟1s执行 setTimeout(() => { //跳转页面-线索列表 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/market/clue/index` }) }, 1000) diff --git a/pages/market/clue/writing_followUp.vue b/pages/market/clue/writing_followUp.vue index f839e43..b95c4b8 100644 --- a/pages/market/clue/writing_followUp.vue +++ b/pages/market/clue/writing_followUp.vue @@ -763,7 +763,8 @@ export default { //延迟1s执行 setTimeout(() => { //跳转页面-线索列表 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/market/clue/index` }) }, 1000) diff --git a/pages/market/data/index.vue b/pages/market/data/index.vue index 51fc111..0d79bbd 100644 --- a/pages/market/data/index.vue +++ b/pages/market/data/index.vue @@ -538,42 +538,42 @@ export default { //打开到课率统计 openViewArrivalStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/arrival_statistics' }) }, //打开即将到期 openViewDueSoon(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/due_soon' }) }, //打开授课统计 openViewSchoolingStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/schooling_statistics' }) }, //打开意见反馈 openViewFeedback(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/feedback' }) }, //打开个人资料 openViewMyInfo(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/info' }) }, //打开企业信息 openViewFirmInfo(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/firm_info' }) }, @@ -581,7 +581,7 @@ export default { //打开设置 openViewSetUp(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/set_up' }) } diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue index 7e0484a..9344a65 100644 --- a/pages/market/my/index.vue +++ b/pages/market/my/index.vue @@ -185,35 +185,35 @@ export default { //打开到课率统计 openViewArrivalStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/arrival_statistics' }) }, //打开即将到期 openViewDueSoon(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/due_soon' }) }, //打开授课统计 openViewSchoolingStatistics(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/schooling_statistics' }) }, //打开意见反馈 openViewFeedback(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/feedback' }) }, //打开个人资料 openViewMyInfo(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/info' }) }, @@ -221,14 +221,14 @@ export default { //跳转页面-已签客户 openViewSignedClientList(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/signed_client_list' }) }, //跳转页面-我的考勤 openViewMyAttendance(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/my_attendance' }) }, @@ -236,7 +236,7 @@ export default { //打开企业信息 openViewFirmInfo(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/firm_info' }) }, @@ -244,14 +244,14 @@ export default { //打开设置 openViewSetUp(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/set_up' }) }, //跳转页面-我的消息 openViewMyMessage(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/my_message' }) }, diff --git a/pages/market/my/set_up.vue b/pages/market/my/set_up.vue index 9a63516..26668eb 100644 --- a/pages/market/my/set_up.vue +++ b/pages/market/my/set_up.vue @@ -27,12 +27,12 @@ }, privacy_agreement(type){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/privacy_agreement?type='+type }) }, update_pass(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/market/my/update_pass' }) } diff --git a/pages/market/my/signed_client_list.vue b/pages/market/my/signed_client_list.vue index 4ec8166..c342372 100644 --- a/pages/market/my/signed_client_list.vue +++ b/pages/market/my/signed_client_list.vue @@ -147,7 +147,7 @@ export default { //打开学员详情页 openViewStudentInfo(item){ let students_id= item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/coach/student/info?students_id=${students_id}` }) }, diff --git a/pages/market/my/update_pass.vue b/pages/market/my/update_pass.vue index 486fe37..77cc555 100644 --- a/pages/market/my/update_pass.vue +++ b/pages/market/my/update_pass.vue @@ -123,7 +123,7 @@ import apiRoute from '@/api/apiRoute.js'; }, //忘记密码 forgot() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/login/forgot' }) }, @@ -178,7 +178,8 @@ import apiRoute from '@/api/apiRoute.js'; //延迟1s执行 setTimeout(() => { //跳转页面-个人中心 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/market/my/index` }) }, 1000) diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue index 09eaf39..d1ae90e 100644 --- a/pages/student/index/index.vue +++ b/pages/student/index/index.vue @@ -297,20 +297,20 @@ //跳转页面-作业详情 details() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/index/work_details' }) }, //跳转体测列表 physical_examination(){ let resource_id = this.member_info.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/index/physical_examination?resource_id=${resource_id}` }) }, //跳转作业列表页 jobList(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/index/job_list' }) }, @@ -469,7 +469,7 @@ //跳转页面-打开作业详情 openViewWorkDetails(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/index/work_details?id=${id}` }) }, @@ -477,7 +477,7 @@ //跳转页面-打开课时详情 openViewTimetableInfo(item) { let person_course_schedule_id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}` }) }, diff --git a/pages/student/index/job_list.vue b/pages/student/index/job_list.vue index c334388..9c4ff5b 100644 --- a/pages/student/index/job_list.vue +++ b/pages/student/index/job_list.vue @@ -159,7 +159,7 @@ import memberApi from '@/api/member.js'; //跳转页面-打开作业详情 openViewWorkDetails(item) { let id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/index/work_details?id=${id}` }) }, diff --git a/pages/student/login/forgot.vue b/pages/student/login/forgot.vue index 3d3a13c..019fcc4 100644 --- a/pages/student/login/forgot.vue +++ b/pages/student/login/forgot.vue @@ -206,7 +206,8 @@ import apiRoute from '@/api/apiRoute.js'; //延迟1s执行 setTimeout(() => { //跳转页面-登陆页 - uni.navigateTo({ + //关闭当前页跳转新页面 + uni.redirectTo({ url: `/pages/student/login/login` }) }, 1000) diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue index 84c408c..d7bfb92 100644 --- a/pages/student/login/login.vue +++ b/pages/student/login/login.vue @@ -124,7 +124,7 @@ export default { this.password = !this.password }, forgot() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/login/forgot' }) }, @@ -224,7 +224,7 @@ export default { }) return; } - uni.navigateTo({ + this.$navigateTo({ url: url_path }) }, diff --git a/pages/student/my/my.vue b/pages/student/my/my.vue index ce10eae..1106834 100644 --- a/pages/student/my/my.vue +++ b/pages/student/my/my.vue @@ -118,52 +118,52 @@ }, //打开设置 setup(item) { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/my/set_up' }) }, //意见反馈 feedback() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/feedback' }) }, //课时消耗 lesson_consumption() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/my/lesson_consumption' }) }, //我的成员 my_members() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/my/my_members' }) }, //人人资料 personal_data() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/my/personal_data' }) }, //跳转页面-合同列表 openViewContractList(item) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/contract_list` }) }, //跳转页面-我的消息 openViewMyMessage(item) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/common/my_message` }) }, //跳转页面-我的教练 openViewMyCoach(){ - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/my/my_coach` }) }, diff --git a/pages/student/my/set_up.vue b/pages/student/my/set_up.vue index f247c33..1102d86 100644 --- a/pages/student/my/set_up.vue +++ b/pages/student/my/set_up.vue @@ -26,12 +26,12 @@ }, privacy_agreement(type){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/common/privacy_agreement?type='+type }) }, update_pass(){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/my/update_pass' }) } diff --git a/pages/student/my/update_pass.vue b/pages/student/my/update_pass.vue index 2234fd7..244132b 100644 --- a/pages/student/my/update_pass.vue +++ b/pages/student/my/update_pass.vue @@ -82,7 +82,7 @@ }); }, forgot() { - uni.navigateTo({ + this.$navigateTo({ url: '/pages/student/login/forgot' }) }, diff --git a/pages/student/timetable/index.vue b/pages/student/timetable/index.vue index 079a32b..5cc8b6b 100644 --- a/pages/student/timetable/index.vue +++ b/pages/student/timetable/index.vue @@ -410,7 +410,7 @@ export default { //打开课表详情页 openViewCourseInfo(item) { let person_course_schedule_id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}` }) }, @@ -418,7 +418,7 @@ export default { more() { let course_date = this.filteredData.course_date let venue_id = this.venuesInfo.id || ''//当前场馆id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/timetable/list?course_date=${course_date}&venue_id=${venue_id}` }) } diff --git a/pages/student/timetable/info.vue b/pages/student/timetable/info.vue index d35776c..15e3cf4 100644 --- a/pages/student/timetable/info.vue +++ b/pages/student/timetable/info.vue @@ -153,7 +153,7 @@ export default { //打开课时详情页 openViewCourseInfo(item){ - uni.navigateTo({ + this.$navigateTo({ url: '/pages/coach/course/info' }) }, diff --git a/pages/student/timetable/list.vue b/pages/student/timetable/list.vue index ca66489..5fed8d8 100644 --- a/pages/student/timetable/list.vue +++ b/pages/student/timetable/list.vue @@ -202,7 +202,7 @@ //跳转页面-课程列表 opebViewTimetable(item) { let venue_id = item.id - uni.navigateTo({ + this.$navigateTo({ url: `/pages/student/timetable/index?venue_id=${venue_id}` }) }, From feab0343997cfc6a8136132b79c5dd41bd39c693 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 11 Jun 2025 20:08:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(student):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AB=AF=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 xy_assignmentsInfo 方法获取作业详情 - 更新 work_details.vue 页面，展示作业内容和学生信息 - 优化页面样式，增加状态显示和描述信息 --- api/apiRoute.js | 9 +++++ pages/student/index/work_details.vue | 55 +++++++++++++++++----------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/api/apiRoute.js b/api/apiRoute.js index 749a5a7..d961702 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -562,6 +562,15 @@ export default { return res; }) }, + //学生端-获取作业详情 + xy_assignmentsInfo(data = {}) { + let url = '/xy/assignment/info' + return http.get(url, data).then(res => { + return res; + }) + }, + + //学生端-提交作业 xy_assignmentSubmitObj(data = {}) { diff --git a/pages/student/index/work_details.vue b/pages/student/index/work_details.vue index 59ee430..7309731 100644 --- a/pages/student/index/work_details.vue +++ b/pages/student/index/work_details.vue @@ -1,24 +1,27 @@