diff --git a/admin/src/app/views/student_courses/student_courses.vue b/admin/src/app/views/student_courses/student_courses.vue
index 72e3a824..ca113ff6 100644
--- a/admin/src/app/views/student_courses/student_courses.vue
+++ b/admin/src/app/views/student_courses/student_courses.vue
@@ -76,14 +76,22 @@
:label="t('studentId')"
min-width="120"
:show-overflow-tooltip="true"
- />
+ >
+
+ {{ row.student ? row.student.name : '' }}
+
+
+ >
+
+ {{ row.course ? row.course.course_name : '' }}
+
+
{
console.log('打开文档成功');
diff --git a/uniapp/pages/market/clue/clue_info.vue b/uniapp/pages/market/clue/clue_info.vue
index 7fc7885d..30ca447b 100644
--- a/uniapp/pages/market/clue/clue_info.vue
+++ b/uniapp/pages/market/clue/clue_info.vue
@@ -1,1918 +1,1890 @@
-
-
-
-
-
-
-
-
-
-
- {{ safeGet(clientInfo, 'customerResource.name', '未知客户') }}
-
-
-
-
- {{ $util.formatToDateTime((safeGet(clientInfo, 'customerResource.updated_at', '')),'m-d H:i') }}
- 跟进
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 基本资料
-
- 课程信息
-
- 通话记录
-
- 体测记录
+
+
+
+
+
+
+
+
+
+
+ {{ safeGet(clientInfo, 'customerResource.name', '未知客户') }}
+
+
+
- 学习计划
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- 基本信息
-
-
- 来源渠道
- {{safeGet(clientInfo, 'customerResource.source_channel_name', '未知渠道')}}
-
-
- 来源
- {{safeGet(clientInfo, 'customerResource.source_name', '未知来源')}}
-
-
- 顾问
- {{safeGet(clientInfo, 'customerResource.consultant_name', '未知顾问')}}
-
-
- 学生姓名
- {{safeGet(clientInfo, 'customerResource.name', '未知学生')}}
-
-
- 性别
- {{safeGet(clientInfo, 'customerResource.gender_name', '未知性别')}}
-
-
-
- 附加信息
-
-
- 已成交次数
- {{safeGet(clientInfo, 'customerResource.cj_count', 0)}}次
-
-
- 体验课程
- {{safeGet(clientInfo, 'customerResource.trial_class_count', 0)}}次
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ course.used_count || 0 }}/{{ course.total_count || 0 }}节
-
-
-
-
-
- 剩余课时:
- {{ (course.total_count || 0) - (course.used_count || 0) }}节
-
-
-
- 有效期至:
-
- {{ $util.formatToDateTime(course.expiry_date, 'Y-m-d') || '无限期' }}
-
-
- 请假次数:
- {{ course.leave_count || 0 }}次
-
-
- 主教练:
- {{ course.main_coach_name || '未分配' }}
-
-
- 教务:
- {{ course.education_name || '未分配' }}
-
-
- 助教:
- {{ course.assistant_names || '无' }}
-
-
-
-
- 点击修改教练配置
-
-
-
-
-
- 暂无课程信息
-
-
-
-
-
-
-
- {{$util.formatToDateTime(v.follow_up_time,'m-d')}}
-
-
- {{v.student_name}}
- 跟进({{v.student_phone}})
-
- {{v.follow_up_content}}
- {{v.follow_up_time}}
-
-
-
-
-
-
-
-
-
-
-
-
- 呼叫时间:
- {{v.created_at}}
-
-
-
-
-
-
-
-
-
-
-
- 编辑详情
- 课程安排
- 修改记录
- 订单列表
-
-
-
-
-
+
+
+
+
+
+
+ 基本信息
+
+
+ 来源渠道
+ {{ safeGet(clientInfo, 'customerResource.source_channel_name', '未知渠道') }}
+
+
+ 来源
+ {{ safeGet(clientInfo, 'customerResource.source_name', '未知来源') }}
+
+
+ 顾问
+ {{ safeGet(clientInfo, 'customerResource.consultant_name', '未知顾问') }}
+
+
+ 学生姓名
+ {{ safeGet(clientInfo, 'customerResource.name', '未知学生') }}
+
+
+ 性别
+ {{ safeGet(clientInfo, 'customerResource.gender_name', '未知性别') }}
+
+
+
+ 附加信息
+
+
+ 已成交次数
+ {{ safeGet(clientInfo, 'customerResource.cj_count', 0) }}次
+
+
+ 体验课程
+ {{ safeGet(clientInfo, 'customerResource.trial_class_count', 0) }}次
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ course.used_count || 0 }}/{{ course.total_count || 0 }}节
+
+
+
+
+
+ 剩余课时:
+ {{ (course.total_count || 0) - (course.used_count || 0) }}节
+
+
+
+ 有效期至:
+
+ {{ $util.formatToDateTime(course.expiry_date, 'Y-m-d') || '无限期' }}
+
+
+
+ 请假次数:
+ {{ course.leave_count || 0 }}次
+
+
+ 主教练:
+ {{ course.main_coach_name || '未分配' }}
+
+
+ 教务:
+ {{ course.education_name || '未分配' }}
+
+
+ 助教:
+ {{ course.assistant_names || '无' }}
+
+
+
+
+ 点击修改教练配置
+
+
+
+
+
+ 暂无课程信息
+
+
+
+
+
+
+
+
+
+
+
+ 呼叫时间:
+ {{ v.created_at }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑详情
+ 课程安排
+ 修改记录
+ 订单列表
+ 服务列表
+
+
+
+
+
-
-
-
-
-
-
-
-
+ maxlength="200">
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uniapp/pages/market/course/course_detail.vue b/uniapp/pages/market/course/course_detail.vue
index a97e4970..a7dab243 100644
--- a/uniapp/pages/market/course/course_detail.vue
+++ b/uniapp/pages/market/course/course_detail.vue
@@ -4,7 +4,7 @@