Browse Source

Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/ZhiHuiJiaoWu_UniApp

master
王泽彦 10 months ago
parent
commit
c3e7e630af
  1. 9
      api/apiRoute.js
  2. 15
      components/AQ/AQTabber.vue
  3. 54
      main.js
  4. 4
      pages/coach/class/info.vue
  5. 2
      pages/coach/class/list.vue
  6. 2
      pages/coach/course/info.vue
  7. 4
      pages/coach/course/info_list.vue
  8. 2
      pages/coach/course/list.vue
  9. 8
      pages/coach/home/index.vue
  10. 3
      pages/coach/job/add.vue
  11. 2
      pages/coach/job/list.vue
  12. 2
      pages/coach/my/arrival_statistics.vue
  13. 4
      pages/coach/my/due_soon.vue
  14. 2
      pages/coach/my/exam_results.vue
  15. 2
      pages/coach/my/gotake_exam.vue
  16. 16
      pages/coach/my/index.vue
  17. 2
      pages/coach/my/schooling_statistics.vue
  18. 4
      pages/coach/my/set_up.vue
  19. 4
      pages/coach/my/teaching_management.vue
  20. 2
      pages/coach/my/update_pass.vue
  21. 8
      pages/coach/student/info.vue
  22. 4
      pages/common/my_message.vue
  23. 2
      pages/common/sys_msg_list.vue
  24. 7
      pages/market/clue/add_clues.vue
  25. 8
      pages/market/clue/clue_info.vue
  26. 7
      pages/market/clue/edit_clues.vue
  27. 4
      pages/market/clue/index.vue
  28. 3
      pages/market/clue/new_task.vue
  29. 3
      pages/market/clue/writing_followUp.vue
  30. 14
      pages/market/data/index.vue
  31. 20
      pages/market/my/index.vue
  32. 4
      pages/market/my/set_up.vue
  33. 2
      pages/market/my/signed_client_list.vue
  34. 5
      pages/market/my/update_pass.vue
  35. 10
      pages/student/index/index.vue
  36. 2
      pages/student/index/job_list.vue
  37. 56
      pages/student/index/work_details.vue
  38. 5
      pages/student/login/forgot.vue
  39. 4
      pages/student/login/login.vue
  40. 16
      pages/student/my/my.vue
  41. 4
      pages/student/my/set_up.vue
  42. 2
      pages/student/my/update_pass.vue
  43. 4
      pages/student/timetable/index.vue
  44. 2
      pages/student/timetable/info.vue
  45. 2
      pages/student/timetable/list.vue

9
api/apiRoute.js

@ -562,6 +562,15 @@ export default {
return res; return res;
}) })
}, },
//学生端-获取作业详情
xy_assignmentsInfo(data = {}) {
let url = '/xy/assignment/info'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-提交作业 //学生端-提交作业
xy_assignmentSubmitObj(data = {}) { xy_assignmentSubmitObj(data = {}) {

15
components/AQ/AQTabber.vue

@ -157,9 +157,18 @@
//tabBar //tabBar
uni.setStorageSync('tabBerIndex', e.index) uni.setStorageSync('tabBerIndex', e.index)
console.log('qqq', e.urlPath) console.log('qqq', e.urlPath)
uni.navigateTo({
url: e.urlPath //
}) uni.redirectTo({
url: e.urlPath
})
//
// uni.reLaunch({
// url: e.urlPath
// })
console.log('qqq2,执行完了')
}else{ }else{
this.show = true this.show = true
} }

54
main.js

@ -21,6 +21,60 @@ Vue.prototype.$getimg = Api_url
Vue.mixin(minxin) 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({ const app = new Vue({
store, store,
...App ...App

4
pages/coach/class/info.vue

@ -322,14 +322,14 @@
// //
openViewCourseInfo(item) { openViewCourseInfo(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/course/info_list?id=${id}` url: `/pages/coach/course/info_list?id=${id}`
}) })
}, },
// //
openViewStudentInfo(item) { openViewStudentInfo(item) {
let students_id = item.student.id let students_id = item.student.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/info?students_id=${students_id}` url: `/pages/coach/student/info?students_id=${students_id}`
}) })
}, },

2
pages/coach/class/list.vue

@ -156,7 +156,7 @@ export default {
// //
openViewClassInfo(item){ openViewClassInfo(item){
let class_id = item.id let class_id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/class/info?class_id=${class_id}` url: `/pages/coach/class/info?class_id=${class_id}`
}) })
}, },

2
pages/coach/course/info.vue

@ -137,7 +137,7 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },

4
pages/coach/course/info_list.vue

@ -227,7 +227,7 @@
// //
openViewCourseInfo(item) { openViewCourseInfo(item) {
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },
@ -238,7 +238,7 @@
//- //-
openViewWorkDetails(item) { openViewWorkDetails(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/work_details?id=${id}` url: `/pages/coach/student/work_details?id=${id}`
}) })
}, },

