diff --git a/api/apiRoute.js b/api/apiRoute.js
index bca749c..b202203 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -80,11 +80,11 @@ export default {
},
//获取服务详情
async getServiceDetail(data = {}) {
- return await http.get('/service/detail', data);
+ return await http.get('/member/service/detail', data);
},
//获取服务列表
async getServiceList(data = {}) {
- return await http.get('/service/list', data);
+ return await http.get('/member/service/list', data);
},
//完成服务
async completeService(data = {}) {
diff --git a/pages.json b/pages.json
index cd75c8f..ed00c74 100644
--- a/pages.json
+++ b/pages.json
@@ -619,7 +619,17 @@
"navigationBarBackgroundColor": "#29d3b4",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "pages/coach/my/service_list",
+ "style": {
+ "navigationBarTitleText": "服务列表",
+ "navigationBarBackgroundColor": "#29d3b4",
+ "navigationBarTextStyle": "black"
+ }
}
+
+
],
diff --git a/pages/coach/job/list.vue b/pages/coach/job/list.vue
index 98614ad..4e55da6 100644
--- a/pages/coach/job/list.vue
+++ b/pages/coach/job/list.vue
@@ -1,17 +1,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
- 待批改
-
-
-
-
-
-
-
- 发布作业
-
-
-
-
-
-
-
- -->
+
+ 班级：{{v.class_name}}
+ 时间：{{v.create_time}}
+ 课程：{{v.course_name}}
+
+
+
+ 未提交
+ 已提交
+ 待批改
+ 已批改
+
+
+
+
+
+
+
+
+ 发布作业
+
+
+
+
+
+
+
+
-
-
+ -->
+
+ 班级
+
+
+
+ {{ selectedClassName }}
+ 请选择班级
+
+
+
+
+
+ 课程
+
+
+
+ {{ selectedCourseName }}
+ 请选择课程
+
+
+
+
+
+ 学生
+
+
+ {{ selectedStudentName }}
+ 请选择学生
+
+
+
+
+ 作业描述
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/coach/my/service_detail.vue b/pages/coach/my/service_detail.vue
index 8633c92..4ec352d 100644
--- a/pages/coach/my/service_detail.vue
+++ b/pages/coach/my/service_detail.vue
@@ -240,75 +240,75 @@ export default {
async getServiceDetail() {
try {
// 接口未开发，使用模拟数据
- // const res = await apiRoute.getServiceDetail({id: this.id});
- // if(res.code == 1) {
- // this.serviceInfo = res.data || null;
- // } else {
- // uni.showToast({
- // title: res.msg || '获取服务详情失败',
- // icon: 'none'
- // });
- // }
+ const res = await apiRoute.getServiceDetail({id: this.id});
+ if(res.code == 1) {
+ this.serviceInfo = res.data || null;
+ } else {
+ uni.showToast({
+ title: res.msg || '获取服务详情失败',
+ icon: 'none'
+ });
+ }
// 使用模拟数据
- setTimeout(() => {
- // 模拟数据库
- const mockServices = {
- '1': {
- id: '1',
- resource_id: '美团用户1',
- course_id: '2001',
- service_id: '18645873651',
- service_remark: '针对学员英语口语发音进行专项辅导',
- status: 1,
- staff_id: '3001',
- score: 4,
- feedback: '老师很耐心，讲解很清楚，孩子进步很大',
- created_at: '2023-10-15 14:30:00',
- feedback_time: '2023-10-16 18:20:00',
- updated_at: '2023-10-16 18:20:00',
- campus: '总部校区',
- source: '线上',
- channel: '地推'
- },
- '2': {
- id: '2',
- resource_id: '李柏辉',
- course_id: '2002',
- service_id: '13876337043',
- service_remark: '解答家长关于课程安排的问题',
- status: 0,
- staff_id: '3001',
- score: 0,
- feedback: '',
- created_at: '2023-10-18 09:15:00',
- feedback_time: '',
- updated_at: '2023-10-18 09:15:00',
- campus: '西区校区',
- source: '地推',
- channel: ''
- },
- '3': {
- id: '3',
- resource_id: '张小明',
- course_id: '2003',
- service_id: '13912345678',
- service_remark: '为学员制定个性化学习计划',
- status: 0,
- staff_id: '3001',
- score: 0,
- feedback: '',
- created_at: '2023-10-20 16:45:00',
- feedback_time: '',
- updated_at: '2023-10-20 16:45:00',
- campus: '东区校区',
- source: '线下',
- channel: '朋友介绍'
- }
- };
+ // setTimeout(() => {
+ // // 模拟数据库
+ // const mockServices = {
+ // '1': {
+ // id: '1',
+ // resource_id: '美团用户1',
+ // course_id: '2001',
+ // service_id: '18645873651',
+ // service_remark: '针对学员英语口语发音进行专项辅导',
+ // status: 1,
+ // staff_id: '3001',
+ // score: 4,
+ // feedback: '老师很耐心，讲解很清楚，孩子进步很大',
+ // created_at: '2023-10-15 14:30:00',
+ // feedback_time: '2023-10-16 18:20:00',
+ // updated_at: '2023-10-16 18:20:00',
+ // campus: '总部校区',
+ // source: '线上',
+ // channel: '地推'
+ // },
+ // '2': {
+ // id: '2',
+ // resource_id: '李柏辉',
+ // course_id: '2002',
+ // service_id: '13876337043',
+ // service_remark: '解答家长关于课程安排的问题',
+ // status: 0,
+ // staff_id: '3001',
+ // score: 0,
+ // feedback: '',
+ // created_at: '2023-10-18 09:15:00',
+ // feedback_time: '',
+ // updated_at: '2023-10-18 09:15:00',
+ // campus: '西区校区',
+ // source: '地推',
+ // channel: ''
+ // },
+ // '3': {
+ // id: '3',
+ // resource_id: '张小明',
+ // course_id: '2003',
+ // service_id: '13912345678',
+ // service_remark: '为学员制定个性化学习计划',
+ // status: 0,
+ // staff_id: '3001',
+ // score: 0,
+ // feedback: '',
+ // created_at: '2023-10-20 16:45:00',
+ // feedback_time: '',
+ // updated_at: '2023-10-20 16:45:00',
+ // campus: '东区校区',
+ // source: '线下',
+ // channel: '朋友介绍'
+ // }
+ // };
// 根据ID获取对应服务详情
- this.serviceInfo = mockServices[this.id] || null;
+ // this.serviceInfo = mockServices[this.id] || null;
if (!this.serviceInfo) {
uni.showToast({
@@ -319,7 +319,7 @@ export default {
this.navigateBack();
}, 1500);
}
- }, 500);
+ // }, 500);
} catch(error) {
console.error('获取服务详情失败:', error);
uni.showToast({
diff --git a/pages/coach/my/service_list.vue b/pages/coach/my/service_list.vue
new file mode 100644
index 0000000..061645a
--- /dev/null
+++ b/pages/coach/my/service_list.vue
@@ -0,0 +1,414 @@
+
+
+
+
+
+
+
+
+ 服务：{{v.service_name}}
+ 时间：{{v.created_at}}
+ 服务描述：{{v.description}}
+
+
+
+ 已服务
+ 待服务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/coach/student/work_details.vue b/pages/coach/student/work_details.vue
index c1d295d..690aa61 100644
--- a/pages/coach/student/work_details.vue
+++ b/pages/coach/student/work_details.vue
@@ -2,9 +2,11 @@
-
-
-
+
+
+
+
+
@@ -14,7 +16,7 @@
{{infoData.coach_name}}
-
+
@@ -36,15 +38,15 @@ export default {
onLoad(options) {
this.filteredData.id = options.id || '1' // 默认ID为1
// 使用模拟数据
- this.mockData()
+ // this.mockData()
},
onShow(){
- // this.init() // 初始化数据 - 已注释
+ this.init() // 初始化数据 - 已注释
},
methods: {
//初始化
async init(){
- // this.getAssignmentsInfo() // 已注释
+ this.getAssignmentsInfo() // 已注释
},
// 模拟数据
@@ -59,7 +61,7 @@ export default {
},
//获取作业详情 - 已注释
- /*
+
async getAssignmentsInfo() {
let params = {...this.filteredData}
let res = await memberApi.assignmentsInfo(params)
@@ -73,7 +75,7 @@ export default {
this.infoData = res.data
},
- */
+
}
}