diff --git a/src/js/api.js b/src/js/api.js index e67cb4a..60952cb 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -9,6 +9,7 @@ export const API = { getHomeData: `${ORIGIN}/stadium/coach/getHomeData`, // 小程序-获取教练主页的数据 saveFeedback: `${ORIGIN}/stadium/coach/saveFeedback`, // 小程序-保存教练反馈 + getMyStudentList: `${ORIGIN}/stadium/coach/getMyStudentList`, // 小程序-我的学员 coach_feedback: `${ORIGIN}/upload/file/coach_feedback`, // 上传文件 - 教练反馈 task_publish: `${ORIGIN}/upload/file/task_publish`, // 上传文件 - 布置作业 diff --git a/src/pages/approve/list/list.vue b/src/pages/approve/list/list.vue index d479927..5916f7d 100644 --- a/src/pages/approve/list/list.vue +++ b/src/pages/approve/list/list.vue @@ -100,10 +100,8 @@ export default { }, methods: { selectAll(){ - let { isSelectAll } = this; let _list = [...this.approveList]; if(_list.length<=0)return - console.warn(this.isSelectAll) this.approveList = _list.map(e=>{ return { ...e, @@ -140,11 +138,11 @@ export default { } }) }, 300, 300), - tabChange(i){ + tabChange: util.debounce(function(i){ this.approveList = []; this.tabIdx = i; this.getApproveList(i); - }, + }, 300, 300), toRecord(){ util.routeTo(`/pages/approve/record/record`,'nT'); }, @@ -162,7 +160,7 @@ export default { }) .then(res=>{ util.hideLoad(); - let _list = res.list || [{},{}]; + let _list = res.list || []; this.approveList = _list; console.warn('approve list --->', res); }) @@ -281,9 +279,7 @@ export default { font-size: 28upx; line-height: 52upx; color: #333; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + @include textHide(1); } } .c-status{ diff --git a/src/pages/approve/record/record.vue b/src/pages/approve/record/record.vue index f34cd28..16989a7 100644 --- a/src/pages/approve/record/record.vue +++ b/src/pages/approve/record/record.vue @@ -23,25 +23,31 @@ + - - 胡可课 + + {{e.user_name || '-'}} - 羽毛球课程(羽毛球课) + {{e.course_name || '-'}} - 2020-08-22 10:30 + {{k || '-'}} - - 通过 + + {{ + e.status == 0?'待审批': + e.status == 1?'通过': + e.status == 2?'拒绝': '-' + }} + 原因: - 作业内容作业内容作业内容作业内容作业内容作业内容作业内容作业内容作业内容作业内… + {{e.for_leave_reason || '-'}} @@ -73,9 +79,11 @@ export default { this.getApproveList(); }, methods: { - tabChange(i){ + tabChange: util.debounce(function(i){ + this.approveList = []; this.tabIdx = i; - }, + this.getApproveList(i); + }, 300, 300), getApproveList(approve_type = 0){ let { storeInfo } = this; util.showLoad(); @@ -90,7 +98,7 @@ export default { }) .then(res=>{ util.hideLoad(); - let _list = res.list || [{},{}]; + let _list = res.list || []; this.approveList = _list; console.warn('approve list --->', res); }) @@ -169,7 +177,6 @@ export default { width: 100upx; height: 100upx; border-radius: 50%; - background-color: skyblue; } >view{ max-width: 120upx; @@ -187,9 +194,7 @@ export default { font-size: 28upx; line-height: 52upx; color: #333; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + @include textHide(1); } } .c-status{ diff --git a/src/pages/course/class_change/class_change.vue b/src/pages/course/class_change/class_change.vue index c4bc228..76fd365 100644 --- a/src/pages/course/class_change/class_change.vue +++ b/src/pages/course/class_change/class_change.vue @@ -2,7 +2,7 @@ - Adjoin + {{optionsQuery.user_name}} @@ -35,6 +35,7 @@ export default { onLoad(options){ let _query = util.jsonPar(options.query); this.optionsQuery = _query; + console.warn(_query) this.getClassList(_query.course_id) }, methods: { diff --git a/src/pages/course/student_list/student_list.vue b/src/pages/course/student_list/student_list.vue index 840b7c8..c64f0f4 100644 --- a/src/pages/course/student_list/student_list.vue +++ b/src/pages/course/student_list/student_list.vue @@ -10,15 +10,15 @@ - {{e.name || '-'}} - + {{e.course_order.name || '-'}} + - {{e.mobile || '-'}} - + {{e.course_order.mobile || '-'}} + - 剩余次数: {{e.number || 0}}次 + 剩余次数: {{e.course_order.number || 0}}次 @@ -70,9 +70,9 @@ export default { toReview(e){ let { optionsQuery } = this; let _query = { - order_no: e.order_no, - user_id: e.user_id, - user_name: e.name, + order_no: e.course_order.order_no, + user_id: e.attendance_record.user_id, + user_name: e.course_order.name, ...optionsQuery, } util.routeTo(`/pages/course/student_review/student_review?query=${util.jsonStr(_query)}`, 'nT'); @@ -80,10 +80,10 @@ export default { toShift(e){ let { optionsQuery } = this; let _query = { - order_no: e.order_no, - user_id: e.user_id, - user_name: e.name, - user_gender: e.gender, + order_no: e.course_order.order_no, + user_id: e.attendance_record.user_id, + user_name: e.course_order.name, + user_gender: e.course_order.gender, user_avatar: e.user_info.avatar_url, ...optionsQuery, } diff --git a/src/pages/mine_trainee/mine_trainee.vue b/src/pages/mine_trainee/mine_trainee.vue index 4e3fb2f..12a96cf 100644 --- a/src/pages/mine_trainee/mine_trainee.vue +++ b/src/pages/mine_trainee/mine_trainee.vue @@ -3,21 +3,21 @@ - - + + - 搜索 + 搜索 - + - - #Adjoin - + + {{e.course_order.name || '-'}} + - 00000000000 - + {{e.course_order.mobile || '-'}} + @@ -25,8 +25,48 @@