2
pages/coach/course/list.vue

@ -233,7 +233,7 @@
// //
openViewCourseInfoList(item) { openViewCourseInfoList(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/course/info_list?id=${id}` url: `/pages/coach/course/info_list?id=${id}`
}) })
}, },

8
pages/coach/home/index.vue

@ -199,14 +199,14 @@ export default {
//- //-
openObjAddView(){ openObjAddView(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/job/add' url: '/pages/coach/job/add'
}) })
}, },
// //
openObjListView(){ openObjListView(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/job/list' url: '/pages/coach/job/list'
}) })
}, },
@ -214,7 +214,7 @@ export default {
//- //-
openViewCourseInfoList(item){ openViewCourseInfoList(item){
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/course/info_list?id=${id}` url: `/pages/coach/course/info_list?id=${id}`
}) })
}, },
@ -222,7 +222,7 @@ export default {
//- //-
openViewWorkDetails(item){ openViewWorkDetails(item){
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/work_details?id=${id}` url: `/pages/coach/student/work_details?id=${id}`
}) })
}, },

3
pages/coach/job/add.vue

@ -351,7 +351,8 @@ export default {
}) })
//1s //1s
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ //
uni.redirectTo({
url: '/pages/coach/home/index' url: '/pages/coach/home/index'
}) })
}, 1000) }, 1000)

2
pages/coach/job/list.vue

@ -130,7 +130,7 @@ export default {
//- //-
openViewWorkDetails(item){ openViewWorkDetails(item){
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/work_details?id=${id}` url: `/pages/coach/student/work_details?id=${id}`
}) })
}, },

2
pages/coach/my/arrival_statistics.vue

