diff --git a/api/apiRoute.js b/api/apiRoute.js
index 5f0f4a2..5d08e2e 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'
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 @@
-
-
-
-
-
-
-
-
-
-
- {{classInfo.head_coach_name}}
-
-
-
- 班级：{{classInfo.class_name}}
-
-
-
- 校区：{{classInfo.campus_name}}
-
-
-
+
+
+
+
+
+
+
+
+ {{classInfo.head_coach_name}}
+
+
+
+ 班级：{{classInfo.class_name}}
+
+
+
+ 校区：{{classInfo.campus_name}}
+
+
+
-
- 人数：{{classInfo.classPersonnelRel.length}}人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 班级成员
-
-
- 课程计划
-
-
-
-
-
-
-
-
-
-
-
-
- 即将到期
-
-
-
- {{ v.student.name }}
- 课程截止时间：{{ $util.formatToDateTime(v.end_date, 'Y-m-d') }}
-
-
-
-
- {{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}
- 已上课时
-
-
- {{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}
- 剩余课时
-
-
-
-
-
-
-
-
-
-
-
-
- 课程：{{v.courses_name}}
-
-
- 时间：{{v.date}}
-
-
- 地点：{{v.address}}
-
-
-
-
- 应到学员（{{v.max_students}}）
-
- 查看
-
-
-
-
- 已签到学生（{{v.has_sign_count}}/{{v.max_students}}）
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
-
- 未开始
-
-
- 上课中
-
-
-
- 已结束
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班级成员
+
+
+ 课程计划
+
+
+
+
+
+
+
+
+
+
+
+
+ 即将到期
+
+
+
+ {{ v.student.name }}
+ 课程截止时间：{{ $util.formatToDateTime(v.end_date, 'Y-m-d') }}
+
+
+
+
+ {{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}
+
+ 已上课时
+
+
+
+ {{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}
+
+ 剩余课时
+
+
+
+
+
+
+
+
+
+
+
+
+ 课程：{{v.course.course_name}}
+
+
+ 时间：{{v.course_date}}
+
+
+ 地点：{{v.campus_name}}
+
+
+
+
+ 应到学员（{{v.student.length}}）
+
+ 查看
+
+
+
+
+ 已签到学生（{{v.student_courses.length}}/{{v.student.length}}）
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 未开始
+
+
+ 上课中
+
+
+ 已结束
+
+
+
+
+
+
+
+
+
\ 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 @@