diff --git a/api/apiRoute.js b/api/apiRoute.js index 5f0f4a2..683688a 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -143,13 +143,27 @@ export default { //↓↓↓↓↓↓↓↓↓↓↓↓-----教练接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓ - - - - - - - + //体测报告-详情 + physicalTestInfo(data = {}) { + let url = '/class/physicalTest/info' + return http.get(url, data).then(res => { + return res; + }) + }, + //体测报告-列表 + physicalTest(data = {}) { + let url = '/class/physicalTest' + return http.get(url, data).then(res => { + return res; + }) + }, + //获取学员详情 + jlStudentsInfo(data = {}) { + let url = '/class/jlStudentsInfo' + return http.get(url, data).then(res => { + return res; + }) + }, //获取添加学员列表 addStudentList(data = {}) { let url = '/course/addStudentList' @@ -190,6 +204,13 @@ export default { return res; }) }, + //获取班级课程列表 + classCourseList(data = {}) { + let url = '/course/classCourseList' + return http.get(url, data).then(res => { + return res; + }) + }, //获取课程详情 courseInfo(data = {}) { let url = '/course/courseInfo' @@ -417,6 +438,76 @@ export default { return res; }) }, + //学生详情-修改 + xy_memberEdit(data = {}) { + let url = '/customerResourcesAuth/edit' + return http.post(url, data).then(res => { + return res; + }) + }, + + //学生-意见反馈-添加 + xy_userFeedbackAdd(data = {}) { + let url = '/userFeedback/add' + return http.post(url, data).then(res => { + return res; + }) + }, + + //学生端-获取好友关系绑定详情 + xy_chatGetChatFriendsInfo(data = {}) { + let url = '/xy/chat/getChatFriendsInfo' + return http.get(url, data).then(res => { + return res; + }) + }, + //学生端-获取聊天消息列表 + xy_chatGetChatMessagesList(data = {}) { + let url = '/xy/chat/getChatMessagesList' + return http.get(url, data).then(res => { + return res; + }) + }, + //学生端-发送聊天消息 + xy_chatSendChatMessages(data = {}) { + let url = '/xy/chat/sendChatMessages' + return http.post(url, data).then(res => { + return res; + }) + }, + //学生端-好友关系列表 + xy_chatGetChatFriendsList(data = {}) { + let url = '/xy/chat/getChatFriendsList' + return http.get(url, data).then(res => { + return res; + }) + }, + + //学生端-体测报告-列表 + xy_physicalTest(data = {}) { + let url = '/xy/physicalTest' + return http.get(url, data).then(res => { + return res; + }) + }, + + //学生端-体测报告-详情 + xy_physicalTestInfo(data = {}) { + let url = '/xy/physicalTest/info' + return http.get(url, data).then(res => { + return res; + }) + }, + + //学生端-学生课程安排-列表 + xy_personCourseSchedule(data = {}) { + let url = '/xy/personCourseSchedule' + return http.get(url, data).then(res => { + return res; + }) + }, + + diff --git a/components/AQ/AQUplodeImgMulti.vue b/components/AQ/AQUplodeImgMulti.vue index eeef305..da3793e 100644 --- a/components/AQ/AQUplodeImgMulti.vue +++ b/components/AQ/AQUplodeImgMulti.vue @@ -27,6 +27,11 @@ import {Api_url} from "../../common/config"; }, props: { //父组件参数 + //上传文件接口的url + uploadApiUrl:{ + type: String, + default: `${Api_url}/file/image` + }, //表单名称 inputName: { type: String, @@ -48,7 +53,8 @@ import {Api_url} from "../../common/config"; return { inputName: this.inputName, inputValue: this.inputValue, - maxFileNum: this.maxFileNum + maxFileNum: this.maxFileNum, + uploadApiUrl: this.uploadApiUrl }; } }, @@ -99,7 +105,7 @@ import {Api_url} from "../../common/config"; }, //上传接口地址 - uploadApiUrl: `${Api_url}/file/image`, + // uploadApiUrl: `${Api_url}/file/image`, // 上传图片的样式 imageStyles: { @@ -168,7 +174,7 @@ import {Api_url} from "../../common/config"; console.log('xxx',_arr) this.fileList.push(_arr) console.log('上传成功2',_arr); - this.filePathArr.push(res.data.path) + this.filePathArr.push(res.data.url) //上传成功 this.emitUploadSuccess(this.filePathArr) }else{ diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue index 27a0e9d..d130daf 100644 --- a/pages/coach/class/info.vue +++ b/pages/coach/class/info.vue @@ -1,602 +1,638 @@ \ No newline at end of file diff --git a/pages/coach/course/info_list.vue b/pages/coach/course/info_list.vue index 56a325c..43886a4 100644 --- a/pages/coach/course/info_list.vue +++ b/pages/coach/course/info_list.vue @@ -11,11 +11,11 @@ 添加学员 - 上课中 + 上课中 - 已结束 + 已结束 - 未开始 + 未开始 @@ -189,6 +189,20 @@ async init() { this.getCourseInfo() }, + + isNowBetween(start_date, end_date) { + const now = new Date(); + const start = new Date(start_date); + const end = new Date(end_date); + + return now >= start && now <= end; + }, + + isCourseFuture(courseDate) { + const courseTime = new Date(courseDate).getTime(); + const nowTime = new Date().getTime(); + return courseTime > nowTime; + }, //教练端-课程详情 async getCourseInfo() { diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue index 904152f..d8e314b 100644 --- a/pages/coach/student/info.vue +++ b/pages/coach/student/info.vue @@ -10,23 +10,24 @@ - - + + {{studentsInfo.name}} - {{studentsInfo.age}}岁 + + {{studentsInfo.customerResources.age}}岁 - 电话：{{studentsInfo.phone}} + 电话：{{studentsInfo.customerResources.phone_number}} @@ -111,10 +112,10 @@ :key="k" @click="openViewPhysicalExamination(v)" > - 综合评分:{{v.score}} + 综合评分:{{v.calculateChildHealthScore}} - 测试时间：{{v.create_time}} + 测试时间：{{$util.formatToDateTime(v.created_at, 'Y-m-d')}} @@ -133,7 +134,7 @@