@ -156,7 +156,7 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
let id= item.id let id= item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/course/info_list?id=${id}` url: `/pages/coach/course/info_list?id=${id}`
}) })
}, },

4
pages/coach/my/due_soon.vue

@ -189,13 +189,13 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },
// //
openViewStudentInfo(item){ openViewStudentInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/student/info' url: '/pages/coach/student/info'
}) })
}, },

2
pages/coach/my/exam_results.vue

@ -34,7 +34,7 @@
}, },
methods: { methods: {
back() { back() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/teaching_management' url: '/pages/coach/my/teaching_management'
}) })
} }

2
pages/coach/my/gotake_exam.vue

@ -105,7 +105,7 @@
}) })
const res = await apiRoute.submitTestPaper({optionList: this.optionList,testPaperId: this.testPaperId, id: this.zid}); const res = await apiRoute.submitTestPaper({optionList: this.optionList,testPaperId: this.testPaperId, id: this.zid});
if(res.code === 1) { 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 url: '/pages/coach/my/exam_results?error=' + res.data.error + '&success=' + res.data.success + '&num=' + res.data.num
}) })
} else { } else {

16
pages/coach/my/index.vue

@ -152,56 +152,56 @@ export default {
// //
openViewArrivalStatistics(){ openViewArrivalStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/arrival_statistics' url: '/pages/coach/my/arrival_statistics'
}) })
}, },
// //
openViewDueSoon(){ openViewDueSoon(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/due_soon' url: '/pages/coach/my/due_soon'
}) })
}, },
// //
openViewSchoolingStatistics(){ openViewSchoolingStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/schooling_statistics' url: '/pages/coach/my/schooling_statistics'
}) })
}, },
// //
teachingResearchManagement(){ teachingResearchManagement(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/teaching_management' url: '/pages/coach/my/teaching_management'
}) })
}, },
// //
openViewFeedback(){ openViewFeedback(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/feedback' url: '/pages/common/feedback'
}) })
}, },
// //
openViewMyInfo(){ openViewMyInfo(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/info' url: '/pages/coach/my/info'
}) })
}, },
// //
openViewSetUp(){ openViewSetUp(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/set_up' url: '/pages/coach/my/set_up'
}) })
}, },
//- //-
openViewMyAttendance(){ openViewMyAttendance(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/my_attendance' url: '/pages/common/my_attendance'
}) })
}, },

2
pages/coach/my/schooling_statistics.vue

@ -141,7 +141,7 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },

4
pages/coach/my/set_up.vue

@ -27,12 +27,12 @@
}, },
privacy_agreement(type){ privacy_agreement(type){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/privacy_agreement?type='+type url: '/pages/common/privacy_agreement?type='+type
}) })
}, },
update_pass(){ update_pass(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/update_pass' url: '/pages/coach/my/update_pass'
}) })
} }

4
pages/coach/my/teaching_management.vue

@ -104,7 +104,7 @@
return this.tableTypeName[text] return this.tableTypeName[text]
}, },
info(id) { info(id) {
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/teaching_management_info?id=' + id url: '/pages/coach/my/teaching_management_info?id=' + id
}) })
}, },
@ -127,7 +127,7 @@
}) })
}, },
goTake(id,zid) { goTake(id,zid) {
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/my/gotake_exam?id=' + id + '&zid=' + zid url: '/pages/coach/my/gotake_exam?id=' + id + '&zid=' + zid
}) })
} }

2
pages/coach/my/update_pass.vue

@ -64,7 +64,7 @@
this.tset_style = 2 this.tset_style = 2
}, },
forgot() { forgot() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/login/forgot' url: '/pages/student/login/forgot'
}) })
}, },

8
pages/coach/student/info.vue

@ -292,13 +292,13 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },
// //
openViewStudentInfo(item){ openViewStudentInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/student/info' url: '/pages/coach/student/info'
}) })
}, },
@ -306,14 +306,14 @@ export default {
// //
openViewPhysicalExamination(item){ openViewPhysicalExamination(item){
let survey_id = item.id let survey_id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/physical_examination?survey_id=${survey_id}` url: `/pages/coach/student/physical_examination?survey_id=${survey_id}`
}) })
}, },
// //
opebViewWorkDetails(item){ opebViewWorkDetails(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/student/work_details' url: '/pages/coach/student/work_details'
}) })
}, },

4
pages/common/my_message.vue

@ -248,7 +248,7 @@ export default {
//- //-
openViewSysMsgList(e){ openViewSysMsgList(e){
let hair_staff_id = e.hair_staff_id//id 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}` url: `/pages/common/sys_msg_list?hair_staff_id=${hair_staff_id}`
}) })
}, },
@ -271,7 +271,7 @@ export default {
to_id = e.personnel_id to_id = e.personnel_id
} }
uni.navigateTo({ this.$navigateTo({
url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}` url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
}) })
} }

2
pages/common/sys_msg_list.vue

@ -134,7 +134,7 @@ export default {
openViewArticleInfo(item) { openViewArticleInfo(item) {
let id = item.id let id = item.id
let redirect = item.redirect// let redirect = item.redirect//
uni.navigateTo({ this.$navigateTo({
url: `/pages/common/article_info?id=${id}` url: `/pages/common/article_info?id=${id}`
}) })
}, },

7
pages/market/clue/add_clues.vue

@ -952,7 +952,7 @@ export default {
return; return;
} }
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}` url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
}) })
}, },
@ -961,7 +961,7 @@ export default {
openViewMyMessage(item) { openViewMyMessage(item) {
let from_id = this.userInfo.id//id let from_id = this.userInfo.id//id
let to_id = item.customerResource.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}` url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
}) })
}, },
@ -1337,7 +1337,8 @@ export default {
//1s //1s
setTimeout(() => { setTimeout(() => {
//-线 //-线
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/market/clue/index` url: `/pages/market/clue/index`
}) })
}, 1000) }, 1000)

