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/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue
index 87de67a..2c29176 100644
--- a/components/AQ/AQTabber.vue
+++ b/components/AQ/AQTabber.vue
@@ -157,9 +157,18 @@
 					//跳转tabBar页面
 					uni.setStorageSync('tabBerIndex', e.index)
 					console.log('qqq', e.urlPath)
-					uni.navigateTo({
-						url: e.urlPath
-					})
+
+          //关闭当前页面跳转新页面
+          uni.redirectTo({
+            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/index/work_details.vue b/pages/student/index/work_details.vue
index 59ee430..8d4d32e 100644
--- a/pages/student/index/work_details.vue
+++ b/pages/student/index/work_details.vue
@@ -1,25 +1,27 @@
 <!--作业详情-->
 <template>
-	<view>
+	<view class="main_box">
 <!--    作业展示-->
-		<view class="top-style" v-if="infoData.student_file">
-      <video v-if="infoData.student_file_type == 2" class="pic" style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.student_file)"></video>
-      <image v-else style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.student_file)" mode="aspectFit"></image>
+		<view class="top-style" v-if="infoData.content_text">
+      <video v-if="infoData.content_type == 2" class="pic" style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.content_text)"></video>
+      <image v-else-if="infoData.content_type == 1" style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.content_text)" mode="aspectFit"></image>
 		</view>
 
 <!--    简练信息+作业描述-->
 		<view class="below-style">
 			<view class="head-img">
-        <!--教练头像-->
-				<fui-avatar width="80" :src="$util.img(infoData.coach_pic)"></fui-avatar>
-				<view class="head-text">{{infoData .coach_name}}</view>
+        <!--学生头像-->
+				<fui-avatar width="80" :src="infoData.student.customerResources.member.headimg ? infoData.student.customerResources.member.headimg : $util.img('/uniapp_src/static/images/common/yong_hu.png')"></fui-avatar>
+				<view class="head-text">{{infoData .student.name}}</view>
 			</view>
-			<view class="multi-line-ellipsis" v-html="infoData.content_text"></view>
+      <view class="multi-line-ellipsis">
+        状态：{{ infoData.status == 1 ? '待批改' : infoData.status == 2 ? '未提交' : infoData.status == 3 ? '已提交' :''}}      </view>
+			<view class="multi-line-ellipsis" v-html="infoData.description"></view>
 		</view>
 	</view>
 </template>
 <script>
-import memberApi from '@/api/member.js';
+import apiRoute from '@/api/apiRoute.js';
 
 
 export default {
@@ -34,7 +36,7 @@ export default {
     }
   },
   onLoad(options) {
-    this.filteredData.id = options.id
+    this.filteredData.id = options.id//作业id
   },
   onShow(){
     this.init()//初始化数据
@@ -48,7 +50,7 @@ export default {
     //获取作业详情
     async getAssignmentsInfo() {
       let params = {...this.filteredData}
-      let res = await memberApi.assignmentsInfo(params)
+      let res = await apiRoute.xy_assignmentsInfo(params)
       if (res.code != 1) {
         uni.showToast({
           title: res.msg,
@@ -64,11 +66,16 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.main_box{
+  width: 100%;
+  height: 100%;
+  background: #292929;
+  padding-top: 45rpx;
+}
 	.top-style{
 		width: 92%;
 		height: 700rpx;
 		margin: auto;
-    margin-top: 45rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -80,19 +87,22 @@ export default {
 	.below-style{
 		width: 92%;
 		margin: auto;
+    .head-img {
+      display: flex;
+      align-items: center;
+      padding: 10rpx 20rpx;
+    }
+    .head-text {
+      color: #fff;
+      font-size: 35rpx;
+      padding-left: 20rpx;
+    }
 	}
-	.head-img {
-		display: flex;
-		align-items: center;
-		padding: 10rpx 20rpx;
-	}
-	.head-text {
-		color: #333333;
-		font-size: 35rpx;
-		padding-left: 20rpx;
-	}
+
+
 	.multi-line-ellipsis {
-		color: #333333;
+    margin-top: 20rpx;
+		color: #fff;
 		font-size: 29rpx;
 		padding: 5rpx 10rpx;
 		// display: -webkit-box;
diff --git a/pages/student/login/forgot.vue b/pages/student/login/forgot.vue
index f26877b..019fcc4 100644
--- a/pages/student/login/forgot.vue
+++ b/pages/student/login/forgot.vue
@@ -18,7 +18,7 @@
           </fui-input>
         </view>
         <view style="width: 95%;margin: auto; margin-top: 30rpx;" @click="openPicker()">
-          <fui-form-item label="" arrow highlight background="#f2f2f2">
+          <fui-form-item  arrow highlight background="#f2f2f2">
             <input class="fui-page__input" v-model="formData.user_type_name" placeholder="请选择用户类型" placeholder-style="color:#ccc;" disabled/>
           </fui-form-item>
         </view>
@@ -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}`
         })
       },