8
pages/market/clue/clue_info.vue

@ -354,14 +354,14 @@
//- //-
openViewWritingFollowUp() { openViewWritingFollowUp() {
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/writing_followUp` url: `/pages/market/clue/writing_followUp`
}) })
}, },
//- //-
openViewEditClues(){ openViewEditClues(){
let resource_sharing_id = this.resource_sharing_id//id 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}` url: `/pages/market/clue/edit_clues?resource_sharing_id=${resource_sharing_id}`
}) })
}, },
@ -369,14 +369,14 @@
//- //-
openViewEditCluesLog() { openViewEditCluesLog() {
let resource_id = this.clientInfo.resource_id let resource_id = this.clientInfo.resource_id
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/edit_clues_log?resource_id=${resource_id}` url: `/pages/market/clue/edit_clues_log?resource_id=${resource_id}`
}) })
}, },
//- //-
openViewNewTask() { openViewNewTask() {
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/new_task` url: `/pages/market/clue/new_task`
}) })
}, },

7
pages/market/clue/edit_clues.vue

@ -1032,7 +1032,7 @@ export default {
//- //-
openViewClueInfo(item) { openViewClueInfo(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/clue_info?id=${id}` url: `/pages/market/clue/clue_info?id=${id}`
}) })
}, },
@ -1040,7 +1040,7 @@ export default {
//- //-
openViewMyMessage(item) { openViewMyMessage(item) {
let hair_staff_id = item.hair_staff_id let hair_staff_id = item.hair_staff_id
uni.navigateTo({ this.$navigateTo({
url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}` url: `/pages/common/im_chat_info?hair_staff_id=${hair_staff_id}`
}) })
}, },
@ -1407,7 +1407,8 @@ export default {
//1s //1s
setTimeout(() => { setTimeout(() => {
//- //-
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}` url: `/pages/market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}`
}) })
}, 1000) }, 1000)

4
pages/market/clue/index.vue

@ -453,7 +453,7 @@ export default {
openViewMyMessage(item) { openViewMyMessage(item) {
let from_id = this.userInfo.id//id let from_id = this.userInfo.id//id
let to_id = item.customerResource.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}` url: `/pages/common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
}) })
}, },
@ -503,7 +503,7 @@ export default {
// //
clue_info(item) { clue_info(item) {
let resource_sharing_id = item.id///id let resource_sharing_id = item.id///id
uni.navigateTo({ this.$navigateTo({
url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}` url: `/pages/market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
}) })
}, },

3
pages/market/clue/new_task.vue

@ -287,7 +287,8 @@ import memberApi from '@/api/member.js';
//1s //1s
setTimeout(() => { setTimeout(() => {
//-线 //-线
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/market/clue/index` url: `/pages/market/clue/index`
}) })
}, 1000) }, 1000)

3
pages/market/clue/writing_followUp.vue

@ -763,7 +763,8 @@ export default {
//1s //1s
setTimeout(() => { setTimeout(() => {
//-线 //-线
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/market/clue/index` url: `/pages/market/clue/index`
}) })
}, 1000) }, 1000)

14
pages/market/data/index.vue

@ -538,42 +538,42 @@ export default {
// //
openViewArrivalStatistics(){ openViewArrivalStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/arrival_statistics' url: '/pages/market/my/arrival_statistics'
}) })
}, },
// //
openViewDueSoon(){ openViewDueSoon(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/due_soon' url: '/pages/market/my/due_soon'
}) })
}, },
// //
openViewSchoolingStatistics(){ openViewSchoolingStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/schooling_statistics' url: '/pages/market/my/schooling_statistics'
}) })
}, },
// //
openViewFeedback(){ openViewFeedback(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/feedback' url: '/pages/common/feedback'
}) })
}, },
// //
openViewMyInfo(){ openViewMyInfo(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/info' url: '/pages/market/my/info'
}) })
}, },
// //
openViewFirmInfo(){ openViewFirmInfo(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/firm_info' url: '/pages/market/my/firm_info'
}) })
}, },
@ -581,7 +581,7 @@ export default {
// //
openViewSetUp(){ openViewSetUp(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/set_up' url: '/pages/market/my/set_up'
}) })
} }

20
pages/market/my/index.vue

@ -185,35 +185,35 @@ export default {
// //
openViewArrivalStatistics(){ openViewArrivalStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/arrival_statistics' url: '/pages/market/my/arrival_statistics'
}) })
}, },
// //
openViewDueSoon(){ openViewDueSoon(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/due_soon' url: '/pages/market/my/due_soon'
}) })
}, },
// //
openViewSchoolingStatistics(){ openViewSchoolingStatistics(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/schooling_statistics' url: '/pages/market/my/schooling_statistics'
}) })
}, },
// //
openViewFeedback(){ openViewFeedback(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/feedback' url: '/pages/common/feedback'
}) })
}, },
// //
openViewMyInfo(){ openViewMyInfo(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/info' url: '/pages/market/my/info'
}) })
}, },
@ -221,14 +221,14 @@ export default {
//- //-
openViewSignedClientList(){ openViewSignedClientList(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/signed_client_list' url: '/pages/market/my/signed_client_list'
}) })
}, },
//- //-
openViewMyAttendance(){ openViewMyAttendance(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/my_attendance' url: '/pages/common/my_attendance'
}) })
}, },
@ -236,7 +236,7 @@ export default {
// //
openViewFirmInfo(){ openViewFirmInfo(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/firm_info' url: '/pages/market/my/firm_info'
}) })
}, },
@ -244,14 +244,14 @@ export default {
// //
openViewSetUp(){ openViewSetUp(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/set_up' url: '/pages/market/my/set_up'
}) })
}, },
//- //-
openViewMyMessage(){ openViewMyMessage(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/my_message' url: '/pages/common/my_message'
}) })
}, },

4
pages/market/my/set_up.vue

@ -27,12 +27,12 @@
}, },
privacy_agreement(type){ privacy_agreement(type){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/privacy_agreement?type='+type url: '/pages/common/privacy_agreement?type='+type
}) })
}, },
update_pass(){ update_pass(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/market/my/update_pass' url: '/pages/market/my/update_pass'
}) })
} }

2
pages/market/my/signed_client_list.vue

@ -147,7 +147,7 @@ export default {
// //
openViewStudentInfo(item){ openViewStudentInfo(item){
let students_id= item.id let students_id= item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/coach/student/info?students_id=${students_id}` url: `/pages/coach/student/info?students_id=${students_id}`
}) })
}, },

5
pages/market/my/update_pass.vue

@ -123,7 +123,7 @@ import apiRoute from '@/api/apiRoute.js';
}, },
// //
forgot() { forgot() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/login/forgot' url: '/pages/student/login/forgot'
}) })
}, },
@ -178,7 +178,8 @@ import apiRoute from '@/api/apiRoute.js';
//1s //1s
setTimeout(() => { setTimeout(() => {
//- //-
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/market/my/index` url: `/pages/market/my/index`
}) })
}, 1000) }, 1000)

10
pages/student/index/index.vue

@ -297,20 +297,20 @@
//- //-
details() { details() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/index/work_details' url: '/pages/student/index/work_details'
}) })
}, },
// //
physical_examination(){ physical_examination(){
let resource_id = this.member_info.id let resource_id = this.member_info.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/index/physical_examination?resource_id=${resource_id}` url: `/pages/student/index/physical_examination?resource_id=${resource_id}`
}) })
}, },
// //
jobList(){ jobList(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/index/job_list' url: '/pages/student/index/job_list'
}) })
}, },
@ -469,7 +469,7 @@
//- //-
openViewWorkDetails(item) { openViewWorkDetails(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/index/work_details?id=${id}` url: `/pages/student/index/work_details?id=${id}`
}) })
}, },
@ -477,7 +477,7 @@
//- //-
openViewTimetableInfo(item) { openViewTimetableInfo(item) {
let person_course_schedule_id = item.id let person_course_schedule_id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}` url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}`
}) })
}, },

2
pages/student/index/job_list.vue

@ -159,7 +159,7 @@ import memberApi from '@/api/member.js';
//- //-
openViewWorkDetails(item) { openViewWorkDetails(item) {
let id = item.id let id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/index/work_details?id=${id}` url: `/pages/student/index/work_details?id=${id}`
}) })
}, },

56
pages/student/index/work_details.vue

@ -1,25 +1,27 @@
<!--作业详情--> <!--作业详情-->
<template> <template>
<view> <view class="main_box">
<!-- 作业展示--> <!-- 作业展示-->
<view class="top-style" v-if="infoData.student_file"> <view class="top-style" v-if="infoData.content_text">
<video v-if="infoData.student_file_type == 2" class="pic" style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.student_file)"></video> <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 style="width: 100%;border-radius: 15rpx;" :src="$util.img(infoData.student_file)" mode="aspectFit"></image> <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>
<!-- 简练信息+作业描述--> <!-- 简练信息+作业描述-->
<view class="below-style"> <view class="below-style">
<view class="head-img"> <view class="head-img">
<!--教练头像--> <!--学生头像-->
<fui-avatar width="80" :src="$util.img(infoData.coach_pic)"></fui-avatar> <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 .coach_name}}</view> <view class="head-text">{{infoData .student.name}}</view>
</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>
</view> </view>
</template> </template>
<script> <script>
import memberApi from '@/api/member.js'; import apiRoute from '@/api/apiRoute.js';
export default { export default {
@ -34,7 +36,7 @@ export default {
} }
}, },
onLoad(options) { onLoad(options) {
this.filteredData.id = options.id this.filteredData.id = options.id//id
}, },
onShow(){ onShow(){
this.init()// this.init()//
@ -48,7 +50,7 @@ export default {
// //
async getAssignmentsInfo() { async getAssignmentsInfo() {
let params = {...this.filteredData} let params = {...this.filteredData}
let res = await memberApi.assignmentsInfo(params) let res = await apiRoute.xy_assignmentsInfo(params)
if (res.code != 1) { if (res.code != 1) {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -64,11 +66,16 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.main_box{
width: 100%;
height: 100%;
background: #292929;
padding-top: 45rpx;
}
.top-style{ .top-style{
width: 92%; width: 92%;
height: 700rpx; height: 700rpx;
margin: auto; margin: auto;
margin-top: 45rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -80,19 +87,22 @@ export default {
.below-style{ .below-style{
width: 92%; width: 92%;
margin: auto; 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 { .multi-line-ellipsis {
color: #333333; margin-top: 20rpx;
color: #fff;
font-size: 29rpx; font-size: 29rpx;
padding: 5rpx 10rpx; padding: 5rpx 10rpx;
// display: -webkit-box; // display: -webkit-box;

5
pages/student/login/forgot.vue

@ -18,7 +18,7 @@
</fui-input> </fui-input>
</view> </view>
<view style="width: 95%;margin: auto; margin-top: 30rpx;" @click="openPicker()"> <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/> <input class="fui-page__input" v-model="formData.user_type_name" placeholder="请选择用户类型" placeholder-style="color:#ccc;" disabled/>
</fui-form-item> </fui-form-item>
</view> </view>
@ -206,7 +206,8 @@ import apiRoute from '@/api/apiRoute.js';
//1s //1s
setTimeout(() => { setTimeout(() => {
//- //-
uni.navigateTo({ //
uni.redirectTo({
url: `/pages/student/login/login` url: `/pages/student/login/login`
}) })
}, 1000) }, 1000)

4
pages/student/login/login.vue

@ -124,7 +124,7 @@ export default {
this.password = !this.password this.password = !this.password
}, },
forgot() { forgot() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/login/forgot' url: '/pages/student/login/forgot'
}) })
}, },
@ -224,7 +224,7 @@ export default {
}) })
return; return;
} }
uni.navigateTo({ this.$navigateTo({
url: url_path url: url_path
}) })
}, },

16
pages/student/my/my.vue

@ -118,52 +118,52 @@
}, },
// //
setup(item) { setup(item) {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/my/set_up' url: '/pages/student/my/set_up'
}) })
}, },
// //
feedback() { feedback() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/feedback' url: '/pages/common/feedback'
}) })
}, },
// //
lesson_consumption() { lesson_consumption() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/my/lesson_consumption' url: '/pages/student/my/lesson_consumption'
}) })
}, },
// //
my_members() { my_members() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/my/my_members' url: '/pages/student/my/my_members'
}) })
}, },
// //
personal_data() { personal_data() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/my/personal_data' url: '/pages/student/my/personal_data'
}) })
}, },
//- //-
openViewContractList(item) { openViewContractList(item) {
uni.navigateTo({ this.$navigateTo({
url: `/pages/common/contract_list` url: `/pages/common/contract_list`
}) })
}, },
//- //-
openViewMyMessage(item) { openViewMyMessage(item) {
uni.navigateTo({ this.$navigateTo({
url: `/pages/common/my_message` url: `/pages/common/my_message`
}) })
}, },
//- //-
openViewMyCoach(){ openViewMyCoach(){
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/my/my_coach` url: `/pages/student/my/my_coach`
}) })
}, },

4
pages/student/my/set_up.vue

@ -26,12 +26,12 @@
}, },
privacy_agreement(type){ privacy_agreement(type){
uni.navigateTo({ this.$navigateTo({
url: '/pages/common/privacy_agreement?type='+type url: '/pages/common/privacy_agreement?type='+type
}) })
}, },
update_pass(){ update_pass(){
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/my/update_pass' url: '/pages/student/my/update_pass'
}) })
} }

2
pages/student/my/update_pass.vue

@ -82,7 +82,7 @@
}); });
}, },
forgot() { forgot() {
uni.navigateTo({ this.$navigateTo({
url: '/pages/student/login/forgot' url: '/pages/student/login/forgot'
}) })
}, },

4
pages/student/timetable/index.vue

@ -410,7 +410,7 @@ export default {
// //
openViewCourseInfo(item) { openViewCourseInfo(item) {
let person_course_schedule_id = item.id let person_course_schedule_id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}` url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}`
}) })
}, },
@ -418,7 +418,7 @@ export default {
more() { more() {
let course_date = this.filteredData.course_date let course_date = this.filteredData.course_date
let venue_id = this.venuesInfo.id || ''//id let venue_id = this.venuesInfo.id || ''//id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/timetable/list?course_date=${course_date}&venue_id=${venue_id}` url: `/pages/student/timetable/list?course_date=${course_date}&venue_id=${venue_id}`
}) })
} }

2
pages/student/timetable/info.vue

@ -153,7 +153,7 @@ export default {
// //
openViewCourseInfo(item){ openViewCourseInfo(item){
uni.navigateTo({ this.$navigateTo({
url: '/pages/coach/course/info' url: '/pages/coach/course/info'
}) })
}, },

2
pages/student/timetable/list.vue

@ -202,7 +202,7 @@
//- //-
opebViewTimetable(item) { opebViewTimetable(item) {
let venue_id = item.id let venue_id = item.id
uni.navigateTo({ this.$navigateTo({
url: `/pages/student/timetable/index?venue_id=${venue_id}` url: `/pages/student/timetable/index?venue_id=${venue_id}`
}) })
}, },

Loading…
Cancel
Save