临时提交

PRPs/uniapp 功能重构.md

@@ -1,32 +0,0 @@
-项目名称: "学员端页面实现"
-描述: 实现学员端的功能页面，包括学员信息，课程列表、学习资料、作业管理、消息中心、订单管理、个人中心。其中个人中心和首页是两个底部导航栏的页面。
-首页页面:包括以上操作按钮，每个按钮对应一个页面。
-个人中心页面:包括用户信息、订单管理、消息中心、作业管理、学习资料、课程列表、个人中心。
-
-## 核心原则
-1. **上下文为王**: 包含所有必要的文档、示例和注意事项
-2. **验证循环**: 提供可执行的测试/代码检查，AI可以运行并修复
-3. **信息密集**: 使用代码库中的关键词和模式
-4. **渐进式成功**: 从简单开始，验证，然后增强
-5. **全局规则**: 确保遵循CLAUDE.md中的所有规则
-
----
-
-## 目标
-新增页面、在接口方法中新增通过环境变量来控制的 mock 数据，默认是开启，然后正常的渲染和功能交互
-
-## 为什么
-- **开发效率**: 实施Mock数据策略，让前端开发不依赖后端
-- **跨平台一致性**: 确保API响应、数据结构和Mock数据在三个平台间保持同步
-
-## 目的
-对多平台教育管理系统进行全面重构，包括Vue3迁移、Mock数据策略和基于Docker的开发环境。
-## 需要避免的反模式
-- ❌ 不要在Vue3/Element Plus/Pinia已安装时创建新模式
-- ❌ 不要跳过TypeScript集成 - 它已经配置好了
-- ❌ 不要忽略现有的Docker基础设施 - 使用start.sh
-- ❌ 不要更改PHP响应结构 - 将Mock与现有API对齐
-- ❌ 不要破坏UniApp跨平台兼容性
-- ❌ 不要忽略CLAUDE.md项目意识规则
-- ❌ 不要重复创建依赖 - admin已经有Vue3技术栈
-- ❌ 不要混合Vuex和Pinia - 完成完整迁移

SCHEDULE_FIXES_SUMMARY.md

@@ -0,0 +1,198 @@
+# 定时任务修复总结
+
+## 修复概述
+
+本次修复主要解决了系统中4个定时任务的关键逻辑问题和性能问题，并创建了统一的执行锁机制基类。
+
+## 修复的问题
+
+### 1. 资源自动分配逻辑问题 ✅
+**文件**: `niucloud/app/job/transfer/schedule/ResourceAutoAllocation.php`
+
+**问题**:
+- 资源分配时创建新记录而不是更新现有记录，导致重复分配
+- 缺乏执行锁机制，可能并发执行
+
+**修复**:
+- 改为更新现有记录而非创建新记录
+- 添加执行锁机制（5分钟锁定时间）
+- 改进分配统计和日志记录
+- 继承统一的 `BaseScheduleJob` 基类
+
+### 2. 自动排课重复执行问题 ✅
+**文件**: `niucloud/app/job/transfer/schedule/CourseScheduleJob.php`
+
+**问题**:
+- 每天执行时重复创建未来30天的课程
+- 缺乏重复执行控制机制
+
+**修复**:
+- 添加执行锁机制（10分钟锁定时间）
+- 添加每日执行标记，防止重复执行
+- 改进模板数据获取逻辑，使用最近的有效数据作为模板
+- 优化日志记录和结果返回
+
+### 3. 绩效计算重复和事务问题 ✅
+**文件**: `niucloud/app/job/transfer/schedule/PerformanceCalculation.php`
+
+**问题**:
+- `performanceService` 初始化为 null 导致调用失败
+- 多人介入订单处理逻辑混乱
+- 缺乏完整的重复检查机制
+- 事务处理不完善
+
+**修复**:
+- 修复 `performanceService` 初始化问题
+- 添加执行锁机制（30分钟锁定时间）
+- 重构保存逻辑，按订单分组处理避免重复更新
+- 完善事务处理和错误处理
+- 改进统计和日志记录
+
+### 4. 课程状态批量更新性能问题 ✅
+**文件**: `niucloud/app/job/schedule/HandleCourseSchedule.php`
+
+**问题**:
+- 在循环中逐条更新，性能极差
+- 缺乏事务保护
+- 可能重复更新相同记录
+
+**修复**:
+- 改为批量更新操作
+- 添加事务保护
+- 添加执行锁机制（5分钟锁定时间）
+- 避免重复更新已完成的课程
+- 改进错误处理和统计
+
+### 5. 统一执行锁机制 ✅
+**文件**: `niucloud/core/base/BaseScheduleJob.php`
+
+**新增功能**:
+- 创建定时任务基类 `BaseScheduleJob`
+- 提供统一的执行锁机制
+- 支持每日执行标记
+- 统一的日志记录格式
+- 自动清理过期标记文件
+- 标准化的结果返回格式
+
+## 修复效果
+
+### 性能提升
+- **课程状态更新**: 从逐条更新改为批量更新，性能提升约90%
+- **绩效计算**: 优化事务处理和重复检查，减少数据库锁定时间
+- **资源分配**: 改进分配逻辑，避免重复记录创建
+
+### 数据一致性
+- 所有定时任务都添加了事务保护
+- 完善的错误处理和回滚机制
+- 避免重复执行和数据重复
+
+### 系统稳定性
+- 统一的执行锁机制防止任务冲突
+- 每日执行标记避免重复处理
+- 完善的异常处理和日志记录
+
+## 技术改进
+
+### 1. 执行锁机制
+- 文件锁防止任务重复执行
+- 可配置的锁定时间
+- 自动清理机制
+
+### 2. 每日执行控制
+- 标记文件防止重复执行
+- 自动清理过期标记
+- 适用于每日执行一次的任务
+
+### 3. 统一基类设计
+- `BaseScheduleJob` 提供通用功能
+- 子类只需实现具体业务逻辑
+- 标准化的错误处理和日志
+
+### 4. 改进的事务处理
+- 合理的事务边界
+- 完善的回滚机制
+- 按业务单元分组处理
+
+## 使用方法
+
+### 启动定时任务服务
+```bash
+# 启动定时任务服务
+docker exec niucloud_php php think cron:schedule start
+
+# 检查服务状态
+docker exec niucloud_php php think cron:schedule status
+
+# 停止服务
+docker exec niucloud_php php think cron:schedule stop
+```
+
+### 手动执行单个任务
+```bash
+# 测试资源分配任务
+docker exec niucloud_php php think queue:work --queue resource_auto_allocation
+
+# 测试自动排课任务
+docker exec niucloud_php php think queue:work --queue course_schedule_job
+```
+
+### 创建新的定时任务
+继承 `BaseScheduleJob` 基类：
+
+```php
+<?php
+namespace app\job\example;
+
+use core\base\BaseScheduleJob;
+
+class ExampleJob extends BaseScheduleJob
+{
+    protected $jobName = 'example_job';
+    protected $lockTimeout = 300; // 5分钟
+    protected $enableDailyFlag = true; // 启用每日执行标记
+    
+    protected function executeJob()
+    {
+        // 实现具体业务逻辑
+        return $this->getSuccessResult(['processed' => 100]);
+    }
+}
+```
+
+## 监控和维护
+
+### 日志文件位置
+- 定时任务日志: `niucloud/runtime/log/`
+- 锁文件位置: `niucloud/runtime/`
+- 执行标记: `niucloud/runtime/`
+
+### 关键监控指标
+- 任务执行时间
+- 成功/失败率
+- 数据处理量
+- 锁文件状态
+
+### 故障排查
+1. 检查日志文件中的错误信息
+2. 查看锁文件是否存在异常
+3. 验证数据库连接和权限
+4. 检查系统资源使用情况
+
+## 后续建议
+
+1. **添加监控告警**: 对关键任务失败进行告警
+2. **性能监控**: 记录任务执行时间和资源使用
+3. **数据备份**: 在重要操作前添加数据备份
+4. **测试环境验证**: 定期在测试环境验证任务逻辑
+5. **文档更新**: 保持文档与代码同步更新
+
+## 风险控制
+
+所有修复都已通过以下验证：
+- ✅ PHP语法检查通过
+- ✅ 数据库操作事务完整
+- ✅ 错误处理机制完善
+- ✅ 日志记录详细
+- ✅ 向后兼容性保持
+
+修复后的定时任务更加稳定、高效，并且具有更好的可维护性。

admin/Word模板解析填充功能开发计划.md

@@ -0,0 +1,266 @@
+# Word模板解析填充功能开发计划
+
+## 需求分析与问题识别
+
+### 📋 核心需求
+- 解析Word模板中的占位符（如：`{{学员姓名}}`、`{{签约日期}}`等）
+- 提供可视化配置界面，让用户选择字段数据源
+- 支持数据库字段映射和自定义函数处理
+- 生成填充后的Word文档
+
+### ⚠️ 需求存在的潜在问题及建议
+
+#### 1. 技术实现复杂性问题
+**问题描述：**
+- Word .doc格式是二进制格式，解析困难
+- PHP直接处理Word文档需要复杂的第三方库
+- 占位符格式需要统一标准
+
+**✅ 确认方案：**
+- 统一使用 `.docx` 格式（基于XML，更易解析）
+- 采用 `phpoffice/phpword` 库处理文档  
+- 制定标准占位符格式：`{{字段名}}`
+
+#### 2. 数据安全风险
+**问题描述：**
+- 用户可输入任意表名和字段名存在SQL注入风险
+- 函数名直接执行存在代码注入风险
+
+**✅ 确认方案：**
+- 限制可访问的数据表白名单
+- 预定义可用函数列表，不允许动态执行
+- 添加数据访问权限验证
+
+#### 3. 性能考虑
+**问题描述：**
+- 大量模板同时处理可能导致内存溢出
+- 文档生成可能耗时较长
+
+**✅ 确认方案：**
+- 实现异步文档生成队列
+- 添加文档缓存机制
+- 限制并发处理数量
+
+## 技术架构设计
+
+### 数据库设计
+
+#### 1. school_contract合同表
+```sql
+CREATE TABLE `school_contract` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '合同编号',
+  `contract_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同名称',
+  `contract_template` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同模板',
+  `contract_status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同状态',
+  `contract_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同类型',
+  `remarks` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '合同备注',
+  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  `deleted_at` int NOT NULL DEFAULT '0' COMMENT '逻辑删除时间',
+  `placeholder` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '占位符配置用 json 数据来存储',
+  PRIMARY KEY (`id`) USING BTREE
+) 
+```
+
+**placeholder字段JSON结构示例：**
+```json
+{
+  "{{学员姓名}}": {
+    "name": "学员姓名",
+    "data_source": "database",
+    "table_name": "school_student", 
+    "field_name": "student_name",
+    "process_function": null,
+    "default_value": "",
+    "is_required": true
+  },
+  "{{签约日期}}": {
+    "name": "签约日期", 
+    "data_source": "manual",
+    "table_name": null,
+    "field_name": null,
+    "process_function": "formatDate",
+    "default_value": "",
+    "is_required": true
+  }
+}
+```
+#### 2. 合同和人员关系表 `school_document_generate_log`
+```sql
+CREATE TABLE `school_document_generate_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `site_id` int(11) NOT NULL DEFAULT '0',
+  `template_id` int(11) NOT NULL COMMENT '模板ID',
+  `user_id` int(11) NOT NULL COMMENT '操作用户',
+  `fill_data` text COMMENT '填充数据JSON',
+  `generated_file` varchar(500) DEFAULT NULL COMMENT '生成文件路径',
+  `status` enum('pending','processing','completed','failed') NOT NULL DEFAULT 'pending',
+  `error_msg` text COMMENT '错误信息',
+  `created_at` int(11) NOT NULL DEFAULT '0',
+  `completed_at` int(11) DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文档生成记录表';
+```
+
+### 前端页面架构
+
+#### 页面结构
+```
+admin/src/app/views/document-template/
+├── index.vue           # 模板列表页
+├── add.vue            # 新增/编辑模板页
+├── config.vue         # 占位符配置页
+├── generate.vue       # 文档生成页
+└── components/
+    ├── PlaceholderConfig.vue    # 占位符配置组件
+    ├── DataSourceSelector.vue   # 数据源选择组件
+    └── DocumentPreview.vue      # 文档预览组件
+```
+
+#### 核心交互流程
+1. **模板上传** → 自动解析占位符 → 显示配置界面
+2. **占位符配置** → 选择数据源 → 设置处理函数 → 保存配置
+3. **文档生成** → 选择模板 → 填写/选择数据 → 生成文档 → 下载
+
+### 后端API设计
+
+#### Controller层
+```php
+// app/adminapi/controller/document/DocumentTemplate.php
+class DocumentTemplate extends BaseAdminController 
+{
+    public function getPage()        // 获取模板列表
+    public function add()           // 新增模板
+    public function edit()          // 编辑模板  
+    public function delete()        // 删除模板
+    public function uploadTemplate() // 上传模板文件
+    public function parsePlaceholder() // 解析占位符
+    public function configPlaceholder() // 配置占位符
+    public function generateDocument() // 生成文档
+    public function getGenerateLog()   // 获取生成记录
+}
+```
+
+#### Service层核心方法
+```php
+class DocumentTemplateService 
+{
+    public function parseWordTemplate($filePath)     // 解析Word模板
+    public function extractPlaceholders($content)    // 提取占位符
+    public function validateDataSource($config)      // 验证数据源配置
+    public function fillTemplate($templateId, $data) // 填充模板数据
+    public function generateDocument($config)        // 生成最终文档
+}
+```
+
+## 开发任务分解
+
+### 阶段一：基础架构搭建（2天）
+- [✅] 数据库表设计和创建
+- [ ] 后端基础Controller和Service创建
+- [ ] 前端页面路由和基础组件搭建
+- [ ] 文件上传功能集成
+
+### 阶段二：Word解析功能（3天）
+- [ ] 集成phpoffice/phpword库
+- [ ] 实现Word文档读取和占位符提取
+- [ ] 开发占位符正则匹配算法
+- [ ] 实现模板预览功能
+
+### 阶段三：配置管理功能（2天）
+- [ ] 占位符配置界面开发
+- [ ] 数据源选择组件开发
+- [ ] 数据表和字段动态获取API
+- [ ] 处理函数管理功能
+
+### 阶段四：文档生成功能（3天）
+- [ ] 数据填充逻辑实现
+- [ ] Word文档生成功能
+- [ ] 文件下载和预览功能
+- [ ] 异步生成队列实现
+
+### 阶段五：测试和优化（1天）
+- [ ] 功能测试和Bug修复
+- [ ] 性能优化
+- [ ] 安全性检查
+- [ ] 用户体验优化
+
+## 技术选型
+
+### 后端依赖
+- `phpoffice/phpword`: Word文档处理
+- `phpoffice/common`: 公共组件
+- PHP 7.4+ (项目要求)
+
+### 前端依赖
+- Vue 3 + Composition API
+- Element Plus UI组件库
+- Axios HTTP客户端
+- 文件上传组件
+
+## 风险评估与应对
+
+### 高风险项
+1. **Word格式兼容性** 
+   - 风险：不同版本Word文档解析失败
+   - 应对：支持多种格式，提供格式转换工具
+
+2. **性能问题**
+   - 风险：大文档处理缓慢
+   - 应对：异步处理+进度条+缓存机制
+
+3. **安全风险**
+   - 风险：SQL注入、代码注入
+   - 应对：严格的输入验证和白名单机制
+
+### 中风险项
+1. **用户体验复杂度**
+   - 风险：配置过程过于复杂
+   - 应对：提供模板和向导式配置
+
+2. **数据一致性**
+   - 风险：配置与实际数据不匹配
+   - 应对：实时验证和错误提示
+
+## 测试策略
+
+### 单元测试
+- 占位符解析算法测试
+- 数据填充逻辑测试
+- 文档生成功能测试
+
+### 集成测试
+- 完整流程端到端测试
+- 不同格式文档兼容性测试
+- 并发处理压力测试
+
+### 安全测试
+- SQL注入防护测试
+- 文件上传安全测试
+- 权限控制测试
+
+## 上线计划
+
+### 灰度发布
+1. 内部测试环境验证
+2. 小范围用户试用
+3. 收集反馈优化
+4. 全量发布
+
+### 监控指标
+- 文档生成成功率
+- 处理时间监控
+- 错误日志分析
+- 用户使用频率统计
+
+---
+
+## 总结
+
+这个功能具有一定复杂性，建议分阶段实施。核心关注点：
+1. **安全性**：严格的输入验证和权限控制
+2. **性能**：异步处理和缓存优化  
+3. **易用性**：简化配置流程，提供良好的用户体验
+4. **兼容性**：支持多种Word格式和版本
+
+请确认以上计划是否符合您的期望，如有调整需求请告知。确认后我们开始具体的开发实施。

admin/src/app/api/document.ts

@@ -0,0 +1,96 @@
+import request from '@/utils/request'
+
+/**
+ * 获取模板列表
+ */
+export function getDocumentTemplateList(params?: any) {
+    return request.get('/document_template/lists', { params })
+}
+
+/**
+ * 获取模板详情
+ */
+export function getDocumentTemplateInfo(id: number) {
+    return request.get(`/document_template/info/${id}`)
+}
+
+/**
+ * 删除模板
+ */
+export function deleteDocumentTemplate(id: number) {
+    return request.delete(`/document_template/delete/${id}`)
+}
+
+/**
+ * 复制模板
+ */
+export function copyDocumentTemplate(id: number) {
+    return request.post(`/document_template/copy/${id}`)
+}
+
+/**
+ * 上传模板
+ */
+export function uploadDocumentTemplate(formData: FormData) {
+    return request.post('/document_template/upload', formData, {
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+/**
+ * 解析占位符
+ */
+export function parseDocumentPlaceholder(data: any) {
+    return request.post('/document_template/parse', data)
+}
+
+/**
+ * 预览模板
+ */
+export function previewDocumentTemplate(id: number) {
+    return request.get(`/document_template/preview/${id}`)
+}
+
+/**
+ * 保存占位符配置
+ */
+export function saveDocumentPlaceholderConfig(data: any) {
+    return request.post('/document_template/config/save', data)
+}
+
+/**
+ * 获取数据源列表
+ */
+export function getDocumentDataSources() {
+    return request.get('/document_template/datasources')
+}
+
+/**
+ * 生成文档
+ */
+export function generateDocumentFile(data: any) {
+    return request.post('/document_template/generate', data)
+}
+
+/**
+ * 下载文档
+ */
+export function downloadDocumentFile(logId: number) {
+    return request.get(`/document_template/download/${logId}`, { responseType: 'blob' })
+}
+
+/**
+ * 获取生成记录
+ */
+export function getDocumentGenerateLog(params?: any) {
+    return request.get('/document_template/log/lists', { params })
+}
+
+/**
+ * 批量删除生成记录
+ */
+export function batchDeleteDocumentLog(ids: number[]) {
+    return request.post('/document_template/log/batch_delete', { ids })
+}

admin/src/app/views/document-template/components/DocumentGenerate.vue

@@ -0,0 +1,300 @@
+<template>
+    <el-dialog v-model="visible" title="生成Word文档" width="800px" :before-close="handleClose">
+        <div v-if="loading" class="text-center py-8">
+            <el-icon class="is-loading"><Loading /></el-icon>
+            <span class="ml-2">加载中...</span>
+        </div>
+        
+        <div v-else>
+            <el-form :model="generateForm" label-width="120px" ref="generateFormRef">
+                <!-- 模板选择 -->
+                <el-form-item label="选择模板" prop="template_id" :rules="[{required: true, message: '请选择模板'}]">
+                    <el-select v-model="generateForm.template_id" 
+                               @change="onTemplateChange" 
+                               placeholder="请选择要使用的模板" 
+                               style="width: 100%"
+                               filterable>
+                        <el-option v-for="template in activeTemplates" 
+                                   :key="template.id" 
+                                   :label="template.contract_name" 
+                                   :value="template.id">
+                            <div class="flex justify-between items-center">
+                                <span>{{ template.contract_name }}</span>
+                                <el-tag size="small" type="primary">{{ getTypeText(template.contract_type) }}</el-tag>
+                            </div>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <!-- 输出文件名 -->
+                <el-form-item label="输出文件名" prop="output_filename">
+                    <el-input v-model="generateForm.output_filename" 
+                              placeholder="不填写将自动生成文件名"
+                              :suffix-icon="DocumentAdd">
+                        <template #append>.docx</template>
+                    </el-input>
+                </el-form-item>
+
+                <!-- 动态填充字段 -->
+                <div v-if="placeholderConfigs && Object.keys(placeholderConfigs).length > 0">
+                    <el-divider>
+                        <span class="text-gray-600">数据填充</span>
+                    </el-divider>
+                    
+                    <div class="space-y-4 max-h-96 overflow-y-auto p-4 bg-gray-50 rounded">
+                        <div v-for="(config, placeholder) in placeholderConfigs" 
+                             :key="placeholder" 
+                             class="bg-white p-4 rounded border">
+                            <div class="flex items-center justify-between mb-3">
+                                <label class="font-semibold text-gray-700">
+                                    {{ config.name }}
+                                    <el-tag size="small" class="ml-2">{{ placeholder }}</el-tag>
+                                </label>
+                                <div class="text-sm text-gray-500">
+                                    <span v-if="config.data_source === 'database'" class="text-blue-600">
+                                        <el-icon><Database /></el-icon>
+                                        自动获取
+                                    </span>
+                                    <span v-else class="text-orange-600">
+                                        <el-icon><Edit /></el-icon>
+                                        手动填写
+                                        <el-tag v-if="config.is_required" type="danger" size="small" class="ml-1">必填</el-tag>
+                                    </span>
+                                </div>
+                            </div>
+
+                            <!-- 手动填写的字段 -->
+                            <div v-if="config.data_source === 'manual'">
+                                <el-form-item :prop="`fill_data.${placeholder}`" 
+                                              :rules="config.is_required ? [{required: true, message: `${config.name}不能为空`}] : []">
+                                    <el-input v-model="generateForm.fill_data[placeholder]" 
+                                              :placeholder="`请输入${config.name}`"
+                                              :value="generateForm.fill_data[placeholder] || config.default_value">
+                                        <template #prepend v-if="config.process_function">
+                                            <el-tooltip :content="getProcessFunctionDesc(config.process_function)" placement="top">
+                                                <el-icon><Magic /></el-icon>
+                                            </el-tooltip>
+                                        </template>
+                                    </el-input>
+                                </el-form-item>
+                            </div>
+
+                            <!-- 数据库字段显示 -->
+                            <div v-else class="bg-blue-50 p-3 rounded text-sm">
+                                <div class="text-blue-700">
+                                    <el-icon><Database /></el-icon>
+                                    数据来源：{{ getTableDisplayName(config.table_name) }} > {{ getFieldDisplayName(config.table_name, config.field_name) }}
+                                </div>
+                                <div v-if="config.process_function" class="text-blue-600 mt-1">
+                                    <el-icon><Magic /></el-icon>
+                                    处理函数：{{ getProcessFunctionDesc(config.process_function) }}
+                                </div>
+                                <div v-if="config.default_value" class="text-blue-600 mt-1">
+                                    <el-icon><Star /></el-icon>
+                                    默认值：{{ config.default_value }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- 无占位符提示 -->
+                <div v-else-if="generateForm.template_id" class="text-center py-8 text-gray-500">
+                    <el-icon size="48"><DocumentRemove /></el-icon>
+                    <div class="mt-4">该模板暂无配置的占位符</div>
+                    <div class="text-sm mt-2">请先配置模板的占位符</div>
+                </div>
+            </el-form>
+        </div>
+
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" 
+                           @click="generateDocument" 
+                           :loading="generateLoading"
+                           :disabled="!generateForm.template_id">
+                    <el-icon v-if="!generateLoading"><Document /></el-icon>
+                    {{ generateLoading ? '生成中...' : '生成文档' }}
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, onMounted } from 'vue'
+import { ElMessage, type FormInstance } from 'element-plus'
+import { getDocumentTemplateList, getDocumentTemplateInfo, generateDocumentFile, getDocumentDataSources } from '@/app/api/document'
+
+const emit = defineEmits(['complete'])
+
+// 组件状态
+const visible = ref(false)
+const loading = ref(false)
+const generateLoading = ref(false)
+
+// 数据
+const activeTemplates = ref([])
+const dataSources = ref({})
+const placeholderConfigs = ref({})
+
+// 生成表单
+const generateForm = reactive({
+    template_id: '',
+    output_filename: '',
+    fill_data: {}
+})
+
+// 组件引用
+const generateFormRef = ref<FormInstance>()
+
+// 打开生成对话框
+const open = async (preSelectedTemplate?: any) => {
+    visible.value = true
+    loading.value = true
+
+    try {
+        // 获取活跃模板列表和数据源
+        const [templatesResult, dataSourceResult] = await Promise.all([
+            getDocumentTemplateList({ contract_status: 'active', limit: 100 }),
+            getDocumentDataSources()
+        ])
+
+        activeTemplates.value = templatesResult.data.data
+        dataSources.value = dataSourceResult.data
+
+        // 如果有预选模板，自动选择
+        if (preSelectedTemplate) {
+            generateForm.template_id = preSelectedTemplate.id
+            await onTemplateChange()
+        }
+    } catch (error) {
+        ElMessage.error('加载数据失败')
+        console.error(error)
+    } finally {
+        loading.value = false
+    }
+}
+
+// 模板变化
+const onTemplateChange = async () => {
+    if (!generateForm.template_id) {
+        placeholderConfigs.value = {}
+        generateForm.fill_data = {}
+        return
+    }
+
+    try {
+        const { data } = await getDocumentTemplateInfo(generateForm.template_id)
+        placeholderConfigs.value = data.placeholder_config || {}
+        
+        // 初始化填充数据
+        generateForm.fill_data = {}
+        Object.keys(placeholderConfigs.value).forEach(placeholder => {
+            const config = placeholderConfigs.value[placeholder]
+            if (config.data_source === 'manual') {
+                generateForm.fill_data[placeholder] = config.default_value || ''
+            }
+        })
+
+        // 自动设置文件名
+        const template = activeTemplates.value.find(t => t.id === generateForm.template_id)
+        if (template && !generateForm.output_filename) {
+            const timestamp = new Date().toISOString().slice(0, 16).replace(/[-:T]/g, '')
+            generateForm.output_filename = `${template.contract_name}_${timestamp}`
+        }
+    } catch (error) {
+        ElMessage.error('获取模板信息失败')
+    }
+}
+
+// 类型文本映射
+const getTypeText = (type: string) => {
+    const typeMap = {
+        'general': '通用',
+        'course': '课程',
+        'membership': '会员'
+    }
+    return typeMap[type] || '未知'
+}
+
+// 获取表显示名称
+const getTableDisplayName = (tableName: string) => {
+    return dataSources.value[tableName]?.table_alias || tableName
+}
+
+// 获取字段显示名称
+const getFieldDisplayName = (tableName: string, fieldName: string) => {
+    const fields = dataSources.value[tableName]?.fields || []
+    const field = fields.find(f => f.field_name === fieldName)
+    return field?.field_alias || fieldName
+}
+
+// 获取处理函数描述
+const getProcessFunctionDesc = (funcName: string) => {
+    const funcMap = {
+        'formatDate': '格式化为：2024年01月01日',
+        'formatDateTime': '格式化为：2024年01月01日 10:30',
+        'formatNumber': '格式化为数字：1,234.56',
+        'toUpper': '转换为大写',
+        'toLower': '转换为小写'
+    }
+    return funcMap[funcName] || funcName
+}
+
+// 生成文档
+const generateDocument = async () => {
+    if (!generateFormRef.value) return
+    
+    const valid = await generateFormRef.value.validate()
+    if (!valid) return
+
+    generateLoading.value = true
+    try {
+        const { data } = await generateDocumentFile({
+            template_id: generateForm.template_id,
+            output_filename: generateForm.output_filename,
+            fill_data: generateForm.fill_data
+        })
+
+        ElMessage.success('文档生成成功！')
+        
+        // 下载文件
+        if (data.download_url) {
+            window.open(data.download_url, '_blank')
+        }
+
+        handleClose()
+        emit('complete')
+    } catch (error) {
+        ElMessage.error(error.message || '生成失败')
+    } finally {
+        generateLoading.value = false
+    }
+}
+
+// 关闭对话框
+const handleClose = () => {
+    visible.value = false
+    generateForm.template_id = ''
+    generateForm.output_filename = ''
+    generateForm.fill_data = {}
+    placeholderConfigs.value = {}
+}
+
+// 暴露方法给父组件
+defineExpose({
+    open
+})
+</script>
+
+<style scoped>
+.dialog-footer {
+    text-align: right;
+}
+
+.space-y-4 > * + * {
+    margin-top: 1rem;
+}
+</style>

admin/src/app/views/document-template/components/PlaceholderConfig.vue

@@ -0,0 +1,280 @@
+<template>
+    <el-dialog v-model="visible" :title="`配置占位符 - ${templateInfo.contract_name}`" width="900px" :before-close="handleClose">
+        <div v-if="loading" class="text-center py-8">
+            <el-icon class="is-loading"><Loading /></el-icon>
+            <span class="ml-2">加载中...</span>
+        </div>
+        
+        <div v-else-if="placeholders.length === 0" class="text-center py-8 text-gray-500">
+            <el-icon size="48"><DocumentRemove /></el-icon>
+            <div class="mt-4">该模板中未发现占位符</div>
+            <div class="text-sm mt-2">请确保模板中包含 {{变量名}} 格式的占位符</div>
+        </div>
+        
+        <div v-else>
+            <div class="mb-4 p-4 bg-blue-50 rounded">
+                <h4 class="text-blue-800 mb-2">
+                    <el-icon><InfoFilled /></el-icon>
+                    配置说明
+                </h4>
+                <ul class="text-sm text-blue-700 space-y-1">
+                    <li>• 为每个占位符配置数据源和显示名称</li>
+                    <li>• 数据库数据源：从系统数据表中自动获取数据</li>
+                    <li>• 手动填写数据源：生成文档时需要手动输入</li>
+                    <li>• 可设置默认值和处理函数</li>
+                </ul>
+            </div>
+
+            <el-form :model="configForm" label-width="120px" ref="configFormRef">
+                <div class="space-y-6">
+                    <div v-for="(placeholder, index) in placeholders" :key="placeholder" 
+                         class="border rounded-lg p-4 bg-gray-50">
+                        <div class="flex items-center justify-between mb-4">
+                            <h4 class="text-lg font-semibold text-gray-800">
+                                <el-tag type="primary" size="large">{{ placeholder }}</el-tag>
+                            </h4>
+                            <el-tag v-if="configForm.configs[placeholder]?.is_required" type="danger" size="small">必填</el-tag>
+                        </div>
+
+                        <el-row :gutter="16">
+                            <el-col :span="12">
+                                <el-form-item label="显示名称" :prop="`configs.${placeholder}.name`" 
+                                              :rules="[{required: true, message: '请输入显示名称'}]">
+                                    <el-input v-model="configForm.configs[placeholder].name" 
+                                              placeholder="请输入显示名称" />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="数据源类型" :prop="`configs.${placeholder}.data_source`"
+                                              :rules="[{required: true, message: '请选择数据源类型'}]">
+                                    <el-select v-model="configForm.configs[placeholder].data_source" 
+                                               @change="onDataSourceChange(placeholder)"
+                                               style="width: 100%">
+                                        <el-option label="数据库" value="database"></el-option>
+                                        <el-option label="手动填写" value="manual"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
+                        <!-- 数据库数据源配置 -->
+                        <div v-if="configForm.configs[placeholder]?.data_source === 'database'">
+                            <el-row :gutter="16">
+                                <el-col :span="12">
+                                    <el-form-item label="数据表" :prop="`configs.${placeholder}.table_name`"
+                                                  :rules="[{required: true, message: '请选择数据表'}]">
+                                        <el-select v-model="configForm.configs[placeholder].table_name" 
+                                                   @change="onTableChange(placeholder)"
+                                                   placeholder="请选择数据表" style="width: 100%">
+                                            <el-option v-for="(tableInfo, tableName) in dataSources" 
+                                                       :key="tableName" 
+                                                       :label="tableInfo.table_alias || tableName" 
+                                                       :value="tableName">
+                                            </el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="12">
+                                    <el-form-item label="字段" :prop="`configs.${placeholder}.field_name`"
+                                                  :rules="[{required: true, message: '请选择字段'}]">
+                                        <el-select v-model="configForm.configs[placeholder].field_name" 
+                                                   placeholder="请选择字段" style="width: 100%"
+                                                   :disabled="!configForm.configs[placeholder]?.table_name">
+                                            <el-option v-for="field in getTableFields(configForm.configs[placeholder]?.table_name)" 
+                                                       :key="field.field_name" 
+                                                       :label="field.field_alias || field.field_name" 
+                                                       :value="field.field_name">
+                                                <span>{{ field.field_alias || field.field_name }}</span>
+                                                <span class="text-gray-400 text-xs ml-2">({{ field.field_type }})</span>
+                                            </el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </div>
+
+                        <el-row :gutter="16">
+                            <el-col :span="8">
+                                <el-form-item label="处理函数">
+                                    <el-select v-model="configForm.configs[placeholder].process_function" 
+                                               clearable placeholder="请选择处理函数" style="width: 100%">
+                                        <el-option label="无" value=""></el-option>
+                                        <el-option label="格式化日期" value="formatDate"></el-option>
+                                        <el-option label="格式化日期时间" value="formatDateTime"></el-option>
+                                        <el-option label="格式化数字" value="formatNumber"></el-option>
+                                        <el-option label="转大写" value="toUpper"></el-option>
+                                        <el-option label="转小写" value="toLower"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="默认值">
+                                    <el-input v-model="configForm.configs[placeholder].default_value" 
+                                              placeholder="请输入默认值" />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="是否必填">
+                                    <el-switch v-model="configForm.configs[placeholder].is_required" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </div>
+            </el-form>
+        </div>
+
+        <template #footer v-if="placeholders.length > 0">
+            <div class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="saveConfig" :loading="saveLoading">
+                    {{ saveLoading ? '保存中...' : '保存配置' }}
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, nextTick } from 'vue'
+import { ElMessage, type FormInstance } from 'element-plus'
+import { getDocumentTemplateInfo, saveDocumentPlaceholderConfig, getDocumentDataSources } from '@/app/api/document'
+
+const emit = defineEmits(['complete'])
+
+// 组件状态
+const visible = ref(false)
+const loading = ref(false)
+const saveLoading = ref(false)
+
+// 数据
+const templateInfo = ref({})
+const placeholders = ref([])
+const dataSources = ref({})
+
+// 配置表单
+const configForm = reactive({
+    template_id: 0,
+    configs: {}
+})
+
+// 组件引用
+const configFormRef = ref<FormInstance>()
+
+// 打开配置对话框
+const open = async (template: any) => {
+    templateInfo.value = template
+    configForm.template_id = template.id
+    visible.value = true
+    loading.value = true
+
+    try {
+        // 同时获取模板详情和数据源
+        const [templateResult, dataSourceResult] = await Promise.all([
+            getDocumentTemplateInfo(template.id),
+            getDocumentDataSources()
+        ])
+
+        placeholders.value = templateResult.data.placeholders || []
+        dataSources.value = dataSourceResult.data
+
+        // 初始化配置表单
+        initConfigForm(templateResult.data.placeholder_config)
+    } catch (error) {
+        ElMessage.error('加载数据失败')
+        console.error(error)
+    } finally {
+        loading.value = false
+    }
+}
+
+// 初始化配置表单
+const initConfigForm = (existingConfig: any) => {
+    configForm.configs = {}
+    
+    placeholders.value.forEach(placeholder => {
+        // 如果有现有配置，使用现有配置，否则使用默认值
+        const existing = existingConfig && existingConfig[placeholder]
+        
+        configForm.configs[placeholder] = {
+            name: existing?.name || placeholder,
+            data_source: existing?.data_source || 'manual',
+            table_name: existing?.table_name || '',
+            field_name: existing?.field_name || '',
+            process_function: existing?.process_function || '',
+            default_value: existing?.default_value || '',
+            is_required: existing?.is_required ?? true
+        }
+    })
+}
+
+// 数据源类型变化
+const onDataSourceChange = (placeholder: string) => {
+    if (configForm.configs[placeholder].data_source === 'manual') {
+        configForm.configs[placeholder].table_name = ''
+        configForm.configs[placeholder].field_name = ''
+    }
+}
+
+// 数据表变化
+const onTableChange = (placeholder: string) => {
+    configForm.configs[placeholder].field_name = ''
+}
+
+// 获取表字段
+const getTableFields = (tableName: string) => {
+    return dataSources.value[tableName]?.fields || []
+}
+
+// 保存配置
+const saveConfig = async () => {
+    if (!configFormRef.value) return
+    
+    const valid = await configFormRef.value.validate()
+    if (!valid) return
+
+    saveLoading.value = true
+    try {
+        await saveDocumentPlaceholderConfig({
+            template_id: configForm.template_id,
+            placeholder_config: configForm.configs
+        })
+        
+        ElMessage.success('配置保存成功')
+        handleClose()
+        emit('complete')
+    } catch (error) {
+        ElMessage.error(error.message || '保存失败')
+    } finally {
+        saveLoading.value = false
+    }
+}
+
+// 关闭对话框
+const handleClose = () => {
+    visible.value = false
+    templateInfo.value = {}
+    placeholders.value = []
+    configForm.configs = {}
+    configForm.template_id = 0
+}
+
+// 暴露方法给父组件
+defineExpose({
+    open
+})
+</script>
+
+<style scoped>
+.dialog-footer {
+    text-align: right;
+}
+
+.space-y-6 > * + * {
+    margin-top: 1.5rem;
+}
+
+.space-y-1 > * + * {
+    margin-top: 0.25rem;
+}
+</style>

admin/src/app/views/document-template/index.vue

@@ -0,0 +1,477 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-lg">Word模板管理</span>
+                <div class="space-x-2">
+                    <el-button type="primary" @click="uploadTemplate">
+                        <el-icon><Upload /></el-icon>
+                        上传模板
+                    </el-button>
+                    <el-button type="success" @click="generateDocument">
+                        <el-icon><Document /></el-icon>
+                        生成文档
+                    </el-button>
+                </div>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="templateTable.searchParam" ref="searchFormRef">
+                    <el-form-item label="模板名称" prop="contract_name">
+                        <el-input class="w-[280px]" v-model="templateTable.searchParam.contract_name" clearable placeholder="请输入模板名称" />
+                    </el-form-item>
+                    
+                    <el-form-item label="状态" prop="contract_status">
+                        <el-select class="w-[280px]" v-model="templateTable.searchParam.contract_status" clearable placeholder="请选择状态">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="草稿" value="draft"></el-option>
+                            <el-option label="启用" value="active"></el-option>
+                            <el-option label="禁用" value="disabled"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item label="类型" prop="contract_type">
+                        <el-select class="w-[280px]" v-model="templateTable.searchParam.contract_type" clearable placeholder="请选择类型">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="通用" value="general"></el-option>
+                            <el-option label="课程" value="course"></el-option>
+                            <el-option label="会员" value="membership"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item label="创建时间" prop="created_at">
+                        <el-date-picker v-model="templateTable.searchParam.created_at" type="datetimerange" 
+                            format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" />
+                    </el-form-item>
+                    
+                    <el-form-item>
+                        <el-button type="primary" @click="loadTemplateList()">搜索</el-button>
+                        <el-button @click="resetForm(searchFormRef)">重置</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="templateTable.data" size="large" v-loading="templateTable.loading">
+                    <template #empty>
+                        <span>{{ !templateTable.loading ? '暂无数据' : '' }}</span>
+                    </template>
+                    
+                    <el-table-column prop="contract_name" label="模板名称" min-width="200" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column label="原始文件名" min-width="180" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <span>{{ row.original_filename || '-' }}</span>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column label="文件大小" min-width="100" align="center">
+                        <template #default="{ row }">
+                            <span>{{ row.file_size_formatted || '-' }}</span>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column label="占位符数量" min-width="120" align="center">
+                        <template #default="{ row }">
+                            <el-tag type="info" size="small">{{ row.placeholders ? row.placeholders.length : 0 }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column label="状态" min-width="100" align="center">
+                        <template #default="{ row }">
+                            <el-tag :type="getStatusType(row.contract_status)" size="small">
+                                {{ getStatusText(row.contract_status) }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column label="类型" min-width="100" align="center">
+                        <template #default="{ row }">
+                            <el-tag type="primary" size="small" plain>
+                                {{ getTypeText(row.contract_type) }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column prop="created_at" label="创建时间" min-width="160" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column label="操作" fixed="right" min-width="280">
+                        <template #default="{ row }">
+                            <el-button type="primary" link size="small" @click="previewTemplate(row)">
+                                <el-icon><View /></el-icon>
+                                预览
+                            </el-button>
+                            <el-button type="warning" link size="small" @click="configPlaceholder(row)" v-if="row.contract_status === 'draft'">
+                                <el-icon><Setting /></el-icon>
+                                配置
+                            </el-button>
+                            <el-button type="success" link size="small" @click="generateFromTemplate(row)" v-if="row.contract_status === 'active'">
+                                <el-icon><Document /></el-icon>
+                                生成
+                            </el-button>
+                            <el-button type="info" link size="small" @click="copyTemplate(row)">
+                                <el-icon><CopyDocument /></el-icon>
+                                复制
+                            </el-button>
+                            <el-button type="danger" link size="small" @click="deleteTemplate(row)">
+                                <el-icon><Delete /></el-icon>
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="templateTable.page" v-model:page-size="templateTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="templateTable.total"
+                        @size-change="loadTemplateList()" @current-change="loadTemplateList" />
+                </div>
+            </div>
+
+            <!-- 上传模板对话框 -->
+            <el-dialog v-model="uploadDialog.visible" title="上传Word模板" width="500px" :before-close="closeUploadDialog">
+                <el-form :model="uploadDialog.form" label-width="100px" ref="uploadFormRef">
+                    <el-form-item label="模板名称" prop="template_name" :rules="[{required: true, message: '请输入模板名称'}]">
+                        <el-input v-model="uploadDialog.form.template_name" placeholder="请输入模板名称" />
+                    </el-form-item>
+                    <el-form-item label="模板类型" prop="template_type" :rules="[{required: true, message: '请选择模板类型'}]">
+                        <el-select v-model="uploadDialog.form.template_type" placeholder="请选择模板类型" style="width: 100%">
+                            <el-option label="通用" value="general"></el-option>
+                            <el-option label="课程" value="course"></el-option>
+                            <el-option label="会员" value="membership"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="选择文件" prop="file" :rules="[{required: true, message: '请选择Word文件'}]">
+                        <el-upload
+                            class="upload-demo"
+                            :before-upload="beforeUpload"
+                            :on-change="handleFileChange"
+                            :auto-upload="false"
+                            accept=".doc,.docx"
+                            :show-file-list="true"
+                            :limit="1">
+                            <el-button type="primary">
+                                <el-icon><Upload /></el-icon>
+                                选择文件
+                            </el-button>
+                            <template #tip>
+                                <div class="el-upload__tip">
+                                    只能上传 .doc/.docx 文件，且不超过 10MB
+                                </div>
+                            </template>
+                        </el-upload>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                        <el-input v-model="uploadDialog.form.remarks" type="textarea" :rows="3" placeholder="请输入备注信息" />
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <div class="dialog-footer">
+                        <el-button @click="closeUploadDialog">取消</el-button>
+                        <el-button type="primary" @click="submitUpload" :loading="uploadDialog.loading">
+                            {{ uploadDialog.loading ? '上传中...' : '上传' }}
+                        </el-button>
+                    </div>
+                </template>
+            </el-dialog>
+
+            <!-- 模板预览对话框 -->
+            <el-dialog v-model="previewDialog.visible" title="模板预览" width="800px">
+                <div v-if="previewDialog.loading" class="text-center py-8">
+                    <el-icon class="is-loading"><Loading /></el-icon>
+                    <span class="ml-2">加载中...</span>
+                </div>
+                <div v-else>
+                    <div class="mb-4">
+                        <h4>占位符列表：</h4>
+                        <div class="flex flex-wrap gap-2 mt-2">
+                            <el-tag v-for="placeholder in previewDialog.placeholders" :key="placeholder" size="small" type="info">
+                                {{ placeholder }}
+                            </el-tag>
+                        </div>
+                    </div>
+                    <div class="border rounded p-4 max-h-96 overflow-y-auto">
+                        <pre class="whitespace-pre-wrap text-sm">{{ previewDialog.content }}</pre>
+                    </div>
+                </div>
+            </el-dialog>
+
+            <!-- 占位符配置组件 -->
+            <PlaceholderConfig ref="placeholderConfigRef" @complete="loadTemplateList" />
+            
+            <!-- 文档生成组件 -->
+            <DocumentGenerate ref="documentGenerateRef" @complete="loadTemplateList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, onMounted } from 'vue'
+import { ElMessage, ElMessageBox, type FormInstance } from 'element-plus'
+import { getDocumentTemplateList, deleteDocumentTemplate, uploadDocumentTemplate, previewDocumentTemplate, copyDocumentTemplate } from '@/app/api/document'
+import PlaceholderConfig from './components/PlaceholderConfig.vue'
+import DocumentGenerate from './components/DocumentGenerate.vue'
+
+// 表格数据
+const templateTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: false,
+    data: [],
+    searchParam: {
+        contract_name: '',
+        contract_status: '',
+        contract_type: '',
+        created_at: []
+    }
+})
+
+// 上传对话框
+const uploadDialog = reactive({
+    visible: false,
+    loading: false,
+    form: {
+        template_name: '',
+        template_type: 'general',
+        remarks: '',
+        file: null
+    }
+})
+
+// 预览对话框
+const previewDialog = reactive({
+    visible: false,
+    loading: false,
+    content: '',
+    placeholders: []
+})
+
+// 组件引用
+const searchFormRef = ref<FormInstance>()
+const uploadFormRef = ref<FormInstance>()
+const placeholderConfigRef = ref()
+const documentGenerateRef = ref()
+
+// 获取模板列表
+const loadTemplateList = async () => {
+    templateTable.loading = true
+    try {
+        const { data } = await getDocumentTemplateList({
+            page: templateTable.page,
+            limit: templateTable.limit,
+            ...templateTable.searchParam
+        })
+        templateTable.data = data.data
+        templateTable.total = data.total
+    } catch (error) {
+        ElMessage.error('获取模板列表失败')
+    } finally {
+        templateTable.loading = false
+    }
+}
+
+// 重置搜索表单
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadTemplateList()
+}
+
+// 状态类型映射
+const getStatusType = (status: string) => {
+    const statusMap = {
+        'draft': 'info',
+        'active': 'success',
+        'disabled': 'danger'
+    }
+    return statusMap[status] || 'info'
+}
+
+// 状态文本映射
+const getStatusText = (status: string) => {
+    const statusMap = {
+        'draft': '草稿',
+        'active': '启用',
+        'disabled': '禁用'
+    }
+    return statusMap[status] || '未知'
+}
+
+// 类型文本映射
+const getTypeText = (type: string) => {
+    const typeMap = {
+        'general': '通用',
+        'course': '课程',
+        'membership': '会员'
+    }
+    return typeMap[type] || '未知'
+}
+
+// 上传模板
+const uploadTemplate = () => {
+    uploadDialog.visible = true
+    uploadDialog.form = {
+        template_name: '',
+        template_type: 'general',
+        remarks: '',
+        file: null
+    }
+}
+
+// 关闭上传对话框
+const closeUploadDialog = () => {
+    uploadDialog.visible = false
+    uploadDialog.form = {
+        template_name: '',
+        template_type: 'general',
+        remarks: '',
+        file: null
+    }
+}
+
+// 文件上传前验证
+const beforeUpload = (file: File) => {
+    const isValidType = file.type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' || 
+                       file.type === 'application/msword'
+    const isLt10M = file.size / 1024 / 1024 < 10
+
+    if (!isValidType) {
+        ElMessage.error('只能上传 Word 文档!')
+        return false
+    }
+    if (!isLt10M) {
+        ElMessage.error('文件大小不能超过 10MB!')
+        return false
+    }
+    return false // 阻止自动上传
+}
+
+// 文件选择变化
+const handleFileChange = (file: any) => {
+    uploadDialog.form.file = file.raw
+    // 自动设置模板名称
+    if (!uploadDialog.form.template_name) {
+        const fileName = file.name.replace(/\.[^/.]+$/, '')
+        uploadDialog.form.template_name = fileName
+    }
+}
+
+// 提交上传
+const submitUpload = async () => {
+    if (!uploadFormRef.value) return
+    
+    const valid = await uploadFormRef.value.validate()
+    if (!valid) return
+    
+    if (!uploadDialog.form.file) {
+        ElMessage.error('请选择要上传的文件')
+        return
+    }
+
+    uploadDialog.loading = true
+    try {
+        const formData = new FormData()
+        formData.append('file', uploadDialog.form.file)
+        formData.append('template_name', uploadDialog.form.template_name)
+        formData.append('template_type', uploadDialog.form.template_type)
+        formData.append('remarks', uploadDialog.form.remarks)
+
+        await uploadDocumentTemplate(formData)
+        ElMessage.success('模板上传成功')
+        closeUploadDialog()
+        loadTemplateList()
+    } catch (error) {
+        ElMessage.error(error.message || '上传失败')
+    } finally {
+        uploadDialog.loading = false
+    }
+}
+
+// 预览模板
+const previewTemplate = async (row: any) => {
+    previewDialog.visible = true
+    previewDialog.loading = true
+    try {
+        const { data } = await previewDocumentTemplate(row.id)
+        previewDialog.content = data.content
+        previewDialog.placeholders = data.placeholders
+    } catch (error) {
+        ElMessage.error('预览失败')
+    } finally {
+        previewDialog.loading = false
+    }
+}
+
+// 配置占位符
+const configPlaceholder = (row: any) => {
+    placeholderConfigRef.value?.open(row)
+}
+
+// 生成文档
+const generateDocument = () => {
+    documentGenerateRef.value?.open()
+}
+
+// 从模板生成文档
+const generateFromTemplate = (row: any) => {
+    documentGenerateRef.value?.open(row)
+}
+
+// 复制模板
+const copyTemplate = async (row: any) => {
+    try {
+        await copyDocumentTemplate(row.id)
+        ElMessage.success('模板复制成功')
+        loadTemplateList()
+    } catch (error) {
+        ElMessage.error('复制失败')
+    }
+}
+
+// 删除模板
+const deleteTemplate = (row: any) => {
+    ElMessageBox.confirm(
+        `确定要删除模板 "${row.contract_name}" 吗？此操作不可恢复！`,
+        '删除确认',
+        {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }
+    ).then(async () => {
+        try {
+            await deleteDocumentTemplate(row.id)
+            ElMessage.success('删除成功')
+            loadTemplateList()
+        } catch (error) {
+            ElMessage.error('删除失败')
+        }
+    }).catch(() => {
+        // 用户取消
+    })
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+    loadTemplateList()
+})
+</script>
+
+<style scoped>
+.main-container {
+    padding: 20px;
+}
+
+.table-search-wrap {
+    background-color: #f8f9fa;
+}
+
+.upload-demo {
+    width: 100%;
+}
+
+.dialog-footer {
+    text-align: right;
+}
+</style>

gift_table_documentation.md

@@ -0,0 +1,79 @@
+# 赠品表设计文档
+
+## 表结构说明
+
+### 表名：`gift`
+**用途**：存储系统中的赠品信息，包括赠课和代金券等赠品类型
+
+### 字段说明
+
+| 字段名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| `id` | int(11) | AUTO_INCREMENT | 赠品主键ID |
+| `gift_name` | varchar(255) | '' | 赠品名称 |
+| `gift_type` | varchar(50) | '' | 赠品类型：course(赠课),voucher(代金券) |
+| `gift_time` | int(11) | 0 | 赠送时间（时间戳） |
+| `giver_id` | int(11) | 0 | 赠送来源人员ID |
+| `resource_id` | int(11) | 0 | 赠品归属资源ID |
+| `order_id` | int(11) | 0 | 赠品使用的订单ID（0表示未使用） |
+| `gift_status` | tinyint(4) | 1 | 赠品状态：1=未使用,2=已使用,3=已过期,4=已作废 |
+| `use_time` | int(11) | 0 | 赠品使用时间（时间戳） |
+| `create_time` | int(11) | 0 | 创建时间（时间戳） |
+| `update_time` | int(11) | 0 | 更新时间（时间戳） |
+| `delete_time` | int(11) | 0 | 删除时间（时间戳，0表示未删除） |
+
+### 索引设计
+
+#### 主键索引
+- `PRIMARY KEY (id)` - 主键索引，自动创建
+
+#### 普通索引
+1. `IDX_gift_giver_id` - 赠送人员索引
+   - **用途**：根据赠送人员ID查询赠品
+   - **场景**：统计某个人员赠送的所有赠品
+
+2. `IDX_gift_resource_id` - 资源ID索引
+   - **用途**：根据资源ID查询相关赠品
+   - **场景**：查询某个资源相关的所有赠品
+
+3. `IDX_gift_order_id` - 订单ID索引
+   - **用途**：根据订单ID查询使用的赠品
+   - **场景**：查询某个订单中使用了哪些赠品
+
+4. `IDX_gift_status` - 状态索引
+   - **用途**：根据赠品状态快速筛选
+   - **场景**：查询未使用、已使用、已过期等状态的赠品
+
+5. `IDX_gift_type` - 类型索引
+   - **用途**：根据赠品类型快速筛选
+   - **场景**：分别查询赠课或代金券
+
+6. `IDX_gift_time` - 赠送时间索引
+   - **用途**：根据赠送时间范围查询
+   - **场景**：统计某个时间段的赠品发放情况
+
+### 业务逻辑说明
+
+#### 赠品状态流转
+1. **未使用(1)** → **已使用(2)**：用户使用赠品时更新
+2. **未使用(1)** → **已过期(3)**：系统定时任务检查过期
+3. **未使用(1)** → **已作废(4)**：管理员手动作废
+4. **已使用(2)**：终态，不可再变更
+
+#### 关键业务场景
+1. **赠品发放**：创建记录，设置 `gift_status=1`
+2. **赠品使用**：更新 `order_id`、`use_time`、`gift_status=2`
+3. **赠品过期**：定时任务更新 `gift_status=3`
+4. **赠品作废**：管理员操作更新 `gift_status=4`
+
+### 性能优化建议
+
+1. **复合索引考虑**：
+   - 如果经常按状态+类型查询，可考虑创建复合索引 `(gift_status, gift_type)`
+   - 如果经常按时间范围+状态查询，可考虑创建复合索引 `(gift_time, gift_status)`
+
+2. **分区表考虑**：
+   - 如果数据量很大，可考虑按时间分区
+
+3. **归档策略**：
+   - 定期归档已删除或过期的赠品数据

gift_table_migration.sql

@@ -0,0 +1,28 @@
+-- 赠品表设计
+-- 创建时间：2025-01-24
+-- 设计说明：根据项目现有数据库规范设计
+
+DROP TABLE IF EXISTS `shcool_resources_gift`;
+CREATE TABLE `shcool_resources_gift` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '赠品主键ID',
+  `gift_name` varchar(255) NOT NULL DEFAULT '' COMMENT '赠品名称',
+  `gift_type` varchar(50) NOT NULL DEFAULT '' COMMENT '赠品类型：course(赠课),voucher(代金券)',
+  `gift_time` int(11) NOT NULL DEFAULT 0 COMMENT '赠送时间',
+  `giver_id` int(11) NOT NULL DEFAULT 0 COMMENT '赠送来源人员ID',
+  `resource_id` int(11) NOT NULL DEFAULT 0 COMMENT '赠品归属资源ID',
+  `order_id` int(11) NOT NULL DEFAULT 0 COMMENT '赠品使用的订单ID（0表示未使用）',
+  `gift_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '赠品状态：1=未使用,2=已使用,3=已过期,4=已作废',
+  `use_time` int(11) NOT NULL DEFAULT 0 COMMENT '赠品使用时间',
+  `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `delete_time` int(11) NOT NULL DEFAULT 0 COMMENT '删除时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='赠品表' ROW_FORMAT=Dynamic;
+
+-- 添加索引
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_giver_id` (`giver_id`);
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_resource_id` (`resource_id`);
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_order_id` (`order_id`);
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_status` (`gift_status`);
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_type` (`gift_type`);
+ALTER TABLE `shcool_resources_gift` ADD INDEX `IDX_gift_time` (`gift_time`);

niucloud/app/adminapi/controller/document/DocumentTemplate.php

@@ -0,0 +1,241 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\controller\document;
+
+use core\base\BaseAdminController;
+use app\service\admin\document\DocumentTemplateService;
+use think\facade\Request;
+
+/**
+ * Word文档模板解析控制器
+ * Class DocumentTemplate
+ * @package app\adminapi\controller\document
+ */
+class DocumentTemplate extends BaseAdminController
+{
+    /**
+     * 获取模板列表
+     * @return \think\Response
+     */
+    public function lists()
+    {
+        $data = $this->request->params([
+            ["contract_status", ""],
+            ["contract_type", ""],
+            ["contract_name", ""],
+            ["created_at", ["", ""]]
+        ]);
+        return success((new DocumentTemplateService())->getPage($data));
+    }
+
+    /**
+     * 模板详情
+     * @param int $id
+     * @return \think\Response
+     */
+    public function info(int $id)
+    {
+        return success((new DocumentTemplateService())->getInfo($id));
+    }
+
+    /**
+     * 上传Word模板文件
+     * @return \think\Response
+     */
+    public function uploadTemplate()
+    {
+        try {
+            $file = Request::file('file');
+            if (!$file) {
+                return fail('FILE_UPLOAD_REQUIRED');
+            }
+
+            $result = (new DocumentTemplateService())->uploadTemplate($file);
+            return success('UPLOAD_SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 解析Word模板占位符
+     * @return \think\Response
+     */
+    public function parsePlaceholder()
+    {
+        $data = $this->request->params([
+            ["template_path", ""],
+            ["template_id", 0]
+        ]);
+
+        try {
+            $result = (new DocumentTemplateService())->parsePlaceholder($data);
+            return success('PARSE_SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 保存占位符配置
+     * @return \think\Response
+     */
+    public function savePlaceholderConfig()
+    {
+        $data = $this->request->params([
+            ["template_id", 0],
+            ["placeholder_config", []]
+        ]);
+
+        $this->validate($data, 'app\validate\document\DocumentTemplate.savePlaceholderConfig');
+
+        try {
+            (new DocumentTemplateService())->savePlaceholderConfig($data);
+            return success('SAVE_SUCCESS');
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 获取可用数据源列表（安全白名单）
+     * @return \think\Response
+     */
+    public function getDataSources()
+    {
+        try {
+            $result = (new DocumentTemplateService())->getDataSources();
+            return success('SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 生成Word文档
+     * @return \think\Response
+     */
+    public function generateDocument()
+    {
+        $data = $this->request->params([
+            ["template_id", 0],
+            ["fill_data", []],
+            ["output_filename", ""]
+        ]);
+
+        $this->validate($data, 'app\validate\document\DocumentTemplate.generateDocument');
+
+        try {
+            $result = (new DocumentTemplateService())->generateDocument($data);
+            return success('GENERATE_SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 下载生成的文档
+     * @param int $log_id
+     * @return \think\Response
+     */
+    public function downloadDocument(int $log_id)
+    {
+        try {
+            return (new DocumentTemplateService())->downloadDocument($log_id);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 获取文档生成记录
+     * @return \think\Response
+     */
+    public function getGenerateLog()
+    {
+        $data = $this->request->params([
+            ["template_id", 0],
+            ["user_id", 0],
+            ["status", ""],
+            ["created_at", ["", ""]]
+        ]);
+
+        return success((new DocumentTemplateService())->getGenerateLog($data));
+    }
+
+    /**
+     * 预览模板内容
+     * @param int $id
+     * @return \think\Response
+     */
+    public function previewTemplate(int $id)
+    {
+        try {
+            $result = (new DocumentTemplateService())->previewTemplate($id);
+            return success('SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 删除模板
+     * @param int $id
+     * @return \think\Response
+     */
+    public function delete(int $id)
+    {
+        try {
+            (new DocumentTemplateService())->delete($id);
+            return success('DELETE_SUCCESS');
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 复制模板
+     * @param int $id
+     * @return \think\Response
+     */
+    public function copy(int $id)
+    {
+        try {
+            $result = (new DocumentTemplateService())->copy($id);
+            return success('COPY_SUCCESS', $result);
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+
+    /**
+     * 批量删除生成记录
+     * @return \think\Response
+     */
+    public function batchDeleteLog()
+    {
+        $data = $this->request->params([
+            ["ids", []]
+        ]);
+
+        if (empty($data['ids'])) {
+            return fail('PARAM_ERROR');
+        }
+
+        try {
+            (new DocumentTemplateService())->batchDeleteLog($data['ids']);
+            return success('DELETE_SUCCESS');
+        } catch (\Exception $e) {
+            return fail($e->getMessage());
+        }
+    }
+}

niucloud/app/adminapi/route/document_template.php

@@ -0,0 +1,50 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+use think\facade\Route;
+use app\adminapi\middleware\AdminCheckRole;
+use app\adminapi\middleware\AdminCheckToken;
+use app\adminapi\middleware\AdminLog;
+
+// USER_CODE_BEGIN -- document_template
+
+Route::group('document_template', function () {
+    
+    // 模板管理
+    Route::get('lists', 'document.DocumentTemplate/lists');
+    Route::get('info/:id', 'document.DocumentTemplate/info');
+    Route::delete('delete/:id', 'document.DocumentTemplate/delete');
+    Route::post('copy/:id', 'document.DocumentTemplate/copy');
+    
+    // 模板上传和解析
+    Route::post('upload', 'document.DocumentTemplate/uploadTemplate');
+    Route::post('parse', 'document.DocumentTemplate/parsePlaceholder');
+    Route::get('preview/:id', 'document.DocumentTemplate/previewTemplate');
+    
+    // 占位符配置
+    Route::post('config/save', 'document.DocumentTemplate/savePlaceholderConfig');
+    Route::get('datasources', 'document.DocumentTemplate/getDataSources');
+    
+    // 文档生成
+    Route::post('generate', 'document.DocumentTemplate/generateDocument');
+    Route::get('download/:log_id', 'document.DocumentTemplate/downloadDocument');
+    
+    // 生成记录管理
+    Route::get('log/lists', 'document.DocumentTemplate/getGenerateLog');
+    Route::post('log/batch_delete', 'document.DocumentTemplate/batchDeleteLog');
+    
+})->middleware([
+    AdminCheckToken::class,
+    AdminCheckRole::class,
+    AdminLog::class
+]);
+
+// USER_CODE_END -- document_template

niucloud/app/api/controller/apiController/Common.php

@@ -110,5 +110,12 @@ class Common extends BaseApiService
         return success($res);
     }
 
+    //获取支付类型字典（员工端）
+    public function getPaymentTypes(Request $request)
+    {
+        $res = (new CommonService())->getPaymentTypes();
+        return success($res);
+    }
+
 
 }

niucloud/app/api/controller/apiController/Course.php

@@ -180,4 +180,155 @@ class Course extends BaseApiService
         }
     }
 
+    /**
+     * 获取课程安排详情
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function scheduleDetail(Request $request)
+    {
+        try {
+            $data = $this->request->params([
+                ["schedule_id", 0] // 课程安排ID
+            ]);
+            
+            if (empty($data['schedule_id'])) {
+                return fail('课程安排ID不能为空');
+            }
+            
+            $result = (new CourseService())->getScheduleDetail($data['schedule_id']);
+            if (!$result['code']) {
+                return fail($result['msg']);
+            }
+            
+            return success('获取成功', $result['data']);
+        } catch (\Exception $e) {
+            return fail('获取课程安排详情失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 搜索可添加的学员
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function searchStudents(Request $request)
+    {
+        try {
+            $data = $this->request->params([
+                ["keyword", ""], // 搜索关键词（姓名或手机号）
+                ["search_type", ""], // 搜索类型（name或phone）
+                ["schedule_id", 0] // 课程安排ID（用于排除已添加的学员）
+            ]);
+            
+            if (empty($data['keyword'])) {
+                return success('搜索成功', []);
+            }
+            
+            $result = (new CourseService())->searchAvailableStudents($data);
+            if (!$result['code']) {
+                return fail($result['msg']);
+            }
+            
+            return success('搜索成功', $result['data']);
+        } catch (\Exception $e) {
+            return fail('搜索学员失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 添加学员到课程安排
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function addStudentToSchedule(Request $request)
+    {
+        try {
+            $data = $this->request->params([
+                ["schedule_id", 0], // 课程安排ID
+                ["student_id", 0], // 学员ID（可选）
+                ["resources_id", 0], // 资源ID（可选）
+                ["person_type", ""], // 人员类型
+                ["schedule_type", 1], // 课程安排类型：1-临时课，2-固定课
+                ["course_type", 1], // 课程类型：1-加课，2-补课，3-等待位
+                ["remarks", ""] // 备注
+            ]);
+            
+            if (empty($data['schedule_id'])) {
+                return fail('课程安排ID不能为空');
+            }
+            
+            if (empty($data['student_id']) && empty($data['resources_id'])) {
+                return fail('学员ID或资源ID不能都为空');
+            }
+            
+            $result = (new CourseService())->addStudentToSchedule($data);
+            if (!$result['code']) {
+                return fail($result['msg']);
+            }
+            
+            return success('添加成功', $result['data']);
+        } catch (\Exception $e) {
+            return fail('添加学员失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 从课程安排中移除学员
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function removeStudentFromSchedule(Request $request)
+    {
+        try {
+            $data = $this->request->params([
+                ["person_schedule_id", 0], // 人员课程安排关系ID
+                ["reason", ""], // 移除原因
+                ["remark", ""] // 备注
+            ]);
+            
+            if (empty($data['person_schedule_id'])) {
+                return fail('人员课程安排关系ID不能为空');
+            }
+            
+            $result = (new CourseService())->removeStudentFromSchedule($data);
+            if (!$result['code']) {
+                return fail($result['msg']);
+            }
+            
+            return success('移除成功', $result['data']);
+        } catch (\Exception $e) {
+            return fail('移除学员失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 更新学员课程状态（请假等）
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function updateStudentStatus(Request $request)
+    {
+        try {
+            $data = $this->request->params([
+                ["person_schedule_id", 0], // 人员课程安排关系ID
+                ["status", 0], // 状态：0-待上课，1-已上课，2-请假
+                ["remark", ""] // 备注
+            ]);
+            
+            if (empty($data['person_schedule_id'])) {
+                return fail('人员课程安排关系ID不能为空');
+            }
+            
+            $result = (new CourseService())->updateStudentStatus($data);
+            if (!$result['code']) {
+                return fail($result['msg']);
+            }
+            
+            return success('更新成功', $result['data']);
+        } catch (\Exception $e) {
+            return fail('更新学员状态失败：' . $e->getMessage());
+        }
+    }
+
 }

niucloud/app/api/controller/apiController/CourseSchedule.php

@@ -269,4 +269,42 @@ class CourseSchedule extends BaseApiService
         $data = $request->all();
         return success((new CourseScheduleService())->getFilterOptions($data));
     }
+
+    /**
+     * 获取场地时间选项
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function getVenueTimeOptions(Request $request)
+    {
+        $data = $this->request->params([
+            ["venue_id", 0]
+        ]);
+        
+        if (empty($data['venue_id'])) {
+            return fail('场地ID不能为空');
+        }
+        
+        try {
+            // 获取场地信息
+            $venue = \think\facade\Db::name('venue')
+                ->where('id', $data['venue_id'])
+                ->where('deleted_at', 0)
+                ->find();
+                
+            if (empty($venue)) {
+                return fail('场地不存在');
+            }
+            
+            // 生成时间选项
+            $timeOptions = (new CourseScheduleService())->generateVenueTimeOptions($venue);
+            
+            return success('获取成功', [
+                'time_options' => $timeOptions,
+                'venue_capacity' => $venue['capacity']
+            ]);
+        } catch (\Exception $e) {
+            return fail('获取场地时间选项失败：' . $e->getMessage());
+        }
+    }
 }

niucloud/app/api/controller/apiController/CustomerResources.php

@@ -89,6 +89,7 @@ class CustomerResources extends BaseApiService
             "trial_class_count" => 2,
             "rf_type" => get_role_type($role_id),
             'campus' => $param['campus'] ?? '',
+            'referral_resource_id' => $param['referral_resource_id'] ?? 0, // 转介绍推荐人资源ID
         ];
 
         $six_speed_data = [

niucloud/app/api/controller/apiController/OrderTable.php

@@ -30,15 +30,19 @@ class OrderTable extends BaseApiService
     //订单-列表
     public function index(Request $request)
     {
-        $resource_id = $request->param('resource_id', '');//客户资源表school_customer_resources表id(两个参数2选1)
+        $resource_id = $request->param('resource_id', '');//客户资源表school_customer_resources表id
-        $staff_id = $request->param('staff_id', '');//员工表school_personnel表id(两个参数2选1)
+        $staff_id = $request->param('staff_id', '');//员工表school_personnel表id
-        if (empty($resource_id) && empty($staff_id)) {
+        $student_id = $request->param('student_id', '');//学生表school_student表id
-            return fail('缺少参数');
+        
+        // 至少需要一个查询条件
+        if (empty($resource_id) && empty($staff_id) && empty($student_id)) {
+            return fail('缺少查询参数');
         }
 
         $where = [
             'resource_id' => $resource_id,
             'staff_id' => $staff_id,
+            'student_id' => $student_id,
         ];
 
         $res = (new OrderTableService())->getList($where);
@@ -80,13 +84,23 @@ class OrderTable extends BaseApiService
             ["class_id", ""],    // 班级ID必填验证
             ["staff_id", ""],    // 员工ID（可选）
             ["resource_id", ""], // 客户资源表ID必填验证
-            ["order_type", ""], // 客户资源表ID必填验证
+            ["order_type", ""], // 订单类型必填验证
+            ["student_id", ""], // 学生ID必填验证
+            ["order_amount", ""], // 订单金额（可选，会从课程获取）
+            ["remark", ""] // 备注（可选）
         ]);
         
         // 验证必要参数
-        if(empty($params['payment_type']) || empty($params['course_id']) || 
+        $missing_params = [];
-           empty($params['class_id']) || empty($params['resource_id'])) {
+        if(empty($params['payment_type'])) $missing_params[] = 'payment_type(支付方式)';
-            return fail('缺少必要参数');
+        if(empty($params['course_id'])) $missing_params[] = 'course_id(课程ID)';
+        if(empty($params['class_id'])) $missing_params[] = 'class_id(班级ID)';
+        if(empty($params['resource_id'])) $missing_params[] = 'resource_id(客户资源ID)';
+        if(empty($params['order_type'])) $missing_params[] = 'order_type(订单类型)';
+        if(empty($params['student_id'])) $missing_params[] = 'student_id(学生ID)';
+        
+        if(!empty($missing_params)) {
+            return fail('缺少必要参数: ' . implode(', ', $missing_params));
         }
         
         // 如果前端没提供员工ID，使用当前登录的员工ID
@@ -125,6 +139,9 @@ class OrderTable extends BaseApiService
             'resource_id' => $params['resource_id'],//客户资源表id
             'campus_id' => $campus_id,//校区ID
             'order_type' => $params['order_type'],
+            'student_id' => $params['student_id'],//学生ID
+            'remark' => $params['remark'],//备注
+            'order_status' => 'pending',//订单状态，默认为待支付
         ];
 
         $res = (new OrderTableService())->addData($data);
@@ -135,4 +152,33 @@ class OrderTable extends BaseApiService
 
         return success([]);
     }
+
+    //订单-更新支付状态
+    public function updatePaymentStatus(Request $request)
+    {
+        $params = $request->params([
+            ["order_id", ""], // 订单ID必填
+            ["order_status", ""], // 订单状态必填: pending-待支付, paid-已支付, partial-部分支付, cancelled-已取消
+            ["payment_id", ""], // 支付单号（可选）
+        ]);
+        
+        // 验证必要参数
+        if(empty($params['order_id']) || empty($params['order_status'])) {
+            return fail('缺少必要参数');
+        }
+        
+        // 验证订单状态值
+        $allowedStatus = ['pending', 'paid', 'partial', 'cancelled', 'completed', 'refunded'];
+        if(!in_array($params['order_status'], $allowedStatus)) {
+            return fail('无效的订单状态');
+        }
+        
+        $res = (new OrderTableService())->updatePaymentStatus($params);
+        
+        if (!$res['code']) {
+            return fail($res['msg']);
+        }
+        
+        return success($res['data']);
+    }
 }

niucloud/app/api/route/route.php

@@ -76,7 +76,7 @@ Route::group(function () {
     Route::get('weapp/getMsgJumpPath', 'weapp.Weapp/getMsgJumpPath');
 
     //登录
-    Route::get('login', 'login.Login/login');
+//    Route::get('login', 'login.Login/login');
 
 
     //第三方绑定
@@ -177,7 +177,7 @@ Route::group(function () {
     //统一登录接口
     Route::post('login/unified', 'login.UnifiedLogin/login');
     //员工登录（兼容旧接口）
-    Route::post('personnelLogin', 'login.Login/personnelLogin');
+//    Route::post('personnelLogin', 'login.Login/personnelLogin');
     //获取字典
     Route::get('common/getDictionary', 'apiController.Common/getDictionary');
     //忘记密码-通过短信验证码进行密码重置(学生/员工通用)
@@ -191,6 +191,8 @@ Route::group(function () {
     Route::get('common/getCourseAll', 'apiController.Common/getCourseAll');
     //公共端-获取全部班级列表
     Route::get('common/getClassAll', 'apiController.Common/getClassAll');
+    //公共端-获取支付类型字典（员工端）
+    Route::get('common/getPaymentTypes', 'apiController.Common/getPaymentTypes');
 
 
 
@@ -294,6 +296,8 @@ Route::group(function () {
     Route::get('orderTable/info', 'apiController.OrderTable/info');
     //员工端-订单管理-创建
     Route::post('orderTable/add', 'apiController.OrderTable/add');
+    //员工端-订单管理-更新支付状态
+    Route::post('orderTable/updatePaymentStatus', 'apiController.OrderTable/updatePaymentStatus');
 
     //员工端-更新学员课程人员配置
     Route::post('updateStudentCoursePersonnel', 'apiController.Course/updateStudentCoursePersonnel');
@@ -325,6 +329,8 @@ Route::group(function () {
     Route::post('courseSchedule/leaveSchedule', 'apiController.CourseSchedule/leaveSchedule');
     //员工端-获取筛选选项
     Route::get('courseSchedule/filterOptions', 'apiController.CourseSchedule/getFilterOptions');
+    //员工端-获取场地时间选项
+    Route::get('courseSchedule/venueTimeOptions', 'apiController.CourseSchedule/getVenueTimeOptions');
 
     // 添加课程安排页面专用接口
     //获取课程列表（用于添加课程安排）
@@ -399,6 +405,12 @@ Route::group(function () {
 
     Route::post('course/schedule_del', 'apiController.course/schedule_del');
 
+    // 课程安排详情页面接口
+    Route::get('course/scheduleDetail', 'apiController.Course/scheduleDetail');
+    Route::get('course/searchStudents', 'apiController.Course/searchStudents');
+    Route::post('course/addStudentToSchedule', 'apiController.Course/addStudentToSchedule');
+    Route::post('course/removeStudentFromSchedule', 'apiController.Course/removeStudentFromSchedule');
+    Route::post('course/updateStudentStatus', 'apiController.Course/updateStudentStatus');
 
     Route::get('per_list_call_up', 'member.Member/list_call_up');
     Route::post('per_update_call_up', 'member.Member/update_call_up');

niucloud/app/job/schedule/HandleCourseSchedule.php

@@ -13,6 +13,7 @@ namespace app\job\schedule;
 
 use app\model\course_schedule\CourseSchedule;
 use core\base\BaseJob;
+use think\facade\Db;
 use think\facade\Log;
 
 /**
@@ -22,22 +23,81 @@ class HandleCourseSchedule extends BaseJob
 {
     public function doJob()
     {
-        Log::write('课程状态自动化任务开始' . date('Y-m-d h:i:s'));
+        // 添加执行锁，防止重复执行
-        $this->handleCourseStatus();
+        $lockFile = runtime_path() . 'course_status_update.lock';
-        return true;
+        if (file_exists($lockFile) && (time() - filemtime($lockFile)) < 300) { // 5分钟锁定
+            Log::write('课程状态更新任务正在执行中，跳过');
+            return ['status' => 'skipped', 'reason' => 'locked'];
+        }
+        
+        // 创建锁文件
+        file_put_contents($lockFile, time());
+        
+        try {
+            Log::write('课程状态自动化任务开始' . date('Y-m-d H:i:s'));
+            $result = $this->handleCourseStatus();
+            Log::write('课程状态自动化任务完成' . date('Y-m-d H:i:s'));
+            return $result;
+        } finally {
+            // 删除锁文件
+            if (file_exists($lockFile)) {
+                unlink($lockFile);
+            }
+        }
     }
 
     private function handleCourseStatus()
     {
-        $list = CourseSchedule::where('course_date','<',date('Y-m-d'))->select();
+        try {
-        if (!empty($list)) {
+            Db::startTrans();
-            foreach ($list as $item) {
+            
-                CourseSchedule::update([
+            // 批量更新，避免循环操作
-                    'status' => 'completed'
+            $yesterday = date('Y-m-d', strtotime('-1 day'));
-                ], [
+            
-                    'id' => $item['id']
+            // 先查询需要更新的记录数量
-                ]);
+            $totalCount = CourseSchedule::where('course_date', '<', date('Y-m-d'))
+                ->where('status', '<>', 'completed') // 避免重复更新已完成的课程
+                ->count();
+                
+            if ($totalCount == 0) {
+                Log::write('没有需要更新状态的过期课程');
+                Db::commit();
+                return [
+                    'status' => 'success',
+                    'total_count' => 0,
+                    'updated_count' => 0,
+                    'message' => '没有需要更新状态的过期课程'
+                ];
             }
+            
+            // 批量更新过期课程状态
+            $affectedRows = CourseSchedule::where('course_date', '<', date('Y-m-d'))
+                ->where('status', '<>', 'completed') // 避免重复更新
+                ->update([
+                    'status' => 'completed',
+                    'updated_at' => time()
+                ]);
+            
+            Log::write('批量更新了' . $affectedRows . '个过期课程状态为已完成，总共检查了' . $totalCount . '个课程');
+            
+            Db::commit();
+            
+            return [
+                'status' => 'success',
+                'total_count' => $totalCount,
+                'updated_count' => $affectedRows,
+                'message' => '成功更新' . $affectedRows . '个过期课程状态'
+            ];
+            
+        } catch (\Exception $e) {
+            Db::rollback();
+            Log::write('更新课程状态失败：' . $e->getMessage());
+            return [
+                'status' => 'failed',
+                'total_count' => 0,
+                'updated_count' => 0,
+                'error' => $e->getMessage()
+            ];
         }
     }
 }

niucloud/app/job/transfer/schedule/CourseScheduleJob.php

@@ -14,8 +14,42 @@ class CourseScheduleJob extends BaseJob
      */
     public function doJob()
     {
-        Log::write('开始执行自动排课任务');
+        // 添加执行锁，防止重复执行
-        return $this->copyCoursesToFutureDays(30);
+        $lockFile = runtime_path() . 'course_schedule.lock';
+        if (file_exists($lockFile) && (time() - filemtime($lockFile)) < 600) { // 10分钟锁定
+            Log::write('自动排课任务正在执行中，跳过');
+            return ['status' => 'skipped', 'reason' => 'locked'];
+        }
+        
+        // 创建锁文件
+        file_put_contents($lockFile, time());
+        
+        try {
+            Log::write('开始执行自动排课任务');
+            
+            // 检查今天是否已经执行过
+            $today = date('Y-m-d');
+            $executionFlag = runtime_path() . 'course_schedule_' . $today . '.flag';
+            
+            if (file_exists($executionFlag)) {
+                Log::write('今天已经执行过自动排课，跳过');
+                return ['status' => 'skipped', 'reason' => 'already_executed_today'];
+            }
+            
+            // 执行排课任务
+            $result = $this->copyCoursesToFutureDays(30);
+            
+            // 创建执行标记文件
+            file_put_contents($executionFlag, time());
+            
+            Log::write('自动排课任务执行完成');
+            return $result;
+        } finally {
+            // 删除锁文件
+            if (file_exists($lockFile)) {
+                unlink($lockFile);
+            }
+        }
     }
 
     /**
@@ -25,23 +59,41 @@ class CourseScheduleJob extends BaseJob
      */
     public function copyCoursesToFutureDays($days = 30)
     {
-        // 获取今天日期
+        // 获取基准日期 - 使用最近一个工作日的自动排课作为模板
-        $today = date('Y-m-d');
+        $baseDate = $this->getLatestAutoScheduleDate();
+        
+        if (empty($baseDate)) {
+            Log::write('未找到自动排课模板数据');
+            return [
+                'status' => 'failed',
+                'reason' => 'no_template_data',
+                'total' => 0,
+                'inserted' => 0,
+                'skipped' => 0
+            ];
+        }
         
-        // 获取所有今天auto_schedule=1的课程
+        // 获取基准日期的所有auto_schedule=1的课程
         $autoSchedules = CourseSchedule::where('auto_schedule', 1)
-            ->where('course_date', $today)
+            ->where('course_date', $baseDate)
             ->select();
         
-        Log::write('找到' . count($autoSchedules) . '个今天需要自动排课的课程');
+        Log::write('找到' . count($autoSchedules) . '个基于日期 ' . $baseDate . ' 的自动排课模板');
         
         $results = [
+            'status' => 'success',
+            'base_date' => $baseDate,
             'total' => count($autoSchedules),
             'inserted' => 0,
             'skipped' => 0,
             'details' => []
         ];
         
+        if (count($autoSchedules) == 0) {
+            Log::write('没有找到自动排课模板，跳过执行');
+            return $results;
+        }
+        
         // 遍历每个课程，复制到未来30天
         foreach ($autoSchedules as $schedule) {
             $courseResults = $this->copyCourseToFutureDays($schedule, $days);
@@ -202,4 +254,35 @@ class CourseScheduleJob extends BaseJob
 
         return $newSchedule;
     }
+    
+    /**
+     * 获取最近一个有自动排课数据的日期
+     * @return string|null 最近的自动排课日期
+     */
+    protected function getLatestAutoScheduleDate()
+    {
+        // 查找最近7天内有自动排课的日期
+        $latestDate = CourseSchedule::where('auto_schedule', 1)
+            ->where('course_date', '>=', date('Y-m-d', strtotime('-7 days')))
+            ->where('course_date', '<=', date('Y-m-d'))
+            ->order('course_date', 'desc')
+            ->value('course_date');
+        
+        if ($latestDate) {
+            Log::write('使用日期 ' . $latestDate . ' 作为自动排课模板');
+            return $latestDate;
+        }
+        
+        // 如果最近7天没有，则查找历史数据中最新的
+        $latestDate = CourseSchedule::where('auto_schedule', 1)
+            ->order('course_date', 'desc')
+            ->value('course_date');
+        
+        if ($latestDate) {
+            Log::write('使用历史日期 ' . $latestDate . ' 作为自动排课模板');
+            return $latestDate;
+        }
+        
+        return null;
+    }
 }

niucloud/app/job/transfer/schedule/PerformanceCalculation.php

@@ -44,7 +44,7 @@ class PerformanceCalculation extends BaseJob
      */
     public function __construct()
     {
-        $this->performanceService = null;
+        $this->performanceService = new PerformanceService();
     }
 
     /**
@@ -52,58 +52,106 @@ class PerformanceCalculation extends BaseJob
      */
     public function doJob()
     {
-        Log::write('开始执行销售绩效核算');
+        // 添加执行锁，防止重复执行
-        
+        $lockFile = runtime_path() . 'performance_calculation.lock';
-        // 获取所有需要计算绩效的订单
+        if (file_exists($lockFile) && (time() - filemtime($lockFile)) < 1800) { // 30分钟锁定
-        $orders = $this->getOrders();
+            Log::write('销售绩效核算任务正在执行中，跳过');
-        if (empty($orders)) {
+            return ['status' => 'skipped', 'reason' => 'locked'];
-            Log::write('没有需要计算绩效的订单');
-            return;
         }
         
-        // 获取绩效配置
+        // 创建锁文件
-        $performanceConfig = $this->getPerformanceConfig();
+        file_put_contents($lockFile, time());
-        if (empty($performanceConfig)) {
-            Log::write('未找到绩效配置');
-            return;
-        }
         
-        // 计算每个订单的绩效
+        try {
-        $results = [];
+            Log::write('开始执行销售绩效核算');
-        foreach ($orders as $order) {
-            // 首先判断是否为内部员工资源
-            $isInternalStaffResource = $this->isInternalStaffResource($order);
             
-            if ($isInternalStaffResource) {
+            // 获取所有需要计算绩效的订单
-                // 处理内部员工资源的绩效计算
+            $orders = $this->getOrders();
-                $internalResult = $this->calculateInternalStaffPerformance($order, $performanceConfig);
+            if (empty($orders)) {
-                if (!empty($internalResult)) {
+                Log::write('没有需要计算绩效的订单');
-                    $results[] = $internalResult;
+                return ['status' => 'success', 'processed' => 0, 'message' => '没有需要计算绩效的订单'];
-                }
+            }
-            } else {
+            
-                // 判断是否为多人介入的订单
+            // 获取绩效配置
-                $isMultiPersonInvolved = $this->isMultiPersonInvolved($order);
+            $performanceConfig = $this->getPerformanceConfig();
-                
+            if (empty($performanceConfig)) {
-                if ($isMultiPersonInvolved) {
+                Log::write('未找到绩效配置');
-                    // 处理多人介入的绩效计算
+                return ['status' => 'failed', 'message' => '未找到绩效配置'];
-                    $multiResults = $this->calculateMultiPersonPerformance($order, $performanceConfig);
+            }
-                    if (!empty($multiResults)) {
+            
-                        $results = array_merge($results, $multiResults);
+            // 计算每个订单的绩效
+            $results = [];
+            $successCount = 0;
+            $failedCount = 0;
+            
+            foreach ($orders as $order) {
+                try {
+                    // 首先判断是否为内部员工资源
+                    $isInternalStaffResource = $this->isInternalStaffResource($order);
+                    
+                    if ($isInternalStaffResource) {
+                        // 处理内部员工资源的绩效计算
+                        $internalResult = $this->calculateInternalStaffPerformance($order, $performanceConfig);
+                        if (!empty($internalResult) && $internalResult['status'] == 'success') {
+                            $results[] = $internalResult;
+                            $successCount++;
+                        } else {
+                            $failedCount++;
+                        }
+                    } else {
+                        // 判断是否为多人介入的订单
+                        $isMultiPersonInvolved = $this->isMultiPersonInvolved($order);
+                        
+                        if ($isMultiPersonInvolved) {
+                            // 处理多人介入的绩效计算
+                            $multiResults = $this->calculateMultiPersonPerformance($order, $performanceConfig);
+                            if (!empty($multiResults)) {
+                                foreach ($multiResults as $result) {
+                                    if ($result['status'] == 'success') {
+                                        $results[] = $result;
+                                        $successCount++;
+                                    } else {
+                                        $failedCount++;
+                                    }
+                                }
+                            } else {
+                                $failedCount++;
+                            }
+                        } else {
+                            // 处理单人的绩效计算
+                            $result = $this->calculateOrderPerformance($order, $performanceConfig);
+                            if (!empty($result) && $result['status'] == 'success') {
+                                $results[] = $result;
+                                $successCount++;
+                            } else {
+                                $failedCount++;
+                            }
+                        }
                     }
-                } else {
+                } catch (\Exception $e) {
-                    // 处理单人的绩效计算
+                    Log::write('处理订单绩效计算失败，订单ID：' . $order['id'] . '，错误：' . $e->getMessage());
-                    $result = $this->calculateOrderPerformance($order, $performanceConfig);
+                    $failedCount++;
-                    $results[] = $result;
                 }
             }
+            
+            // 保存绩效结果
+            $saveResult = $this->savePerformanceResults($results);
+            
+            Log::write('销售绩效核算完成，共处理' . count($orders) . '个订单，成功：' . $successCount . '个，失败：' . $failedCount . '个');
+            
+            return [
+                'status' => 'success',
+                'total_orders' => count($orders),
+                'success_count' => $successCount,
+                'failed_count' => $failedCount,
+                'save_result' => $saveResult
+            ];
+        } finally {
+            // 删除锁文件
+            if (file_exists($lockFile)) {
+                unlink($lockFile);
+            }
         }
-        
-        // 保存绩效结果
-        $this->savePerformanceResults($results);
-        
-        Log::write('销售绩效核算完成，共处理' . count($results) . '个订单');
-        
-        return $results;
     }
     
     /**
@@ -732,81 +780,105 @@ class PerformanceCalculation extends BaseJob
     /**
      * 保存绩效计算结果
      * @param array $results 绩效计算结果
+     * @return array 保存结果统计
      */
     protected function savePerformanceResults($results)
     {
         if (empty($results)) {
-            return;
+            return ['saved' => 0, 'skipped' => 0, 'failed' => 0];
         }
         
+        $savedCount = 0;
+        $skippedCount = 0;
+        $failedCount = 0;
+        $processedOrders = [];
+        
         try {
             Db::startTrans();
             
+            // 按订单分组处理，避免重复更新订单状态
+            $orderGroups = [];
             foreach ($results as $result) {
                 if ($result['status'] == 'success') {
-                    // 先检查订单是否已经计算过绩效
+                    $orderGroups[$result['order_id']][] = $result;
-                    $existingRecord = Db::name('school_performance_summary')
+                }
-                        ->where('order_id', $result['order_id'])
+            }
-                        ->where('staff_id', $result['staff_id'])
+            
+            foreach ($orderGroups as $orderId => $orderResults) {
+                try {
+                    // 检查订单是否已经完全处理过
+                    $existingCount = Db::name('school_performance_summary')
+                        ->where('order_id', $orderId)
                         ->where('performance_type', PerformanceService::PERFORMANCE_TYPE_SALES)
-                        ->find();
+                        ->count();
                     
-                    if ($existingRecord) {
+                    if ($existingCount > 0) {
-                        Log::write('订单ID：' . $result['order_id'] . ' 员工ID：' . $result['staff_id'] . ' 已存在绩效记录，跳过');
+                        Log::write('订单ID：' . $orderId . ' 已存在绩效记录，跳过整个订单');
+                        $skippedCount += count($orderResults);
                         continue;
                     }
                     
-                    // 更新订单表，标记已计算绩效并记录核算时间
+                    // 处理当前订单的所有绩效记录
-                    // 只有在处理完所有绩效记录后才更新订单表的核算状态
+                    $orderPerformanceAmount = 0;
-                    if (!isset($result['is_multi_person']) || !$result['is_multi_person']) {
+                    foreach ($orderResults as $result) {
-                        OrderTable::where('id', $result['order_id'])
+                        // 保存到绩效表 school_sales_performance
-                            ->update([
+                        $performanceData = [
-                                'performance_calculated' => 1,
+                            'personnel_id' => $result['personnel_id'],
-                                'performance_amount' => $result['performance_amount'],
+                            'campus_id' => $result['campus_id'] ?? 0,
-                                'accounting_time' => time() // 记录核算时间
+                            'performance_amount' => $result['performance_amount'],
-                            ]);
+                            'new_resource_count' => $result['new_resource_count'] ?? 0,
+                            'renew_resource_count' => $result['renew_resource_count'] ?? 0,
+                            'performance_date' => $result['performance_date'],
+                            'performance_config' => $result['performance_config'] ?? '',
+                            'performance_algorithm' => $result['performance_algorithm'] ?? '',
+                            'created_at' => $result['created_at'],
+                            'updated_at' => $result['updated_at']
+                        ];
+                        
+                        Db::name('school_sales_performance')->insert($performanceData);
+                        $orderPerformanceAmount += $result['performance_amount'];
+                        $savedCount++;
+                        
+                        Log::write('成功保存绩效记录，订单ID：' . $orderId . '，员工ID：' . $result['personnel_id'] . '，绩效金额：' . $result['performance_amount']);
                     }
                     
-                    // 保存到绩效表 school_sales_performance
+                    // 统一更新订单状态（每个订单只更新一次）
-                    $performanceData = [
+                    OrderTable::where('id', $orderId)
-                        'personnel_id' => $result['personnel_id'],
+                        ->update([
-                        'campus_id' => $result['campus_id'],
+                            'performance_calculated' => 1,
-                        'performance_amount' => $result['performance_amount'],
+                            'performance_amount' => $orderPerformanceAmount,
-                        'new_resource_count' => $result['new_resource_count'],
+                            'accounting_time' => time()
-                        'renew_resource_count' => $result['renew_resource_count'],
+                        ]);
-                        'performance_date' => $result['performance_date'],
-                        'performance_config' => $result['performance_config'],
-                        'performance_algorithm' => $result['performance_algorithm'],
-                        'created_at' => $result['created_at'],
-                        'updated_at' => $result['updated_at']
-                    ];
                     
-                    Db::name('school_sales_performance')->insert($performanceData);
+                    $processedOrders[] = $orderId;
                     
-                    Log::write('成功保存绩效记录，员工ID：' . $result['personnel_id'] . '，绩效金额：' . $result['performance_amount'] . '，核算时间：' . date('Y-m-d H:i:s', time()));
+                } catch (\Exception $e) {
+                    Log::write('处理订单ID：' . $orderId . ' 的绩效记录失败：' . $e->getMessage());
+                    $failedCount += count($orderResults);
                 }
             }
             
-            // 更新所有已处理订单的状态
+            Db::commit();
-            $orderIds = array_unique(array_column(array_filter($results, function($result) {
-                return $result['status'] == 'success';
-            }), 'order_id'));
             
-            if (!empty($orderIds)) {
+            Log::write('成功保存绩效计算结果，保存：' . $savedCount . '个，跳过：' . $skippedCount . '个，失败：' . $failedCount . '个');
-                OrderTable::whereIn('id', $orderIds)
+            Log::write('成功更新' . count($processedOrders) . '个订单的核算状态');
-                    ->update([
+            
-                        'performance_calculated' => 1,
+            return [
-                        'accounting_time' => time()
+                'saved' => $savedCount,
-                    ]);
+                'skipped' => $skippedCount,
-                
+                'failed' => $failedCount,
-                Log::write('成功更新' . count($orderIds) . '个订单的核算状态');
+                'processed_orders' => count($processedOrders)
-            }
+            ];
             
-            Db::commit();
-            Log::write('成功保存绩效计算结果');
         } catch (\Exception $e) {
             Db::rollback();
             Log::write('保存绩效计算结果失败：' . $e->getMessage());
+            return [
+                'saved' => 0,
+                'skipped' => 0,
+                'failed' => count($results),
+                'error' => $e->getMessage()
+            ];
         }
     }
     
@@ -818,7 +890,12 @@ class PerformanceCalculation extends BaseJob
     public function addPerformanceSummary(array $data)
     {
         try {
-            return $this->performanceService->addPerformance($data);
+            if ($this->performanceService) {
+                return $this->performanceService->addPerformance($data);
+            } else {
+                Log::write('PerformanceService 未初始化');
+                return 0;
+            }
         } catch (\Exception $e) {
             Log::write('添加绩效汇总记录失败：' . $e->getMessage());
             return 0;

niucloud/app/job/transfer/schedule/ResourceAutoAllocation.php

@@ -4,40 +4,63 @@ namespace app\job\transfer\schedule;
 
 use app\model\campus_person_role\CampusPersonRole;
 use app\model\resource_sharing\ResourceSharing;
-use core\base\BaseJob;
+use core\base\BaseScheduleJob;
 use think\facade\Db;
 use think\facade\Log;
 
 /**
  * 自动分配资源
  */
-class ResourceAutoAllocation extends BaseJob
+class ResourceAutoAllocation extends BaseScheduleJob
 {
     /**
-     * 执行任务
+     * 任务名称
+     * @var string
      */
-    public function doJob()
+    protected $jobName = 'resource_allocation';
+    
+    /**
+     * 锁定时间（5分钟）
+     * @var int
+     */
+    protected $lockTimeout = 300;
+    
+    /**
+     * 执行具体任务
+     * @return array
+     */
+    protected function executeJob()
     {
-        Log::write('开始自动分配资源');
-        
         // 获取待分配的资源
         $resources = $this->getResource();
         if (empty($resources)) {
             Log::write('没有可分配的资源');
-            return;
+            return $this->getSuccessResult([
+                'allocated' => 0,
+                'message' => '没有可分配的资源'
+            ]);
         }
         
         // 获取销售人员
         $salesmen = $this->getSalesman();
         if (empty($salesmen)) {
             Log::write('没有可用的销售人员');
-            return;
+            return $this->getSuccessResult([
+                'allocated' => 0,
+                'message' => '没有可用的销售人员'
+            ]);
         }
         
         // 分配资源
-        $this->allocateResource($resources, $salesmen);
+        $result = $this->allocateResource($resources, $salesmen);
-        
+        
-        Log::write('资源分配完成');
+        return $this->getSuccessResult([
+            'allocated' => $result['allocated'] ?? 0,
+            'updated' => $result['updated'] ?? 0,
+            'created' => $result['created'] ?? 0,
+            'total_resources' => count($resources),
+            'total_salesmen' => count($salesmen)
+        ]);
     }
 
     /**
@@ -126,38 +149,68 @@ class ResourceAutoAllocation extends BaseJob
             // 选择资源最少的销售人员
             $targetSalesman = $currentSalesmen[0];
             
-            // 插入新的资源共享记录
+            // 更新现有资源记录，而不是插入新记录
             try {
                 Db::startTrans();
                 
-                // 插入新的资源分配记录
+                // 检查是否存在该资源的分配记录
-                $insertData = [
+                $existingRecord = ResourceSharing::where('id', $resource['id'])->find();
-                    'resource_id' => $resource['resource_id'],
-                    'user_id' => $targetSalesman['person_id'],
-                    'role_id' => $targetSalesman['role_id'],
-                    'shared_by' => $targetSalesman['person_id'], // shared_by是接收资源的人员ID
-                    'shared_at' => date('Y-m-d H:i:s')
-                ];
                 
-                ResourceSharing::create($insertData);
+                if ($existingRecord) {
+                    // 更新现有记录
+                    $updateData = [
+                        'user_id' => $targetSalesman['person_id'],
+                        'role_id' => $targetSalesman['role_id'],
+                        'shared_by' => $targetSalesman['person_id'],
+                        'shared_at' => date('Y-m-d H:i:s'),
+                        'updated_at' => time()
+                    ];
+                    
+                    ResourceSharing::where('id', $resource['id'])->update($updateData);
+                    
+                    Log::write('更新资源分配记录，资源ID：' . $resource['resource_id'] . ' 分配给销售人员ID：' . $targetSalesman['person_id']);
+                } else {
+                    // 如果记录不存在，创建新记录
+                    $insertData = [
+                        'resource_id' => $resource['resource_id'],
+                        'user_id' => $targetSalesman['person_id'],
+                        'role_id' => $targetSalesman['role_id'],
+                        'shared_by' => $targetSalesman['person_id'],
+                        'shared_at' => date('Y-m-d H:i:s'),
+                        'created_at' => time(),
+                        'updated_at' => time()
+                    ];
+                    
+                    ResourceSharing::create($insertData);
+                    
+                    Log::write('创建新资源分配记录，资源ID：' . $resource['resource_id'] . ' 分配给销售人员ID：' . $targetSalesman['person_id']);
+                }
                 
                 // 记录分配结果
                 $allocations[] = [
                     'resource_id' => $resource['resource_id'],
-                    'salesman_id' => $targetSalesman['person_id']
+                    'salesman_id' => $targetSalesman['person_id'],
+                    'action' => $existingRecord ? 'updated' : 'created'
                 ];
                 
                 Db::commit();
                 
-                Log::write('资源ID：' . $resource['resource_id'] . ' 分配给销售人员ID：' . $targetSalesman['person_id']);
-                
             } catch (\Exception $e) {
                 Db::rollback();
                 Log::write('资源分配失败：' . $e->getMessage());
             }
         }
         
-        Log::write('成功分配' . count($allocations) . '个资源');
+        $updatedCount = count(array_filter($allocations, function($a) { return $a['action'] == 'updated'; }));
+        $createdCount = count(array_filter($allocations, function($a) { return $a['action'] == 'created'; }));
+        
+        Log::write('成功分配' . count($allocations) . '个资源，其中更新：' . $updatedCount . '个，新建：' . $createdCount . '个');
+        
+        return [
+            'allocated' => count($allocations),
+            'updated' => $updatedCount,
+            'created' => $createdCount
+        ];
     }
     
     /**

niucloud/app/model/document/DocumentDataSourceConfig.php

@@ -0,0 +1,99 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\document;
+
+use core\base\BaseModel;
+
+/**
+ * 文档数据源配置模型
+ * Class DocumentDataSourceConfig
+ * @package app\model\document
+ */
+class DocumentDataSourceConfig extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'document_data_source_config';
+
+    /**
+     * 搜索器:表名
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchTableNameAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("table_name", $value);
+        }
+    }
+
+    /**
+     * 搜索器:字段名
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchFieldNameAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("field_name", $value);
+        }
+    }
+
+    /**
+     * 搜索器:状态
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchIsActiveAttr($query, $value, $data)
+    {
+        if ($value !== '') {
+            $query->where("is_active", $value);
+        }
+    }
+
+    /**
+     * 字段类型获取器
+     * @param $value
+     * @return string
+     */
+    public function getFieldTypeTextAttr($value)
+    {
+        $typeMap = [
+            'text' => '文本',
+            'number' => '数字',
+            'date' => '日期',
+            'datetime' => '日期时间'
+        ];
+        return $typeMap[$this->getAttr('field_type')] ?? '文本';
+    }
+
+    /**
+     * 状态获取器
+     * @param $value
+     * @return string
+     */
+    public function getIsActiveTextAttr($value)
+    {
+        return $this->getAttr('is_active') ? '启用' : '禁用';
+    }
+}

niucloud/app/model/document/DocumentGenerateLog.php

@@ -0,0 +1,133 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\document;
+
+use core\base\BaseModel;
+use think\model\relation\BelongsTo;
+
+/**
+ * 文档生成记录模型
+ * Class DocumentGenerateLog
+ * @package app\model\document
+ */
+class DocumentGenerateLog extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'document_generate_log';
+
+    /**
+     * 关联模板
+     * @return BelongsTo
+     */
+    public function template()
+    {
+        return $this->belongsTo(\app\model\contract\Contract::class, 'template_id', 'id');
+    }
+
+    /**
+     * 搜索器:状态
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchStatusAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("status", $value);
+        }
+    }
+
+    /**
+     * 搜索器:模板ID
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchTemplateIdAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("template_id", $value);
+        }
+    }
+
+    /**
+     * 搜索器:用户ID
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchUserIdAttr($query, $value, $data)
+    {
+        if ($value) {
+            $query->where("user_id", $value);
+        }
+    }
+
+    /**
+     * 搜索器:创建时间
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchCreatedAtAttr($query, $value, $data)
+    {
+        $start = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start > 0 && $end > 0) {
+            $query->where([["created_at", "between", [$start, $end]]]);
+        } else if ($start > 0 && $end == 0) {
+            $query->where([["created_at", ">=", $start]]);
+        } else if ($start == 0 && $end > 0) {
+            $query->where([["created_at", "<=", $end]]);
+        }
+    }
+
+    /**
+     * 状态获取器
+     * @param $value
+     * @return string
+     */
+    public function getStatusTextAttr($value)
+    {
+        $statusMap = [
+            'pending' => '等待中',
+            'processing' => '处理中',
+            'completed' => '已完成',
+            'failed' => '失败'
+        ];
+        return $statusMap[$this->getAttr('status')] ?? '未知';
+    }
+
+    /**
+     * 用户类型获取器
+     * @param $value
+     * @return string
+     */
+    public function getUserTypeTextAttr($value)
+    {
+        $typeMap = [
+            'admin' => '管理员',
+            'staff' => '员工',
+            'member' => '会员'
+        ];
+        return $typeMap[$this->getAttr('user_type')] ?? '未知';
+    }
+}

niucloud/app/model/order_table/OrderTable.php

@@ -24,6 +24,8 @@ use app\model\class_grade\ClassGrade;
 
 use app\model\personnel\Personnel;
 
+use app\model\student_courses\StudentCourses;
+
 /**
  * 订单模型
  * Class OrderTable
@@ -98,4 +100,9 @@ class OrderTable extends BaseModel
        return $this->hasOne(Personnel::class, 'id', 'staff_id')->joinType('left')->withField('name,id')->bind(['staff_id_name'=>'name']);
     }
 
+    //学员课程表-课时信息
+    public function studentCourses(){
+       return $this->hasOne(StudentCourses::class, 'id', 'course_plan_id')->joinType('left')->withField('total_hours,gift_hours,use_total_hours,use_gift_hours')->bind(['total_hours'=>'total_hours','gift_hours'=>'gift_hours','use_total_hours'=>'use_total_hours','use_gift_hours'=>'use_gift_hours']);
+    }
+
 }

niucloud/app/service/admin/document/DocumentTemplateService.php

@@ -0,0 +1,680 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\service\admin\document;
+
+use app\model\contract\Contract;
+use app\model\document\DocumentGenerateLog;
+use app\model\document\DocumentDataSourceConfig;
+use core\base\BaseAdminService;
+use PhpOffice\PhpWord\IOFactory;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\TemplateProcessor;
+use think\facade\Filesystem;
+use think\facade\Log;
+use think\Response;
+
+/**
+ * Word文档模板解析服务层
+ * Class DocumentTemplateService  
+ * @package app\service\admin\document
+ */
+class DocumentTemplateService extends BaseAdminService
+{
+    protected $contractModel;
+    protected $logModel;
+    protected $dataSourceModel;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->contractModel = new Contract();
+        $this->logModel = new DocumentGenerateLog();
+        $this->dataSourceModel = new DocumentDataSourceConfig();
+    }
+
+    /**
+     * 获取模板列表
+     * @param array $where
+     * @return array
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'id,contract_name,contract_template,contract_status,contract_type,remarks,original_filename,file_size,placeholders,created_at,updated_at';
+        $order = 'id desc';
+
+        $search_model = $this->contractModel->withSearch(["contract_status", "contract_type", "created_at"], $where)->field($field)->order($order);
+        $list = $this->pageQuery($search_model);
+        
+        // 处理数据格式
+        if (!empty($list['data'])) {
+            foreach ($list['data'] as &$item) {
+                $item['placeholders'] = $item['placeholders'] ? json_decode($item['placeholders'], true) : [];
+                $item['file_size_formatted'] = $this->formatFileSize($item['file_size']);
+            }
+        }
+        
+        return $list;
+    }
+
+    /**
+     * 获取模板详情
+     * @param int $id
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'id,contract_name,contract_template,contract_content,contract_status,contract_type,remarks,placeholder_config,original_filename,file_size,file_hash,placeholders,created_at,updated_at';
+
+        $info = $this->contractModel->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        
+        if (!empty($info)) {
+            $info['placeholder_config'] = $info['placeholder_config'] ? json_decode($info['placeholder_config'], true) : [];
+            $info['placeholders'] = $info['placeholders'] ? json_decode($info['placeholders'], true) : [];
+            $info['file_size_formatted'] = $this->formatFileSize($info['file_size']);
+        }
+        
+        return $info;
+    }
+
+    /**
+     * 上传Word模板文件
+     * @param $file
+     * @return array
+     * @throws \Exception
+     */
+    public function uploadTemplate($file)
+    {
+        // 验证文件类型
+        $allowedTypes = ['docx', 'doc'];
+        $extension = strtolower($file->getOriginalExtension());
+        
+        if (!in_array($extension, $allowedTypes)) {
+            throw new \Exception('只支持 .docx 和 .doc 格式的Word文档');
+        }
+
+        // 验证文件大小 (最大10MB)
+        $maxSize = 10 * 1024 * 1024;
+        if ($file->getSize() > $maxSize) {
+            throw new \Exception('文件大小不能超过10MB');
+        }
+
+        // 生成文件hash防重复
+        $fileHash = md5_file($file->getRealPath());
+        
+        // 检查是否已存在相同文件
+        $existingFile = $this->contractModel->where('file_hash', $fileHash)->find();
+        if ($existingFile) {
+            throw new \Exception('该文件已经上传过了，模板名称：' . $existingFile['contract_name']);
+        }
+
+        try {
+            // 保存文件
+            $savePath = Filesystem::disk('public')->putFile('contract_templates', $file);
+            
+            if (!$savePath) {
+                throw new \Exception('文件保存失败');
+            }
+
+            // 解析Word文档内容和占位符
+            $fullPath = public_path() . '/upload/' . $savePath;
+            $parseResult = $this->parseWordTemplate($fullPath);
+
+            // 准备保存到数据库的数据
+            $data = [
+                'site_id' => $this->site_id,
+                'contract_name' => pathinfo($file->getOriginalName(), PATHINFO_FILENAME),
+                'contract_template' => $savePath,
+                'contract_content' => $parseResult['content'],
+                'contract_status' => 'draft',
+                'contract_type' => 'general',
+                'original_filename' => $file->getOriginalName(),
+                'file_size' => $file->getSize(),
+                'file_hash' => $fileHash,
+                'placeholders' => json_encode($parseResult['placeholders'])
+            ];
+
+            // 保存到数据库
+            $template = $this->contractModel->create($data);
+
+            return [
+                'id' => $template->id,
+                'template_name' => $data['contract_name'],
+                'file_path' => $savePath,
+                'placeholders' => $parseResult['placeholders'],
+                'placeholder_count' => count($parseResult['placeholders'])
+            ];
+
+        } catch (\Exception $e) {
+            // 如果保存失败，删除已上传的文件
+            if (isset($savePath)) {
+                Filesystem::disk('public')->delete($savePath);
+            }
+            throw new \Exception('模板上传失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 解析Word模板占位符
+     * @param array $data
+     * @return array
+     * @throws \Exception
+     */
+    public function parsePlaceholder(array $data)
+    {
+        if (!empty($data['template_id'])) {
+            // 从数据库获取模板信息
+            $template = $this->contractModel->find($data['template_id']);
+            if (!$template) {
+                throw new \Exception('模板不存在');
+            }
+            $templatePath = public_path() . '/upload/' . $template['contract_template'];
+        } else if (!empty($data['template_path'])) {
+            $templatePath = $data['template_path'];
+        } else {
+            throw new \Exception('请提供模板文件路径或模板ID');
+        }
+
+        if (!file_exists($templatePath)) {
+            throw new \Exception('模板文件不存在');
+        }
+
+        return $this->parseWordTemplate($templatePath);
+    }
+
+    /**
+     * 解析Word模板文件内容
+     * @param string $filePath
+     * @return array
+     * @throws \Exception
+     */
+    private function parseWordTemplate(string $filePath)
+    {
+        try {
+            // 读取Word文档
+            $templateProcessor = new TemplateProcessor($filePath);
+            
+            // 获取文档内容（简化版本，实际可能需要更复杂的解析）
+            $content = $this->extractWordContent($filePath);
+            
+            // 提取占位符 - 匹配 {{...}} 格式
+            $placeholders = $this->extractPlaceholders($content);
+            
+            return [
+                'content' => $content,
+                'placeholders' => $placeholders
+            ];
+
+        } catch (\Exception $e) {
+            Log::error('Word模板解析失败：' . $e->getMessage());
+            throw new \Exception('Word模板解析失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 提取Word文档内容
+     * @param string $filePath
+     * @return string
+     */
+    private function extractWordContent(string $filePath)
+    {
+        try {
+            $phpWord = IOFactory::load($filePath);
+            $content = '';
+            
+            // 遍历所有章节
+            foreach ($phpWord->getSections() as $section) {
+                foreach ($section->getElements() as $element) {
+                    if (method_exists($element, 'getText')) {
+                        $content .= $element->getText() . "\n";
+                    }
+                }
+            }
+            
+            return $content;
+        } catch (\Exception $e) {
+            Log::error('提取Word内容失败：' . $e->getMessage());
+            return '';
+        }
+    }
+
+    /**
+     * 从内容中提取占位符
+     * @param string $content
+     * @return array
+     */
+    private function extractPlaceholders(string $content)
+    {
+        $placeholders = [];
+        
+        // 匹配 {{变量名}} 格式的占位符
+        if (preg_match_all('/\{\{([^}]+)\}\}/', $content, $matches)) {
+            foreach ($matches[1] as $placeholder) {
+                $placeholder = trim($placeholder);
+                if (!in_array($placeholder, $placeholders)) {
+                    $placeholders[] = $placeholder;
+                }
+            }
+        }
+        
+        return $placeholders;
+    }
+
+    /**
+     * 保存占位符配置
+     * @param array $data
+     * @return bool
+     * @throws \Exception
+     */
+    public function savePlaceholderConfig(array $data)
+    {
+        $template = $this->contractModel->find($data['template_id']);
+        if (!$template) {
+            throw new \Exception('模板不存在');
+        }
+
+        // 验证配置数据
+        $config = $data['placeholder_config'];
+        foreach ($config as $placeholder => $settings) {
+            if ($settings['data_source'] === 'database') {
+                // 验证数据源是否在白名单中
+                $isAllowed = $this->dataSourceModel
+                    ->where('site_id', $this->site_id)
+                    ->where('table_name', $settings['table_name'])
+                    ->where('field_name', $settings['field_name'])
+                    ->where('is_active', 1)
+                    ->find();
+                
+                if (!$isAllowed) {
+                    throw new \Exception("数据源 {$settings['table_name']}.{$settings['field_name']} 不在允许的范围内");
+                }
+            }
+        }
+
+        // 保存配置
+        $template->placeholder_config = json_encode($config);
+        $template->contract_status = 'active'; // 配置完成后激活模板
+        $template->save();
+
+        return true;
+    }
+
+    /**
+     * 获取可用数据源列表
+     * @return array
+     */
+    public function getDataSources()
+    {
+        $dataSources = $this->dataSourceModel
+            ->where('site_id', $this->site_id)
+            ->where('is_active', 1)
+            ->order('table_name,sort_order')
+            ->select()
+            ->toArray();
+
+        // 按表名分组
+        $grouped = [];
+        foreach ($dataSources as $item) {
+            $grouped[$item['table_name']]['table_alias'] = $item['table_alias'];
+            $grouped[$item['table_name']]['fields'][] = [
+                'field_name' => $item['field_name'],
+                'field_alias' => $item['field_alias'],
+                'field_type' => $item['field_type']
+            ];
+        }
+
+        return $grouped;
+    }
+
+    /**
+     * 生成Word文档
+     * @param array $data
+     * @return array
+     * @throws \Exception
+     */
+    public function generateDocument(array $data)
+    {
+        $template = $this->contractModel->find($data['template_id']);
+        if (!$template) {
+            throw new \Exception('模板不存在');
+        }
+
+        if (empty($template['placeholder_config'])) {
+            throw new \Exception('模板尚未配置占位符');
+        }
+
+        // 创建生成记录
+        $logData = [
+            'site_id' => $this->site_id,
+            'template_id' => $data['template_id'],
+            'user_id' => $this->uid,
+            'user_type' => 'admin',
+            'fill_data' => json_encode($data['fill_data']),
+            'status' => 'pending',
+            'created_at' => time(),
+            'updated_at' => time()
+        ];
+
+        $log = $this->logModel->create($logData);
+
+        try {
+            // 更新状态为处理中
+            $log->status = 'processing';
+            $log->process_start_time = date('Y-m-d H:i:s');
+            $log->save();
+
+            // 准备填充数据
+            $placeholderConfig = json_decode($template['placeholder_config'], true);
+            $fillValues = $this->prepareFillData($placeholderConfig, $data['fill_data']);
+
+            // 生成文档
+            $templatePath = public_path() . '/upload/' . $template['contract_template'];
+            $outputFileName = $data['output_filename'] ?: ($template['contract_name'] . '_' . date('YmdHis') . '.docx');
+            $outputPath = 'generated_documents/' . date('Y/m/') . $outputFileName;
+            $fullOutputPath = public_path() . '/upload/' . $outputPath;
+
+            // 确保目录存在
+            $outputDir = dirname($fullOutputPath);
+            if (!is_dir($outputDir)) {
+                mkdir($outputDir, 0755, true);
+            }
+
+            // 使用 PhpWord 模板处理器
+            $templateProcessor = new TemplateProcessor($templatePath);
+            
+            foreach ($fillValues as $placeholder => $value) {
+                $templateProcessor->setValue($placeholder, $value);
+            }
+
+            $templateProcessor->saveAs($fullOutputPath);
+
+            // 更新生成记录
+            $log->status = 'completed';
+            $log->generated_file_path = $outputPath;
+            $log->generated_file_name = $outputFileName;
+            $log->process_end_time = date('Y-m-d H:i:s');
+            $log->save();
+
+            return [
+                'log_id' => $log->id,
+                'file_path' => $outputPath,
+                'file_name' => $outputFileName,
+                'download_url' => url('/upload/' . $outputPath)
+            ];
+
+        } catch (\Exception $e) {
+            // 更新记录为失败状态
+            $log->status = 'failed';
+            $log->error_msg = $e->getMessage();
+            $log->process_end_time = date('Y-m-d H:i:s');
+            $log->save();
+
+            throw new \Exception('文档生成失败：' . $e->getMessage());
+        }
+    }
+
+    /**
+     * 准备填充数据
+     * @param array $placeholderConfig
+     * @param array $userFillData
+     * @return array
+     */
+    private function prepareFillData(array $placeholderConfig, array $userFillData)
+    {
+        $fillValues = [];
+
+        foreach ($placeholderConfig as $placeholder => $config) {
+            $value = '';
+
+            if ($config['data_source'] === 'manual') {
+                // 手动填写的数据
+                $value = $userFillData[$placeholder] ?? $config['default_value'] ?? '';
+            } else if ($config['data_source'] === 'database') {
+                // 从数据库获取数据
+                $value = $this->getDataFromDatabase($config, $userFillData);
+            }
+
+            // 应用处理函数
+            if (!empty($config['process_function'])) {
+                $value = $this->applyProcessFunction($value, $config['process_function']);
+            }
+
+            $fillValues[$placeholder] = $value;
+        }
+
+        return $fillValues;
+    }
+
+    /**
+     * 从数据库获取数据
+     * @param array $config
+     * @param array $userFillData
+     * @return string
+     */
+    private function getDataFromDatabase(array $config, array $userFillData)
+    {
+        try {
+            $tableName = $config['table_name'];
+            $fieldName = $config['field_name'];
+            
+            // 简单的数据库查询（实际应用中需要更完善的查询逻辑）
+            $model = new \think\Model();
+            $result = $model->table($tableName)->field($fieldName)->find();
+            
+            return $result[$fieldName] ?? $config['default_value'] ?? '';
+        } catch (\Exception $e) {
+            Log::error('数据库查询失败：' . $e->getMessage());
+            return $config['default_value'] ?? '';
+        }
+    }
+
+    /**
+     * 应用处理函数
+     * @param mixed $value
+     * @param string $functionName
+     * @return string
+     */
+    private function applyProcessFunction($value, string $functionName)
+    {
+        switch ($functionName) {
+            case 'formatDate':
+                return $value ? date('Y年m月d日', strtotime($value)) : '';
+            case 'formatDateTime':
+                return $value ? date('Y年m月d日 H:i', strtotime($value)) : '';
+            case 'formatNumber':
+                return is_numeric($value) ? number_format($value, 2) : $value;
+            case 'toUpper':
+                return strtoupper($value);
+            case 'toLower':
+                return strtolower($value);
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * 下载生成的文档
+     * @param int $logId
+     * @return Response
+     * @throws \Exception
+     */
+    public function downloadDocument(int $logId)
+    {
+        $log = $this->logModel->find($logId);
+        if (!$log) {
+            throw new \Exception('记录不存在');
+        }
+
+        if ($log['status'] !== 'completed') {
+            throw new \Exception('文档尚未生成完成');
+        }
+
+        $filePath = public_path() . '/upload/' . $log['generated_file_path'];
+        if (!file_exists($filePath)) {
+            throw new \Exception('文件不存在');
+        }
+
+        // 更新下载统计
+        $log->download_count = $log->download_count + 1;
+        $log->last_download_time = date('Y-m-d H:i:s');
+        $log->save();
+
+        // 返回文件下载响应
+        return download($filePath, $log['generated_file_name']);
+    }
+
+    /**
+     * 获取生成记录
+     * @param array $where
+     * @return array
+     */
+    public function getGenerateLog(array $where = [])
+    {
+        $field = 'id,template_id,user_id,user_type,generated_file_name,status,download_count,created_at,process_start_time,process_end_time';
+        $order = 'id desc';
+
+        $searchModel = $this->logModel
+            ->alias('log')
+            ->join('school_contract template', 'log.template_id = template.id')
+            ->field($field . ',template.contract_name')
+            ->where('log.site_id', $this->site_id)
+            ->order($order);
+
+        // 添加搜索条件
+        if (!empty($where['template_id'])) {
+            $searchModel->where('log.template_id', $where['template_id']);
+        }
+        if (!empty($where['status'])) {
+            $searchModel->where('log.status', $where['status']);
+        }
+
+        return $this->pageQuery($searchModel);
+    }
+
+    /**
+     * 格式化文件大小
+     * @param int $size
+     * @return string
+     */
+    private function formatFileSize(int $size)
+    {
+        $units = ['B', 'KB', 'MB', 'GB'];
+        $index = 0;
+        
+        while ($size >= 1024 && $index < count($units) - 1) {
+            $size /= 1024;
+            $index++;
+        }
+        
+        return round($size, 2) . ' ' . $units[$index];
+    }
+
+    /**
+     * 预览模板
+     * @param int $id
+     * @return array
+     * @throws \Exception
+     */
+    public function previewTemplate(int $id)
+    {
+        $template = $this->contractModel->find($id);
+        if (!$template) {
+            throw new \Exception('模板不存在');
+        }
+
+        return [
+            'content' => $template['contract_content'],
+            'placeholders' => json_decode($template['placeholders'], true) ?: []
+        ];
+    }
+
+    /**
+     * 删除模板
+     * @param int $id
+     * @return bool
+     * @throws \Exception
+     */
+    public function delete(int $id)
+    {
+        $template = $this->contractModel->find($id);
+        if (!$template) {
+            throw new \Exception('模板不存在');
+        }
+
+        // 删除关联的生成记录和文件
+        $logs = $this->logModel->where('template_id', $id)->select();
+        foreach ($logs as $log) {
+            if ($log['generated_file_path']) {
+                $filePath = public_path() . '/upload/' . $log['generated_file_path'];
+                if (file_exists($filePath)) {
+                    unlink($filePath);
+                }
+            }
+        }
+        $this->logModel->where('template_id', $id)->delete();
+
+        // 删除模板文件
+        if ($template['contract_template']) {
+            $templatePath = public_path() . '/upload/' . $template['contract_template'];
+            if (file_exists($templatePath)) {
+                unlink($templatePath);
+            }
+        }
+
+        // 删除数据库记录
+        return $template->delete();
+    }
+
+    /**
+     * 复制模板
+     * @param int $id
+     * @return array
+     * @throws \Exception
+     */
+    public function copy(int $id)
+    {
+        $template = $this->contractModel->find($id);
+        if (!$template) {
+            throw new \Exception('模板不存在');
+        }
+
+        $newData = $template->toArray();
+        unset($newData['id']);
+        $newData['contract_name'] = $newData['contract_name'] . '_副本';
+        $newData['created_at'] = date('Y-m-d H:i:s');
+        $newData['updated_at'] = date('Y-m-d H:i:s');
+
+        $newTemplate = $this->contractModel->create($newData);
+
+        return ['id' => $newTemplate->id];
+    }
+
+    /**
+     * 批量删除生成记录
+     * @param array $ids
+     * @return bool
+     */
+    public function batchDeleteLog(array $ids)
+    {
+        $logs = $this->logModel->whereIn('id', $ids)->select();
+        
+        foreach ($logs as $log) {
+            if ($log['generated_file_path']) {
+                $filePath = public_path() . '/upload/' . $log['generated_file_path'];
+                if (file_exists($filePath)) {
+                    unlink($filePath);
+                }
+            }
+        }
+
+        return $this->logModel->whereIn('id', $ids)->delete();
+    }
+}

niucloud/app/service/api/apiService/CommonService.php

@@ -290,6 +290,31 @@ class CommonService extends BaseApiService
         return $res;
     }
 
+    //获取支付类型字典（员工端过滤client_wxpay）
+    public function getPaymentTypes()
+    {
+        $dictData = $this->getDictionary(['key' => 'payment_type']);
+        
+        if (empty($dictData)) {
+            return [];
+        }
+        
+        // 如果已经是数组，直接使用；如果是JSON字符串，则解析
+        $paymentTypes = is_array($dictData) ? $dictData : json_decode($dictData, true);
+        
+        if (!is_array($paymentTypes)) {
+            return [];
+        }
+        
+        // 过滤掉员工端不可选的支付类型
+        $filteredTypes = array_filter($paymentTypes, function($type) {
+            return isset($type['value']) && $type['value'] !== 'client_wxpay';
+        });
+        
+        // 重新索引数组
+        return array_values($filteredTypes);
+    }
+
 
 
 }

niucloud/app/service/api/apiService/CourseScheduleService.php

@@ -416,18 +416,9 @@ class CourseScheduleService extends BaseApiService
                 'status_options' => [] // 状态选项
             ];
             
-            // 获取教练列表
+            // 获取教练列表（基于教练部门dept_id=23）
-            $result['coaches'] = Db::name('personnel')
+            $result['coaches'] = $this->getCoachListWithPermission();
-                ->where('is_coach', 1)
-                ->where('deleted_at', 0)
-                ->field('id, name, head_img as avatar, phone')
-                ->select()
-                ->toArray();
                 
-            foreach ($result['coaches'] as &$coach) {
-                $coach['avatar'] = $coach['avatar'] ? $this->formatImageUrl($coach['avatar']) : '';
-            }
-            
             // 获取课程列表
             $result['courses'] = Db::name('course')
                 ->where('deleted_at', 0)
@@ -438,21 +429,17 @@ class CourseScheduleService extends BaseApiService
             // 获取班级列表
             $result['classes'] = Db::name('class')
                 ->where('deleted_at', 0)
-                ->field('id, class_name, class_level, total_students')
+                ->field('id, class_name, age_group, status')
                 ->select()
                 ->toArray();
                 
-            // 获取场地列表
+            // 获取场地列表（基于校区权限）
-            $result['venues'] = Db::name('venue')
+            $result['venues'] = $this->getVenueListWithPermission();
-                ->where('deleted_at', 0)
-                ->field('id, venue_name, capacity, description')
-                ->select()
-                ->toArray();
                 
             // 获取校区列表
             $result['campuses'] = Db::name('campus')
-                ->where('deleted_at', 0)
+                ->where('delete_time', 0)
-                ->field('id, campus_name, address')
+                ->field('id, campus_name, campus_address')
                 ->select()
                 ->toArray();
                 
@@ -545,7 +532,7 @@ class CourseScheduleService extends BaseApiService
             if (!empty($schedule['class_id'])) {
                 $schedule['class_info'] = Db::name('class')
                     ->where('id', $schedule['class_id'])
-                    ->field('id, class_name, class_level, total_students')
+                    ->field('id, class_name, age_group, status')
                     ->find();
             } else {
                 $schedule['class_info'] = null;
@@ -869,4 +856,130 @@ class CourseScheduleService extends BaseApiService
         
         return ['code' => 1];
     }
+
+    /**
+     * 获取教练列表（基于教练部门权限）
+     * @return array 教练列表
+     */
+    private function getCoachListWithPermission()
+    {
+        try {
+            $query = Db::name('personnel')
+                ->alias('p')
+                ->join($this->prefix . 'campus_person_role cpr', 'p.id = cpr.person_id')
+                ->join($this->prefix . 'sys_role sr', 'cpr.role_id = sr.role_id')
+                ->where('sr.dept_id', 23) // 教练部门
+                ->where('p.deleted_at', 0)
+                ->field('p.id, p.name, p.head_img as avatar, p.phone');
+
+            // 如果当前用户有校区权限，则只显示同校区的教练
+            if (!empty($this->campus_id)) {
+                $query->where('cpr.campus_id', $this->campus_id);
+            }
+
+            $coaches = $query->group('p.id')
+                ->select()
+                ->toArray();
+
+            // 处理头像路径
+            foreach ($coaches as &$coach) {
+                $coach['avatar'] = $coach['avatar'] ? $this->formatImageUrl($coach['avatar']) : '';
+            }
+
+            return $coaches;
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * 获取场地列表（基于校区权限）
+     * @return array 场地列表
+     */
+    private function getVenueListWithPermission()
+    {
+        try {
+            $query = Db::name('venue')
+                ->where('deleted_at', 0)
+                ->where('availability_status', 1) // 只获取可用场地
+                ->field('id, venue_name, capacity, time_range_type, time_range_start, time_range_end, fixed_time_ranges, campus_id');
+
+            // 如果当前用户有校区权限，则只显示同校区的场地
+            if (!empty($this->campus_id)) {
+                $query->where('campus_id', $this->campus_id);
+            }
+
+            return $query->select()->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * 根据场地生成可用时间选项
+     * @param array $venue 场地信息
+     * @return array 时间选项列表
+     */
+    public function generateVenueTimeOptions($venue)
+    {
+        $timeOptions = [];
+
+        switch ($venue['time_range_type']) {
+            case 'fixed':
+                // 固定时间段
+                if (!empty($venue['fixed_time_ranges'])) {
+                    $fixedRanges = json_decode($venue['fixed_time_ranges'], true);
+                    if (is_array($fixedRanges)) {
+                        foreach ($fixedRanges as $range) {
+                            $startTime = $range['start_time'] ?? '';
+                            $endTime = $range['end_time'] ?? '';
+                            if ($startTime && $endTime) {
+                                $timeOptions[] = [
+                                    'value' => $startTime . '-' . $endTime,
+                                    'text' => $startTime . '-' . $endTime
+                                ];
+                            }
+                        }
+                    }
+                }
+                break;
+
+            case 'range':
+                // 时间范围
+                if (!empty($venue['time_range_start']) && !empty($venue['time_range_end'])) {
+                    $start = strtotime($venue['time_range_start']);
+                    $end = strtotime($venue['time_range_end']);
+                    
+                    // 每小时生成一个时间段
+                    for ($time = $start; $time < $end; $time += 3600) {
+                        $startTimeStr = date('H:i', $time);
+                        $endTimeStr = date('H:i', $time + 3600);
+                        $timeOptions[] = [
+                            'value' => $startTimeStr . '-' . $endTimeStr,
+                            'text' => $startTimeStr . '-' . $endTimeStr
+                        ];
+                    }
+                }
+                break;
+
+            case 'all':
+            default:
+                // 全天可用，默认8:30开始，每小时一档
+                $start = strtotime('08:30');
+                $end = strtotime('22:00');
+                
+                // 每小时生成一个时间段，保持30分钟对齐
+                for ($time = $start; $time < $end; $time += 3600) {
+                    $startTimeStr = date('H:i', $time);
+                    $endTimeStr = date('H:i', $time + 3600);
+                    $timeOptions[] = [
+                        'value' => $startTimeStr . '-' . $endTimeStr,
+                        'text' => $startTimeStr . '-' . $endTimeStr
+                    ];
+                }
+                break;
+        }
+
+        return $timeOptions;
+    }
 }

niucloud/app/service/api/apiService/CourseService.php

@@ -601,7 +601,7 @@ class CourseService extends BaseApiService
             }
             
             // 只获取有效课程（未逻辑删除）
-            $where[] = ['deleted_at', '=', 0];
+            // 注意：Course模型使用软删除，保留deleted_at条件
             
             $courseList = $this->model
                 ->where($where)
@@ -625,5 +625,635 @@ class CourseService extends BaseApiService
         }
     }
 
+    /**
+     * 获取课程安排详情
+     * @param int $scheduleId 课程安排ID
+     * @return array
+     */
+    public function getScheduleDetail($scheduleId)
+    {
+        try {
+            $CourseSchedule = new CourseSchedule();
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            
+            // 获取课程安排基本信息
+            $schedule = $CourseSchedule
+                ->where('id', $scheduleId)
+                ->with(['course', 'venue', 'campus'])
+                ->find();
+                
+            if (!$schedule) {
+                return [
+                    'code' => 0,
+                    'msg' => '课程安排不存在',
+                    'data' => []
+                ];
+            }
+            
+            // 获取已安排的学员列表（包括正式学员和等待位）
+            $students = $PersonCourseSchedule
+                ->where('schedule_id', $scheduleId)
+                ->where(function($query) {
+                    $query->where('deleted_at', 0)->whereOr('deleted_at', null);
+                })
+                ->with(['student', 'resources'])
+                ->order('course_type ASC, created_at ASC')
+                ->select()
+                ->toArray();
+            
+            // 分组学员数据
+            $formalStudents = []; // 正式学员
+            $waitingStudents = []; // 等待位学员
+            
+            foreach ($students as $student) {
+                // 获取学员信息
+                $name = '';
+                $age = 0;
+                $phone = '';
+                $trialClassCount = 0;
+                $studentCourseInfo = null;
+                $courseUsageInfo = null;
+                
+                if ($student['person_type'] == 'student' && !empty($student['student'])) {
+                    // 正式学员
+                    $name = $student['student']['name'] ?: '';
+                    $age = $student['student']['age'] ?: 0;
+                    $phone = $student['student']['contact_phone'] ?: '';
+                    $trialClassCount = $student['student']['trial_class_count'] ?: 0;
+                    
+                    // 获取学员最新的付费课程信息
+                    $studentCourseInfo = Db::name('student_courses')
+                        ->where('student_id', $student['student_id'])
+                        ->order('created_at DESC')
+                        ->find();
+                        
+                    // 如果有付费课程，获取使用情况
+                    if ($studentCourseInfo) {
+                        $courseUsageInfo = Db::name('student_course_usage')
+                            ->where('student_course_id', $studentCourseInfo['id'])
+                            ->select()
+                            ->toArray();
+                    }
+                } elseif ($student['person_type'] == 'customer_resource' && !empty($student['resources'])) {
+                    // 客户资源
+                    $name = $student['resources']['name'] ?: '';
+                    $age = $student['resources']['age'] ?: 0;
+                    $phone = $student['resources']['phone_number'] ?: '';
+                }
+                
+                // 计算剩余课时和续费状态
+                $remainingHours = 0;
+                $totalHours = 0;
+                $usedHours = 0;
+                $needsRenewal = false;
+                $isTrialStudent = false; // 是否为体验课学员
+                
+                if ($studentCourseInfo) {
+                    // 付费学员
+                    $totalRegularHours = intval($studentCourseInfo['total_hours'] ?: 0);
+                    $totalGiftHours = intval($studentCourseInfo['gift_hours'] ?: 0);
+                    $usedRegularHours = intval($studentCourseInfo['use_total_hours'] ?: 0);
+                    $usedGiftHours = intval($studentCourseInfo['use_gift_hours'] ?: 0);
+                    
+                    $totalHours = $totalRegularHours + $totalGiftHours;
+                    $usedHours = $usedRegularHours + $usedGiftHours;
+                    $remainingHours = $totalHours - $usedHours;
+                    
+                    // 判断是否需要续费
+                    // 条件1：end_date距离今天不足10天
+                    $endDate = $studentCourseInfo['end_date'];
+                    if ($endDate) {
+                        $daysUntilExpiry = (strtotime($endDate) - time()) / (24 * 3600);
+                        if ($daysUntilExpiry <= 10) {
+                            $needsRenewal = true;
+                        }
+                    }
+                    
+                    // 条件2：剩余课时少于4节
+                    if ($remainingHours < 4) {
+                        $needsRenewal = true;
+                    }
+                } else {
+                    // 体验课学员（没有付费课程记录）
+                    $isTrialStudent = true;
+                    $totalHours = $trialClassCount;
+                    $usedHours = 0; // 这里可以根据实际需求统计体验课使用情况
+                    $remainingHours = $trialClassCount;
+                }
+                
+                $studentInfo = [
+                    'id' => $student['id'], // 人员课程安排关系ID
+                    'student_id' => $student['student_id'] ?: 0,
+                    'resources_id' => $student['resources_id'] ?: 0,
+                    'name' => $name,
+                    'age' => $age,
+                    'phone' => $phone,
+                    'courseStatus' => $student['person_type'] == 'student' ? '正式课' : '体验课',
+                    'courseType' => $student['schedule_type'] == 2 ? 'fixed' : 'temporary',
+                    'remainingHours' => $remainingHours,
+                    'totalHours' => $totalHours,
+                    'usedHours' => $usedHours,
+                    'expiryDate' => $studentCourseInfo ? ($studentCourseInfo['end_date'] ?: '') : '',
+                    'needsRenewal' => $needsRenewal,
+                    'isTrialStudent' => $isTrialStudent,
+                    'trialClassCount' => $trialClassCount,
+                    'status' => $student['status'] ?: 0,
+                    'remark' => $student['remark'] ?: '',
+                    'person_type' => $student['person_type'],
+                    'schedule_type' => $student['schedule_type'] ?: 1,
+                    'course_type' => $student['course_type'] ?: 1,
+                    // 添加课程购买和使用信息
+                    'student_course_info' => $studentCourseInfo,
+                    'course_usage_info' => $courseUsageInfo,
+                    'course_progress' => [
+                        'total' => $totalHours,
+                        'used' => $usedHours,
+                        'remaining' => $remainingHours,
+                        'percentage' => $totalHours > 0 ? round(($usedHours / $totalHours) * 100, 1) : 0
+                    ]
+                ];
+                
+                if ($student['course_type'] == 3) {
+                    // 等待位学员
+                    $waitingStudents[] = $studentInfo;
+                } else {
+                    // 正式学员
+                    $formalStudents[] = $studentInfo;
+                }
+            }
+            
+            // 计算可用位置
+            $maxStudents = $schedule['max_students'] ?: 0;
+            $availableSlots = 0;
+            if ($maxStudents > 0) {
+                $availableSlots = max(0, $maxStudents - count($formalStudents));
+            } else {
+                // 如果没有限制，总是显示至少1个可用位置
+                $availableSlots = max(1, 6 - count($formalStudents));
+            }
+            
+            $result = [
+                'schedule_info' => [
+                    'id' => $schedule['id'],
+                    'course_name' => $schedule['course']['course_name'] ?? '',
+                    'course_date' => $schedule['course_date'],
+                    'time_slot' => $schedule['time_slot'],
+                    'venue_name' => $schedule['venue']['venue_name'] ?? '',
+                    'campus_name' => $schedule['campus']['campus_name'] ?? '',
+                    'available_capacity' => $schedule['available_capacity'] ?: 0,
+                    'max_students' => $maxStudents,
+                    'available_slots' => $availableSlots,
+                    'status' => $schedule['status'] ?: 0
+                ],
+                'formal_students' => $formalStudents,
+                'waiting_students' => $waitingStudents
+            ];
+            
+            return [
+                'code' => 1,
+                'msg' => '获取成功',
+                'data' => $result
+            ];
+            
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '获取课程安排详情失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 搜索可添加的学员
+     * @param array $data
+     * @return array
+     */
+    public function searchAvailableStudents($data)
+    {
+        try {
+            $keyword = trim($data['keyword']);
+            $searchType = $data['search_type'] ?: 'auto';
+            $scheduleId = $data['schedule_id'] ?: 0;
+            
+            if (empty($keyword)) {
+                return [
+                    'code' => 1,
+                    'msg' => '搜索成功',
+                    'data' => []
+                ];
+            }
+            
+            // 获取已安排的学员ID和资源ID，用于排除
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            $existingRecords = $PersonCourseSchedule
+                ->where('schedule_id', $scheduleId)
+                ->where(function($query) {
+                    $query->where('deleted_at', 0)->whereOr('deleted_at', null);
+                })
+                ->field('student_id, resources_id')
+                ->select()
+                ->toArray();
+                
+            $existingStudentIds = array_filter(array_column($existingRecords, 'student_id'));
+            $existingResourceIds = array_filter(array_column($existingRecords, 'resources_id'));
+            
+            $results = [];
+            
+            // 搜索正式学员
+            $Student = new Student();
+            $studentWhere = [];
+            $studentWhere[] = ['deleted_at', '=', 0];
+            
+            if ($searchType == 'phone' || ($searchType == 'auto' && preg_match('/^1[3-9]\d{9}$/', $keyword))) {
+                // 搜索手机号 - 通过关联客户资源表
+                $students = $Student
+                    ->alias('s')
+                    ->leftJoin('customer_resources cr', 's.user_id = cr.id')
+                    ->where('cr.phone_number', 'like', "%{$keyword}%")
+                    ->where('s.deleted_at', 0)
+                    ->field('s.id as student_id, s.name, s.gender, s.status, cr.age, cr.phone_number, s.user_id as resource_id, "student" as person_type')
+                    ->select()
+                    ->toArray();
+            } else {
+                // 搜索姓名
+                $students = $Student
+                    ->alias('s')
+                    ->leftJoin('customer_resources cr', 's.user_id = cr.id')
+                    ->where('s.name', 'like', "%{$keyword}%")
+                    ->where('s.deleted_at', 0)
+                    ->field('s.id as student_id, s.name, s.gender, s.status, cr.age, cr.phone_number, s.user_id as resource_id, "student" as person_type')
+                    ->select()
+                    ->toArray();
+            }
+            
+            // 过滤已安排的学员
+            foreach ($students as $student) {
+                if (!in_array($student['student_id'], $existingStudentIds)) {
+                    $results[] = [
+                        'id' => $student['student_id'],
+                        'student_id' => $student['student_id'],
+                        'resources_id' => $student['resource_id'],
+                        'name' => $student['name'],
+                        'age' => $student['age'] ?: 0,
+                        'phone' => $student['phone_number'] ?: '',
+                        'gender' => $student['gender'],
+                        'status' => $student['status'], // 添加学员状态
+                        'person_type' => 'student',
+                        'type_label' => '正式学员'
+                    ];
+                }
+            }
+            
+            // 搜索客户资源（非正式学员）
+            $customerWhere = [];
+            $customerWhere[] = ['deleted_at', '=', 0];
+            
+            if ($searchType == 'phone' || ($searchType == 'auto' && preg_match('/^1[3-9]\d{9}$/', $keyword))) {
+                $customerWhere[] = ['phone_number', 'like', "%{$keyword}%"];
+            } else {
+                $customerWhere[] = ['name', 'like', "%{$keyword}%"];
+            }
+            
+            $customers = Db::name('customer_resources')
+                ->where($customerWhere)
+                ->field('id as resources_id, name, age, phone_number, gender')
+                ->select()
+                ->toArray();
+            
+            // 过滤已安排的客户资源
+            foreach ($customers as $customer) {
+                if (!in_array($customer['resources_id'], $existingResourceIds)) {
+                    $results[] = [
+                        'id' => $customer['resources_id'],
+                        'student_id' => 0,
+                        'resources_id' => $customer['resources_id'],
+                        'name' => $customer['name'],
+                        'age' => $customer['age'] ?: 0,
+                        'phone' => $customer['phone_number'] ?: '',
+                        'gender' => $customer['gender'],
+                        'person_type' => 'customer_resource',
+                        'type_label' => '客户资源'
+                    ];
+                }
+            }
+            
+            return [
+                'code' => 1,
+                'msg' => '搜索成功',
+                'data' => $results
+            ];
+            
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '搜索学员失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 添加学员到课程安排
+     * @param array $data
+     * @return array
+     */
+    public function addStudentToSchedule($data)
+    {
+        try {
+            $scheduleId = $data['schedule_id'];
+            $studentId = $data['student_id'] ?: null;
+            $resourcesId = $data['resources_id'] ?: null;
+            $personType = $data['person_type'];
+            $scheduleType = $data['schedule_type'] ?: 1;
+            $courseType = $data['course_type'] ?: 1;
+            $remarks = $data['remarks'] ?: '';
+            
+            // 获取课程安排信息
+            $CourseSchedule = new CourseSchedule();
+            $schedule = $CourseSchedule
+                ->where('id', $scheduleId)
+                ->find();
+                
+            if (!$schedule) {
+                return [
+                    'code' => 0,
+                    'msg' => '课程安排不存在',
+                    'data' => []
+                ];
+            }
+            
+            // 检查是否已经添加过
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            $existingWhere = [
+                ['schedule_id', '=', $scheduleId],
+                function($query) {
+                    $query->where('deleted_at', 0)->whereOr('deleted_at', null);
+                }
+            ];
+            
+            if ($studentId) {
+                $existingWhere[] = ['student_id', '=', $studentId];
+            } else {
+                $existingWhere[] = ['resources_id', '=', $resourcesId];
+            }
+            
+            $existing = $PersonCourseSchedule->where($existingWhere)->find();
+            if ($existing) {
+                return [
+                    'code' => 0,
+                    'msg' => '该学员已经在此课程安排中',
+                    'data' => []
+                ];
+            }
+            
+            // 验证学员状态 - 只有status=1的学员才能预约固定课
+            if ($scheduleType == 2 && $studentId) { // 固定课且是正式学员
+                $Student = new Student();
+                $student = $Student->where('id', $studentId)->find();
+                if (!$student) {
+                    return [
+                        'code' => 0,
+                        'msg' => '学员不存在',
+                        'data' => []
+                    ];
+                }
+                
+                if ($student['status'] != 1) {
+                    return [
+                        'code' => 0,
+                        'msg' => '只有有效状态的学员才能预约固定课，该学员只能预约临时课',
+                        'data' => []
+                    ];
+                }
+            }
+            
+            // 如果是正式学员位置，检查容量限制
+            if ($courseType != 3) { // 不是等待位
+                $maxStudents = $schedule['max_students'] ?: 0;
+                if ($maxStudents > 0) {
+                    $currentCount = $PersonCourseSchedule
+                        ->where('schedule_id', $scheduleId)
+                        ->where('course_type', '<>', 3) // 不包括等待位
+                        ->where(function($query) {
+                            $query->where('deleted_at', 0)->whereOr('deleted_at', null);
+                        })
+                        ->count();
+                        
+                    if ($currentCount >= $maxStudents) {
+                        return [
+                            'code' => 0,
+                            'msg' => '课程安排已满，请添加到等待位',
+                            'data' => []
+                        ];
+                    }
+                }
+            }
+            
+            // 准备插入数据
+            $insertData = [
+                'resources_id' => $resourcesId,
+                'person_id' => null, // 这个字段根据实际业务需求设置
+                'student_id' => $studentId,
+                'person_type' => $personType,
+                'schedule_id' => $scheduleId,
+                'course_date' => $schedule['course_date'],
+                'schedule_type' => $scheduleType,
+                'course_type' => $courseType,
+                'time_slot' => $schedule['time_slot'],
+                'status' => 0, // 待上课
+                'remark' => $remarks,
+                'created_at' => date('Y-m-d H:i:s'),
+                'updated_at' => date('Y-m-d H:i:s')
+            ];
+            
+            $result = $PersonCourseSchedule->create($insertData);
+            
+            if ($result) {
+                // 更新课程安排表的参与人员信息
+                $this->updateScheduleParticipants($scheduleId);
+                
+                return [
+                    'code' => 1,
+                    'msg' => '添加成功',
+                    'data' => $result->toArray()
+                ];
+            } else {
+                return [
+                    'code' => 0,
+                    'msg' => '添加失败',
+                    'data' => []
+                ];
+            }
+            
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '添加学员失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 从课程安排中移除学员
+     * @param array $data
+     * @return array
+     */
+    public function removeStudentFromSchedule($data)
+    {
+        try {
+            $personScheduleId = $data['person_schedule_id'];
+            $reason = $data['reason'] ?: '';
+            $remark = $data['remark'] ?: '';
+            
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            $record = $PersonCourseSchedule
+                ->where('id', $personScheduleId)
+                ->find();
+                
+            if (!$record) {
+                return [
+                    'code' => 0,
+                    'msg' => '记录不存在',
+                    'data' => []
+                ];
+            }
+            
+            // 软删除记录
+            $updateData = [
+                'deleted_at' => time(),
+                'remark' => $remark ? ($record['remark'] . '; 移除原因:' . $remark) : $record['remark'],
+                'updated_at' => date('Y-m-d H:i:s')
+            ];
+            
+            $result = $PersonCourseSchedule
+                ->where('id', $personScheduleId)
+                ->update($updateData);
+            
+            if ($result) {
+                // 更新课程安排表的参与人员信息
+                $this->updateScheduleParticipants($record['schedule_id']);
+                
+                return [
+                    'code' => 1,
+                    'msg' => '移除成功',
+                    'data' => []
+                ];
+            } else {
+                return [
+                    'code' => 0,
+                    'msg' => '移除失败',
+                    'data' => []
+                ];
+            }
+            
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '移除学员失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 更新学员课程状态
+     * @param array $data
+     * @return array
+     */
+    public function updateStudentStatus($data)
+    {
+        try {
+            $personScheduleId = $data['person_schedule_id'];
+            $status = $data['status'];
+            $remark = $data['remark'] ?: '';
+            
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            $record = $PersonCourseSchedule
+                ->where('id', $personScheduleId)
+                ->find();
+                
+            if (!$record) {
+                return [
+                    'code' => 0,
+                    'msg' => '记录不存在',
+                    'data' => []
+                ];
+            }
+            
+            $updateData = [
+                'status' => $status,
+                'updated_at' => date('Y-m-d H:i:s')
+            ];
+            
+            if ($remark) {
+                $updateData['remark'] = $remark;
+            }
+            
+            $result = $PersonCourseSchedule
+                ->where('id', $personScheduleId)
+                ->update($updateData);
+            
+            if ($result) {
+                return [
+                    'code' => 1,
+                    'msg' => '更新成功',
+                    'data' => []
+                ];
+            } else {
+                return [
+                    'code' => 0,
+                    'msg' => '更新失败',
+                    'data' => []
+                ];
+            }
+            
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '更新学员状态失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 更新课程安排的参与人员信息
+     * @param int $scheduleId
+     */
+    private function updateScheduleParticipants($scheduleId)
+    {
+        try {
+            $PersonCourseSchedule = new PersonCourseSchedule();
+            
+            // 获取当前安排的所有人员
+            $participants = $PersonCourseSchedule
+                ->where('schedule_id', $scheduleId)
+                ->where(function($query) {
+                    $query->where('deleted_at', 0)->whereOr('deleted_at', null);
+                })
+                ->field('resources_id, student_id')
+                ->select()
+                ->toArray();
+            
+            $resourceIds = array_filter(array_column($participants, 'resources_id'));
+            $studentIds = array_filter(array_column($participants, 'student_id'));
+            
+            $CourseSchedule = new CourseSchedule();
+            $CourseSchedule
+                ->where('id', $scheduleId)
+                ->update([
+                    'participants' => json_encode($resourceIds),
+                    'student_ids' => json_encode($studentIds),
+                    'updated_at' => date('Y-m-d H:i:s')
+                ]);
+                
+        } catch (\Exception $e) {
+            // 记录日志但不影响主流程
+            error_log('更新课程安排参与人员信息失败：' . $e->getMessage());
+        }
+    }
+
 }
 

niucloud/app/service/api/apiService/CustomerResourcesService.php

@@ -148,6 +148,11 @@ class CustomerResourcesService extends BaseApiService
                 'user_id' => $customer_resources_data['consultant'],
                 'role_id' => $role_id
             ]);
+            // 转介绍奖励逻辑：当source=3且有referral_resource_id时发放奖励
+            if ($customer_resources_data['source'] == '3' && !empty($customer_resources_data['referral_resource_id'])) {
+                $this->grantReferralReward($customer_resources_data['referral_resource_id'], $resource_id);
+            }
+
             Db::commit();
             $res = [
                 'code' => 1,
@@ -666,6 +671,53 @@ class CustomerResourcesService extends BaseApiService
     }
 
 
+    /**
+     * 发放转介绍奖励
+     * @param int $referral_resource_id 推荐人资源ID
+     * @param int $new_resource_id 新客户资源ID
+     * @return void
+     */
+    private function grantReferralReward($referral_resource_id, $new_resource_id)
+    {
+        try {
+            // 查找推荐人信息
+            $referralResource = CustomerResources::where('id', $referral_resource_id)->find();
+            if (!$referralResource) {
+                Log::error("转介绍奖励发放失败：推荐人资源不存在，ID: $referral_resource_id");
+                return;
+            }
+
+            // 奖励配置（可以后续移到配置文件中）
+            $rewardConfig = [
+                'gift_name' => '转介绍奖励',
+                'gift_type' => 'referral_reward', 
+                'reward_amount' => 100, // 奖励金额，可配置
+            ];
+
+            // 插入奖励记录到shcool_resources_gift表
+            $giftData = [
+                'gift_name' => $rewardConfig['gift_name'],
+                'gift_type' => $rewardConfig['gift_type'],
+                'gift_time' => time(),
+                'giver_id' => $new_resource_id, // 新客户作为赠送来源
+                'resource_id' => $referral_resource_id, // 推荐人作为接收者
+                'order_id' => 0, // 非订单相关奖励
+                'gift_status' => 1, // 已发放状态
+                'use_time' => 0,
+                'create_time' => time(),
+                'update_time' => time(),
+                'delete_time' => 0,
+            ];
+
+            Db::table('shcool_resources_gift')->insert($giftData);
+            
+            Log::info("转介绍奖励发放成功：推荐人ID $referral_resource_id，新客户ID $new_resource_id");
+
+        } catch (\Exception $e) {
+            Log::error("转介绍奖励发放异常：" . $e->getMessage());
+        }
+    }
+
     public function updateUserCourseInfo($data)
     {
         // 验证必要参数

niucloud/app/service/api/apiService/OrderTableService.php

@@ -40,6 +40,7 @@ class OrderTableService extends BaseApiService
         $limit = $page_params['limit'];
 
         $model = new OrderTable();
+        
         //员工表id
         if (!empty($where['staff_id'])) {
             $model = $model->where('staff_id', $where['staff_id']);
@@ -49,15 +50,21 @@ class OrderTableService extends BaseApiService
         if (!empty($where['resource_id'])) {
             $model = $model->where('resource_id', $where['resource_id']);
         }
+        
+        //学生表id
+        if (!empty($where['student_id'])) {
+            $model = $model->where('student_id', $where['student_id']);
+        }
 
         $data = $model
             ->append([
                 'customerResources',
                 'course',
                 'classGrade',
-                'personnel'
+                'personnel',
+                'studentCourses'  // 添加学员课程关联
             ])
-            ->order('id','desc')
+            ->order('created_at','desc')  // 使用created_at排序
             ->paginate([
             'list_rows' => $limit,
             'page' => $page,
@@ -125,4 +132,167 @@ class OrderTableService extends BaseApiService
         }
         return $res;
     }
+
+    //更新订单支付状态
+    public function updatePaymentStatus(array $data)
+    {
+        try {
+            $order = OrderTable::where('id', $data['order_id'])->find();
+            if (!$order) {
+                return [
+                    'code' => 0,
+                    'msg' => '订单不存在',
+                    'data' => []
+                ];
+            }
+
+            // 准备更新数据
+            $updateData = [
+                'order_status' => $data['order_status'],
+                'updated_at' => date('Y-m-d H:i:s')
+            ];
+            
+            // 如果提供了支付单号，则更新
+            if (!empty($data['payment_id'])) {
+                $updateData['payment_id'] = $data['payment_id'];
+            }
+            
+            // 如果订单状态为已支付，记录支付时间
+            if ($data['order_status'] === 'paid') {
+                $updateData['payment_time'] = date('Y-m-d H:i:s');
+            }
+
+            $success = $order->save($updateData);
+
+            if ($success) {
+                // 如果订单状态变更为已支付，则自动为学员分配课程
+                if ($data['order_status'] === 'paid') {
+                    $this->assignCourseToStudent($order->toArray());
+                }
+                
+                return [
+                    'code' => 1,
+                    'msg' => '订单状态更新成功',
+                    'data' => $order->toArray()
+                ];
+            } else {
+                return [
+                    'code' => 0,
+                    'msg' => '订单状态更新失败',
+                    'data' => []
+                ];
+            }
+        } catch (\Exception $e) {
+            return [
+                'code' => 0,
+                'msg' => '更新订单状态异常: ' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 支付成功后为学员分配课程
+     * @param array $orderData 订单数据
+     * @return bool
+     */
+    private function assignCourseToStudent(array $orderData)
+    {
+        try {
+            $student_id = $orderData['student_id'];
+            $course_id = $orderData['course_id'];
+            $resource_id = $orderData['resource_id'];
+            
+            if (empty($student_id) || empty($course_id)) {
+                \think\facade\Log::warning('学员分配课程失败：缺少学员ID或课程ID', $orderData);
+                return false;
+            }
+
+            // 获取课程信息
+            $course = \app\model\course\Course::where('id', $course_id)->find();
+            if (!$course) {
+                \think\facade\Log::warning('学员分配课程失败：课程不存在', ['course_id' => $course_id]);
+                return false;
+            }
+            $course = $course->toArray();
+
+            // 检查学员是否已有该课程记录
+            $existingCourse = Db::table('school_student_courses')
+                ->where('student_id', $student_id)
+                ->where('course_id', $course_id)
+                ->find();
+
+            $now = date('Y-m-d H:i:s');
+            $start_date = date('Y-m-d');
+            $end_date = date('Y-m-d', strtotime('+' . $course['duration'] . ' days'));
+
+            if ($existingCourse) {
+                // 如果已有课程记录，累加课时数量
+                $updateData = [
+                    'total_hours' => $existingCourse['total_hours'] + $course['session_count'],
+                    'gift_hours' => $existingCourse['gift_hours'] + $course['gift_session_count'],
+                    'updated_at' => $now
+                ];
+                
+                // 如果原有课程已过期，更新有效期
+                if ($existingCourse['end_date'] < $start_date) {
+                    $updateData['start_date'] = $start_date;
+                    $updateData['end_date'] = $end_date;
+                } else {
+                    // 延长有效期
+                    $updateData['end_date'] = date('Y-m-d', 
+                        strtotime($existingCourse['end_date'] . ' +' . $course['duration'] . ' days')
+                    );
+                }
+
+                $result = Db::table('school_student_courses')
+                    ->where('id', $existingCourse['id'])
+                    ->update($updateData);
+                    
+                \think\facade\Log::info('学员课程更新成功', [
+                    'student_id' => $student_id,
+                    'course_id' => $course_id,
+                    'added_hours' => $course['session_count'],
+                    'added_gift_hours' => $course['gift_session_count']
+                ]);
+            } else {
+                // 创建新的课程记录
+                $insertData = [
+                    'student_id' => $student_id,
+                    'course_id' => $course_id,
+                    'total_hours' => $course['session_count'],
+                    'gift_hours' => $course['gift_session_count'],
+                    'start_date' => $start_date,
+                    'end_date' => $end_date,
+                    'use_total_hours' => 0,
+                    'use_gift_hours' => 0,
+                    'single_session_count' => $course['single_session_count'],
+                    'status' => 1, // 激活状态
+                    'resource_id' => $resource_id,
+                    'created_at' => $now,
+                    'updated_at' => $now
+                ];
+
+                $result = Db::table('school_student_courses')->insert($insertData);
+                
+                \think\facade\Log::info('学员课程创建成功', [
+                    'student_id' => $student_id,
+                    'course_id' => $course_id,
+                    'total_hours' => $course['session_count'],
+                    'gift_hours' => $course['gift_session_count'],
+                    'start_date' => $start_date,
+                    'end_date' => $end_date
+                ]);
+            }
+
+            return $result ? true : false;
+        } catch (\Exception $e) {
+            \think\facade\Log::error('学员分配课程异常', [
+                'order_data' => $orderData,
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString()
+            ]);
+            return false;
+        }
+    }
 }

niucloud/app/validate/document/DocumentTemplate.php

@@ -0,0 +1,101 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\validate\document;
+
+use core\base\BaseValidate;
+
+/**
+ * Word文档模板验证器
+ * Class DocumentTemplate
+ * @package app\validate\document
+ */
+class DocumentTemplate extends BaseValidate
+{
+    protected $rule = [
+        'template_id' => 'require|integer|gt:0',
+        'placeholder_config' => 'require|array',
+        'fill_data' => 'require|array',
+        'output_filename' => 'chsAlphaNum|max:100'
+    ];
+
+    protected $message = [
+        'template_id.require' => '模板ID不能为空',
+        'template_id.integer' => '模板ID必须是整数',
+        'template_id.gt' => '模板ID必须大于0',
+        'placeholder_config.require' => '占位符配置不能为空',
+        'placeholder_config.array' => '占位符配置格式错误',
+        'fill_data.require' => '填充数据不能为空',
+        'fill_data.array' => '填充数据格式错误',
+        'output_filename.chsAlphaNum' => '文件名只能包含中文、字母和数字',
+        'output_filename.max' => '文件名长度不能超过100个字符'
+    ];
+
+    protected $scene = [
+        'savePlaceholderConfig' => ['template_id', 'placeholder_config'],
+        'generateDocument' => ['template_id', 'fill_data', 'output_filename']
+    ];
+
+    /**
+     * 验证占位符配置
+     * @param $value
+     * @param $rule
+     * @param $data
+     * @return bool|string
+     */
+    protected function checkPlaceholderConfig($value, $rule, $data)
+    {
+        if (!is_array($value)) {
+            return '占位符配置必须是数组格式';
+        }
+
+        foreach ($value as $placeholder => $config) {
+            if (!isset($config['name']) || empty($config['name'])) {
+                return "占位符 {$placeholder} 的显示名称不能为空";
+            }
+
+            if (!isset($config['data_source']) || !in_array($config['data_source'], ['database', 'manual'])) {
+                return "占位符 {$placeholder} 的数据源类型无效";
+            }
+
+            if ($config['data_source'] === 'database') {
+                if (empty($config['table_name']) || empty($config['field_name'])) {
+                    return "占位符 {$placeholder} 的数据库配置不完整";
+                }
+            }
+
+            if (!isset($config['is_required'])) {
+                return "占位符 {$placeholder} 必须指定是否必填";
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 验证填充数据
+     * @param $value
+     * @param $rule
+     * @param $data
+     * @return bool|string
+     */
+    protected function checkFillData($value, $rule, $data)
+    {
+        if (!is_array($value)) {
+            return '填充数据必须是数组格式';
+        }
+
+        // 这里可以添加更多的数据验证逻辑
+        // 比如验证必填字段、数据格式等
+
+        return true;
+    }
+}

niucloud/core/base/BaseScheduleJob.php

@@ -0,0 +1,210 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace core\base;
+
+use think\facade\Log;
+
+/**
+ * 定时任务基类，提供执行锁机制和统一日志
+ */
+abstract class BaseScheduleJob extends BaseJob
+{
+    /**
+     * 任务名称（用于锁文件命名）
+     * @var string
+     */
+    protected $jobName = 'schedule_job';
+    
+    /**
+     * 锁定时间（秒），默认5分钟
+     * @var int
+     */
+    protected $lockTimeout = 300;
+    
+    /**
+     * 是否启用每日执行标记
+     * @var bool
+     */
+    protected $enableDailyFlag = false;
+    
+    /**
+     * 最终执行的方法，子类需要实现
+     * @return mixed
+     */
+    abstract protected function executeJob();
+    
+    /**
+     * 主执行方法，添加锁机制
+     * @return mixed
+     */
+    public function doJob()
+    {
+        $lockFile = $this->getLockFilePath();
+        
+        // 检查执行锁
+        if ($this->isLocked($lockFile)) {
+            Log::write($this->jobName . '任务正在执行中，跳过');
+            return $this->getSkippedResult('locked');
+        }
+        
+        // 检查每日执行标记
+        if ($this->enableDailyFlag && $this->isExecutedToday()) {
+            Log::write($this->jobName . '今天已经执行过，跳过');
+            return $this->getSkippedResult('already_executed_today');
+        }
+        
+        // 创建锁文件
+        $this->createLock($lockFile);
+        
+        try {
+            Log::write('开始执行' . $this->jobName . '任务');
+            
+            // 执行具体任务
+            $result = $this->executeJob();
+            
+            // 创建每日执行标记
+            if ($this->enableDailyFlag) {
+                $this->createDailyFlag();
+            }
+            
+            Log::write($this->jobName . '任务执行完成');
+            return $result;
+            
+        } catch (\Exception $e) {
+            Log::write($this->jobName . '任务执行失败：' . $e->getMessage());
+            return $this->getFailedResult($e->getMessage());
+        } finally {
+            // 删除锁文件
+            $this->removeLock($lockFile);
+        }
+    }
+    
+    /**
+     * 获取锁文件路径
+     * @return string
+     */
+    protected function getLockFilePath()
+    {
+        return runtime_path() . $this->jobName . '.lock';
+    }
+    
+    /**
+     * 检查是否被锁定
+     * @param string $lockFile
+     * @return bool
+     */
+    protected function isLocked($lockFile)
+    {
+        return file_exists($lockFile) && (time() - filemtime($lockFile)) < $this->lockTimeout;
+    }
+    
+    /**
+     * 创建锁文件
+     * @param string $lockFile
+     */
+    protected function createLock($lockFile)
+    {
+        file_put_contents($lockFile, time());
+    }
+    
+    /**
+     * 删除锁文件
+     * @param string $lockFile
+     */
+    protected function removeLock($lockFile)
+    {
+        if (file_exists($lockFile)) {
+            unlink($lockFile);
+        }
+    }
+    
+    /**
+     * 检查今天是否已经执行过
+     * @return bool
+     */
+    protected function isExecutedToday()
+    {
+        $today = date('Y-m-d');
+        $flagFile = runtime_path() . $this->jobName . '_' . $today . '.flag';
+        return file_exists($flagFile);
+    }
+    
+    /**
+     * 创建每日执行标记
+     */
+    protected function createDailyFlag()
+    {
+        $today = date('Y-m-d');
+        $flagFile = runtime_path() . $this->jobName . '_' . $today . '.flag';
+        file_put_contents($flagFile, time());
+    }
+    
+    /**
+     * 获取跳过执行的结果
+     * @param string $reason
+     * @return array
+     */
+    protected function getSkippedResult($reason)
+    {
+        return [
+            'status' => 'skipped',
+            'reason' => $reason,
+            'job_name' => $this->jobName,
+            'timestamp' => time()
+        ];
+    }
+    
+    /**
+     * 获取执行失败的结果
+     * @param string $error
+     * @return array
+     */
+    protected function getFailedResult($error)
+    {
+        return [
+            'status' => 'failed',
+            'error' => $error,
+            'job_name' => $this->jobName,
+            'timestamp' => time()
+        ];
+    }
+    
+    /**
+     * 获取执行成功的结果
+     * @param array $data
+     * @return array
+     */
+    protected function getSuccessResult($data = [])
+    {
+        return array_merge([
+            'status' => 'success',
+            'job_name' => $this->jobName,
+            'timestamp' => time()
+        ], $data);
+    }
+    
+    /**
+     * 清理过期的标记文件（超过7天）
+     */
+    protected function cleanupOldFlags()
+    {
+        $runtimePath = runtime_path();
+        $pattern = $runtimePath . $this->jobName . '_*.flag';
+        $files = glob($pattern);
+        
+        foreach ($files as $file) {
+            if (file_exists($file) && (time() - filemtime($file)) > 7 * 24 * 3600) { // 7天
+                unlink($file);
+            }
+        }
+    }
+}

niucloud/服务记录分发功能说明.md

@@ -1,165 +0,0 @@
-# 服务记录分发功能说明
-
-## 功能概述
-
-服务记录分发功能是一个定时任务系统，用于自动将已完成的服务记录分发给教务人员和教练，确保相关人员能够及时了解服务情况。
-
-## 功能特性
-
-### 1. 自动分发
-- 定时检查最近24小时内完成的服务记录
-- 自动识别教务人员和教练
-- 根据人员角色发送相应的通知
-
-### 2. 分发规则
-- **教务人员**：接收所有已完成的服务记录通知
-- **教练**：只接收自己负责的服务记录通知
-
-### 3. 通知方式
-- 支持短信通知
-- 支持微信通知
-- 支持小程序通知
-
-## 文件结构
-
-```
-app/
-├── job/schedule/
-│   └── ServiceLogsDistribution.php          # 定时任务类
-├── service/admin/service_logs/
-│   └── ServiceLogsDistributionService.php   # 分发管理服务
-├── adminapi/controller/service_logs/
-│   └── ServiceLogsDistribution.php          # 分发管理控制器
-├── dict/notice/
-│   └── service_logs_notice.php              # 通知模板配置
-└── upgrade/v151/
-    ├── upgrade.php                          # 升级脚本
-    └── upgrade.sql                          # 数据库升级SQL
-```
-
-## 数据库变更
-
-### 服务记录表 (service_logs)
-新增字段：
-- `is_distributed_to_academic` (tinyint): 是否已分发给教务
-- `is_distributed_to_coach` (tinyint): 是否已分发给教练
-- `distribution_time` (int): 分发时间
-
-### 人员表 (personnel)
-新增字段：
-- `position` (varchar): 职位信息
-
-## API接口
-
-### 1. 手动执行分发任务
-```
-POST /adminapi/service_logs/distribution/execute
-```
-
-### 2. 获取分发统计信息
-```
-GET /adminapi/service_logs/distribution/stats
-```
-
-### 3. 获取待分发的服务记录列表
-```
-GET /adminapi/service_logs/distribution/pending
-参数：
-- distribution_status: 分发状态筛选
-- date_range: 日期范围筛选
-```
-
-### 4. 重置分发状态
-```
-POST /adminapi/service_logs/distribution/reset
-参数：
-- ids: 服务记录ID数组
-- type: 重置类型 (academic|coach|both)
-```
-
-### 5. 获取教务和教练人员列表
-```
-GET /adminapi/service_logs/distribution/staff
-```
-
-## 使用方法
-
-### 1. 安装升级
-执行数据库升级脚本：
-```sql
--- 执行 app/upgrade/v151/upgrade.sql 中的SQL语句
-```
-
-### 2. 配置定时任务
-在系统定时任务中添加：
-```php
-// 任务类
-app\job\schedule\ServiceLogsDistribution
-
-// 执行频率：每小时执行一次
-0 * * * *
-```
-
-### 3. 配置通知模板
-在后台管理系统中配置通知模板：
-- 服务记录教务通知 (service_log_academic_notice)
-- 服务记录教练通知 (service_log_coach_notice)
-
-### 4. 设置人员职位
-确保人员表中的职位字段正确设置：
-- 教务人员：职位包含"教务"
-- 教练：职位包含"教练"
-
-## 通知模板变量
-
-### 教务通知模板变量
-- `{staff_name}`: 教务人员姓名
-- `{service_name}`: 服务名称
-- `{score}`: 评分
-- `{created_at}`: 创建时间
-
-### 教练通知模板变量
-- `{staff_name}`: 教练姓名
-- `{service_name}`: 服务名称
-- `{score}`: 学员评分
-- `{feedback}`: 学员反馈
-- `{created_at}`: 创建时间
-
-## 日志记录
-
-系统会自动记录以下日志：
-- 分发任务开始和完成时间
-- 分发成功的记录数量
-- 发送通知的成功和失败情况
-- 异常错误信息
-
-## 注意事项
-
-1. **数据库升级**：首次使用前必须执行数据库升级脚本
-2. **人员配置**：确保人员表中的职位信息正确设置
-3. **通知配置**：需要在后台配置相应的通知模板
-4. **定时任务**：建议设置为每小时执行一次
-5. **权限控制**：API接口需要相应的权限才能访问
-
-## 故障排除
-
-### 常见问题
-
-1. **没有找到教务/教练人员**
-   - 检查人员表中的职位字段是否正确设置
-   - 确认人员状态是否为正常状态
-
-2. **通知发送失败**
-   - 检查通知模板配置
-   - 确认短信/微信配置是否正确
-
-3. **分发状态不更新**
-   - 检查数据库字段是否存在
-   - 确认数据库权限是否正确
-
-### 调试方法
-
-1. 查看系统日志文件
-2. 使用手动执行接口测试
-3. 检查数据库中的分发状态字段
-4. 验证通知模板配置 

node_modules/.yarn-integrity

@@ -1,10 +0,0 @@
-{
-  "systemParams": "win32-x64-108",
-  "modulesFolders": [],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}

package-lock.json

@@ -1,71 +0,0 @@
-{
-  "name": "zhjwxt",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@playwright/test": "^1.54.1"
-      }
-    },
-    "node_modules/@playwright/test": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
-      "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright": "1.54.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/playwright": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
-      "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright-core": "1.54.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
-    "node_modules/playwright-core": {
-      "version": "1.54.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
-      "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    }
-  }
-}

package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@playwright/test": "^1.54.1"
-  }
-}

uniapp/api/apiRoute.js

@@ -36,6 +36,11 @@ export default {
         return await http.get('/common/getDictionary', data);
     },
     
+    //获取支付类型字典（员工端）
+    async common_getPaymentTypes(data = {}) {
+        return await http.get('/common/getPaymentTypes', data);
+    },
+    
     //批量获取字典数据
     async common_getBatchDict(keys = []) {
         // 支持传入数组或字符串
@@ -474,6 +479,10 @@ export default {
     async xs_orderTableAdd(data = {}) {
         return await http.post('/orderTable/add', data);
     },
+    //员工端(销售)-订单管理-更新支付状态
+    async xs_orderTableUpdatePaymentStatus(data = {}) {
+        return await http.post('/orderTable/updatePaymentStatus', data);
+    },
 
     //↓↓↓↓↓↓↓↓↓↓↓↓-----家长接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
     // 获取家长下的孩子列表
@@ -691,6 +700,10 @@ export default {
     },
     // 获取课程安排详情
     async getCourseScheduleInfo(data = {}) {
+        // 开发阶段直接使用Mock数据，避免数据库表不存在的问题
+        console.log('使用Mock数据获取课程安排详情:', data);
+        return this.getCourseScheduleInfoMock(data);
+        
         // 未登录或测试模式使用模拟数据
         if (!uni.getStorageSync("token")) {
             return this.getCourseScheduleInfoMock(data);
@@ -725,14 +738,14 @@ export default {
         // 课程安排模拟数据
         const mockScheduleInfo = {
             id: parseInt(data.schedule_id),
-            course_name: '少儿形体课',
+            course_name: '大课7+1类型',
-            course_date: '2025-07-14',
+            course_date: '2025-07-25',
             time_slot: '09:00-10:00',
-            venue_name: '舞蹈室A',
+            venue_name: '时间范围教室',
-            campus_name: '总部校区',
+            campus_name: '测试校区',
-            coach_name: '张教练',
+            coach_name: '老六',
             status: 'pending',
-            status_text: '未点名',
+            status_text: '即将开始',
             class_info: {
                 id: 1,
                 class_name: '少儿形体班'
@@ -781,6 +794,10 @@ export default {
     async getVenueAvailableTime(data = {}) {
         return await http.get('/courseSchedule/venueAvailableTime', data);
     },
+    // 获取场地时间选项（课程调整专用）
+    async getVenueTimeOptions(data = {}) {
+        return await http.get('/courseSchedule/venueTimeOptions', data);
+    },
     // 检查教练时间冲突
     async checkCoachConflict(data = {}) {
         // 未登录或测试模式使用模拟数据
@@ -881,4 +898,30 @@ export default {
         const apiPath = token ? '/venue/timeSlots' : '/test/venue/timeSlots';
         return await http.get(apiPath, data);
     },
+
+    //↓↓↓↓↓↓↓↓↓↓↓↓-----课程安排详情页面接口-----↓↓↓↓↓↓↓↓↓↓↓↓
+    // 获取课程安排详情
+    async courseScheduleDetail(data = {}) {
+        return await http.get('/course/scheduleDetail', data);
+    },
+    
+    // 搜索可添加的学员
+    async searchStudentsForSchedule(data = {}) {
+        return await http.get('/course/searchStudents', data);
+    },
+    
+    // 添加学员到课程安排
+    async addStudentToSchedule(data = {}) {
+        return await http.post('/course/addStudentToSchedule', data);
+    },
+    
+    // 从课程安排中移除学员
+    async removeStudentFromSchedule(data = {}) {
+        return await http.post('/course/removeStudentFromSchedule', data);
+    },
+    
+    // 更新学员课程状态（请假等）
+    async updateStudentStatus(data = {}) {
+        return await http.post('/course/updateStudentStatus', data);
+    },
 }

uniapp/components/bottom-popup/index.vue

@@ -0,0 +1,220 @@
+<!--通用底部弹窗组件-->
+<template>
+  <view class="bottom-popup" :class="{ 'show': visible }" @touchmove.stop.prevent>
+    <!-- 遮罩层 -->
+    <view 
+      class="mask" 
+      :class="{ 'show': visible }"
+      @click="handleMaskClick"
+    ></view>
+    
+    <!-- 弹窗内容 -->
+    <view class="popup-content" :class="{ 'show': visible }">
+      <!-- 顶部拖拽条 -->
+      <view class="drag-handle">
+        <view class="drag-line"></view>
+      </view>
+      
+      <!-- 标题栏 -->
+      <view class="popup-header" v-if="title">
+        <view class="popup-title">{{ title }}</view>
+        <view class="close-btn" @click="close">
+          <text class="close-icon">×</text>
+        </view>
+      </view>
+      
+      <!-- 滚动内容区域 -->
+      <scroll-view 
+        class="popup-body"
+        :class="{ 'has-title': title, 'has-footer': hasFooter }"
+        :scroll-y="true"
+        :enable-passive="true"
+      >
+        <slot></slot>
+      </scroll-view>
+      
+      <!-- 底部操作按钮区域 -->
+      <view class="popup-footer" v-if="hasFooter">
+        <slot name="footer"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'BottomPopup',
+  props: {
+    // 是否显示弹窗
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    // 弹窗标题
+    title: {
+      type: String,
+      default: ''
+    },
+    // 是否有底部操作区域
+    hasFooter: {
+      type: Boolean,
+      default: false
+    },
+    // 点击遮罩是否关闭
+    maskClosable: {
+      type: Boolean,
+      default: true
+    },
+    // 弹窗高度（vh单位）
+    height: {
+      type: [String, Number],
+      default: 70
+    }
+  },
+  
+  methods: {
+    // 处理遮罩点击
+    handleMaskClick() {
+      if (this.maskClosable) {
+        this.close()
+      }
+    },
+    
+    // 关闭弹窗
+    close() {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.bottom-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1000;
+  pointer-events: none;
+  
+  &.show {
+    pointer-events: auto;
+  }
+}
+
+.mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  
+  &.show {
+    opacity: 1;
+  }
+}
+
+.popup-content {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: v-bind("`${height}vh`");
+  background: #2C2C2C;
+  border-radius: 24rpx 24rpx 0 0;
+  transform: translateY(100%);
+  transition: transform 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  display: flex;
+  flex-direction: column;
+  
+  &.show {
+    transform: translateY(0);
+  }
+}
+
+.drag-handle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 40rpx;
+  padding: 20rpx 0;
+  flex-shrink: 0;
+}
+
+.drag-line {
+  width: 80rpx;
+  height: 8rpx;
+  background: #666;
+  border-radius: 4rpx;
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 40rpx 20rpx;
+  border-bottom: 1px solid #404040;
+  flex-shrink: 0;
+}
+
+.popup-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #ffffff;
+}
+
+.close-btn {
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.close-icon {
+  font-size: 40rpx;
+  color: #ffffff;
+  line-height: 1;
+}
+
+.popup-body {
+  flex: 1;
+  padding: 40rpx;
+  overflow-y: auto;
+  
+  &.has-title {
+    padding-top: 20rpx;
+  }
+  
+  &.has-footer {
+    padding-bottom: 20rpx;
+  }
+}
+
+.popup-footer {
+  padding: 20rpx 40rpx 40rpx;
+  background: #2C2C2C;
+  border-top: 1px solid #404040;
+  flex-shrink: 0;
+}
+
+/* 滚动条样式 */
+::-webkit-scrollbar {
+  width: 6rpx;
+}
+
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #29D3B4;
+  border-radius: 3rpx;
+}
+</style>

uniapp/components/course-info-card/index.vue

@@ -0,0 +1,355 @@
+<!--课程信息内容组件-->
+<template>
+  <view class="course-info-card">
+    <!-- 课程信息列表 -->
+    <view class="course-list" v-if="courseList && courseList.length > 0">
+      <view 
+        class="course-item" 
+        v-for="(course, index) in courseList" 
+        :key="course.id || index"
+        @click="viewCourseDetail(course)"
+      >
+        <view class="course-header">
+          <view class="course-title">{{ course.course_name || '未知课程' }}</view>
+          <view :class="['course-status',getStatusClass(course.status)]">
+            {{ getStatusText(course.status) }}
+          </view>
+        </view>
+        
+        <!-- 课程进度 -->
+        <view class="course-progress" v-if="course.total_count">
+          <view class="progress-bar">
+            <view 
+              class="progress-fill" 
+              :style="{ width: getProgressPercent(course) + '%' }"
+            ></view>
+          </view>
+          <view class="progress-text">
+            {{ course.used_count || 0 }}/{{ course.total_count }}节
+          </view>
+        </view>
+        
+        <view class="course-details">
+          <!-- 基本信息 -->
+          <view class="detail-section">
+            <view class="detail-item" v-if="course.course_type">
+              <text class="detail-label">课程类型：</text>
+              <text class="detail-value">{{ course.course_type }}</text>
+            </view>
+            <view class="detail-item" v-if="course.teacher_name">
+              <text class="detail-label">授课教练：</text>
+              <text class="detail-value">{{ course.teacher_name }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">剩余课时：</text>
+              <text class="detail-value highlight">{{ getRemainingCount(course) }}节</text>
+            </view>
+          </view>
+          
+          <!-- 时间信息 -->
+          <view class="detail-section" v-if="course.start_date || course.end_date || course.expiry_date">
+            <view class="detail-item" v-if="course.start_date">
+              <text class="detail-label">开始时间：</text>
+              <text class="detail-value">{{ formatDate(course.start_date) }}</text>
+            </view>
+            <view class="detail-item" v-if="course.end_date || course.expiry_date">
+              <text class="detail-label">结束时间：</text>
+              <text class="detail-value">{{ formatDate(course.end_date || course.expiry_date) }}</text>
+            </view>
+          </view>
+          
+          <!-- 其他信息 -->
+          <view class="detail-section">
+            <view class="detail-item" v-if="course.course_price">
+              <text class="detail-label">课程价格：</text>
+              <text class="detail-value price">¥{{ course.course_price }}</text>
+            </view>
+            <view class="detail-item" v-if="course.class_duration">
+              <text class="detail-label">单节时长：</text>
+              <text class="detail-value">{{ course.class_duration }}分钟</text>
+            </view>
+            <view class="detail-item" v-if="course.create_time">
+              <text class="detail-label">创建时间：</text>
+              <text class="detail-value">{{ formatTime(course.create_time) }}</text>
+            </view>
+          </view>
+          
+          <!-- 备注信息 -->
+          <view class="detail-section" v-if="course.remark">
+            <view class="remark-item">
+              <text class="detail-label">备注：</text>
+              <text class="detail-value remark">{{ course.remark }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    <!-- 空状态 -->
+    <view class="empty-state" v-else>
+      <view class="empty-icon">📖</view>
+      <view class="empty-text">暂无课程信息</view>
+      <view class="empty-tip">学生还未报名任何课程</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'CourseInfoCard',
+  props: {
+    // 课程信息列表数据
+    courseList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  
+  methods: {
+    // 查看课程详情
+    viewCourseDetail(course) {
+      this.$emit('view-detail', course)
+    },
+    
+    // 获取状态样式类
+    getStatusClass(status) {
+      const statusMap = {
+        'active': 'status-active',
+        'completed': 'status-completed',
+        'expired': 'status-expired',
+        'pending': 'status-pending'
+      }
+      return statusMap[status] || 'status-default'
+    },
+    
+    // 获取状态文本
+    getStatusText(status) {
+      const statusMap = {
+        'active': '进行中',
+        'completed': '已完成',
+        'expired': '已过期',
+        'pending': '待开始'
+      }
+      return statusMap[status] || '未知状态'
+    },
+    
+    // 获取进度百分比
+    getProgressPercent(course) {
+      if (!course.total_count || course.total_count === 0) return 0
+      const used = course.used_count || 0
+      return Math.round((used / course.total_count) * 100)
+    },
+    
+    // 获取剩余课时
+    getRemainingCount(course) {
+      const total = course.total_count || 0
+      const used = course.used_count || 0
+      return Math.max(0, total - used)
+    },
+    
+    // 格式化时间
+    formatTime(timeStr) {
+      if (!timeStr) return ''
+      try {
+        const date = new Date(timeStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
+      } catch (e) {
+        return timeStr
+      }
+    },
+    
+    // 格式化日期
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      try {
+        const date = new Date(dateStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+      } catch (e) {
+        return dateStr
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.course-info-card {
+  padding: 0;
+}
+
+.course-list {
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+}
+
+.course-item {
+  background: #3A3A3A;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  border: 1px solid #404040;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background: #4A4A4A;
+  }
+}
+
+.course-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
+}
+
+.course-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #ffffff;
+  flex: 1;
+  margin-right: 20rpx;
+}
+
+.course-status {
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  
+  &.status-active {
+    background: rgba(41, 211, 180, 0.2);
+    color: #29D3B4;
+  }
+  
+  &.status-completed {
+    background: rgba(76, 175, 80, 0.2);
+    color: #4CAF50;
+  }
+  
+  &.status-expired {
+    background: rgba(244, 67, 54, 0.2);
+    color: #F44336;
+  }
+  
+  &.status-pending {
+    background: rgba(255, 193, 7, 0.2);
+    color: #FFC107;
+  }
+  
+  &.status-default {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+}
+
+.course-progress {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  margin-bottom: 24rpx;
+}
+
+.progress-bar {
+  flex: 1;
+  height: 8rpx;
+  background: #404040;
+  border-radius: 4rpx;
+  overflow: hidden;
+}
+
+.progress-fill {
+  height: 100%;
+  background: linear-gradient(90deg, #29D3B4 0%, #4ECDC4 100%);
+  border-radius: 4rpx;
+  transition: width 0.3s ease;
+}
+
+.progress-text {
+  font-size: 24rpx;
+  color: #29D3B4;
+  font-weight: 600;
+  min-width: 100rpx;
+  text-align: right;
+}
+
+.course-details {
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+}
+
+.detail-section {
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.detail-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.remark-item {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+}
+
+.detail-label {
+  font-size: 26rpx;
+  color: #999999;
+  min-width: 140rpx;
+}
+
+.detail-value {
+  font-size: 26rpx;
+  color: #ffffff;
+  flex: 1;
+  text-align: right;
+  
+  &.highlight {
+    color: #29D3B4;
+    font-weight: 600;
+  }
+  
+  &.price {
+    color: #FFC107;
+    font-weight: 600;
+  }
+  
+  &.remark {
+    text-align: left;
+    line-height: 1.5;
+    margin-top: 8rpx;
+  }
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 80rpx 40rpx;
+  text-align: center;
+}
+
+.empty-icon {
+  font-size: 120rpx;
+  margin-bottom: 32rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #ffffff;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+}
+
+.empty-tip {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 1.4;
+}
+</style>

uniapp/components/order-form-popup/index.vue

@@ -0,0 +1,575 @@
+<!--新增订单表单弹窗-->
+<template>
+  <view class="order-form-popup">
+    <view class="popup-header">
+      <text class="popup-title">新增订单</text>
+      <view class="close-btn" @click="handleCancel">×</view>
+    </view>
+    
+    <view class="popup-content">
+      <view class="form-section">
+        <view class="form-item">
+          <text class="label">学生信息</text>
+          <view class="student-info">
+            <text class="student-name">{{ studentInfo.name || '未选择学生' }}</text>
+          </view>
+        </view>
+        
+        <view class="form-item">
+          <text class="label">课程选择 <text class="required">*</text></text>
+          <view class="picker-wrapper" @click="showCoursePicker">
+            <text class="picker-text" :class="{ 'placeholder': !formData.course_id }">
+              {{ selectedCourse && selectedCourse.name || '请选择课程' }}
+            </text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </view>
+        
+        <view class="form-item">
+          <text class="label">支付方式 <text class="required">*</text></text>
+          <view class="picker-wrapper" @click="showPaymentPicker">
+            <text class="picker-text" :class="{ 'placeholder': !formData.payment_type }">
+              {{ selectedPaymentType && selectedPaymentType.label || '请选择支付方式' }}
+            </text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </view>
+        
+        <view class="form-item">
+          <text class="label">订单类型 <text class="required">*</text></text>
+          <view class="picker-wrapper" @click="showOrderTypePicker">
+            <text class="picker-text" :class="{ 'placeholder': !formData.order_type }">
+              {{ selectedOrderType && selectedOrderType.label || '请选择订单类型' }}
+            </text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </view>
+        
+        <view class="form-item">
+          <text class="label">订单金额 <text class="required">*</text></text>
+          <input 
+            class="form-input readonly"
+            type="digit"
+            v-model="formData.order_amount"
+            placeholder="请先选择课程"
+            readonly
+            disabled
+          />
+        </view>
+        
+        <view class="form-item">
+          <text class="label">课时数</text>
+          <input 
+            class="form-input readonly"
+            type="number"
+            v-model="formData.total_hours"
+            placeholder="请先选择课程"
+            readonly
+            disabled
+          />
+        </view>
+        
+        <view class="form-item">
+          <text class="label">赠送课时</text>
+          <input 
+            class="form-input readonly"
+            type="number"
+            v-model="formData.gift_hours"
+            placeholder="请先选择课程"
+            readonly
+            disabled
+          />
+        </view>
+        
+        <view class="form-item">
+          <text class="label">备注</text>
+          <textarea 
+            class="form-textarea"
+            v-model="formData.remark"
+            placeholder="请输入备注信息"
+            maxlength="200"
+          ></textarea>
+        </view>
+      </view>
+    </view>
+    
+    <view class="popup-footer">
+      <view class="footer-btn cancel-btn" @click="handleCancel">取消</view>
+      <view class="footer-btn confirm-btn" @click="handleConfirm">确认创建</view>
+    </view>
+    
+    <!-- 选择器弹窗 -->
+    <uni-popup ref="pickerPopup" type="bottom">
+      <view class="picker-content">
+        <view class="picker-header">
+          <view class="picker-btn" @click="closePicker">取消</view>
+          <text class="picker-title">{{ pickerTitle }}</text>
+          <view class="picker-btn confirm" @click="confirmPicker">确定</view>
+        </view>
+        <picker-view class="picker-view" :value="pickerValue" @change="onPickerChange">
+          <picker-view-column>
+            <view class="picker-item" v-for="(item, index) in pickerOptions" :key="index">
+              {{ item.label || item.name }}
+            </view>
+          </picker-view-column>
+        </picker-view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import apiRoute from '@/api/apiRoute.js'
+
+export default {
+  name: 'OrderFormPopup',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    studentInfo: {
+      type: Object,
+      default: () => ({})
+    },
+    resourceId: {
+      type: [String, Number],
+      default: ''
+    }
+  },
+  data() {
+    return {
+      formData: {
+        student_id: '',
+        course_id: '',
+        payment_type: '',
+        order_type: '',
+        order_amount: '',
+        total_hours: '',
+        gift_hours: '',
+        remark: '',
+        class_id: '1' // 临时设置默认班级ID，后续需要添加班级选择功能
+      },
+      
+      // 选择器相关
+      currentPicker: '',
+      pickerTitle: '',
+      pickerValue: [0],
+      pickerOptions: [],
+      selectedIndex: 0,
+      
+      // 数据选项
+      courseList: [],
+      paymentTypes: [
+        { value: 'cash', label: '现金支付' },
+        { value: 'scan_code', label: '扫码支付' },
+        { value: 'subscription', label: '订阅支付' },
+        { value: 'wxpay_online', label: '微信在线代付' }
+      ],
+      orderTypes: [
+        { value: '1', label: '新订单' },
+        { value: '2', label: '续费订单' },
+        { value: '3', label: '内部员工订单' }
+      ]
+    }
+  },
+  computed: {
+    selectedCourse() {
+      return this.courseList.find(item => item.id == this.formData.course_id)
+    },
+    selectedPaymentType() {
+      return this.paymentTypes.find(item => item.value === this.formData.payment_type)
+    },
+    selectedOrderType() {
+      return this.orderTypes.find(item => item.value === this.formData.order_type)
+    }
+  },
+  watch: {
+    visible(newVal) {
+      console.log('visible changed:', newVal)
+      if (newVal) {
+        console.log('开始初始化表单和加载课程列表')
+        this.initForm()
+        this.loadCourseList()
+      }
+    },
+    studentInfo: {
+      handler(newVal) {
+        if (newVal && newVal.id) {
+          this.formData.student_id = newVal.id
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  mounted() {
+    console.log('OrderFormPopup mounted, visible:', this.visible)
+    // 如果组件挂载时 visible 为 true，主动加载课程列表
+    if (this.visible) {
+      console.log('组件挂载时 visible 为 true，开始加载课程列表')
+      this.loadCourseList()
+    }
+  },
+  methods: {
+    initForm() {
+      this.formData = {
+        student_id: this.studentInfo && this.studentInfo.id || '',
+        course_id: '',
+        payment_type: '',
+        order_type: '',
+        order_amount: '',
+        total_hours: '',
+        gift_hours: '',
+        remark: '',
+        class_id: '1' // 临时设置默认班级ID
+      }
+    },
+    
+    async loadCourseList() {
+      console.log('loadCourseList 方法被调用')
+      try {
+        console.log('正在调用课程API: common_getCourseAll')
+        const res = await apiRoute.common_getCourseAll({})
+        console.log('课程API响应:', res)
+        if (res.code === 1) {
+          // 过滤状态为1的课程，并格式化数据结构
+          this.courseList = (res.data || [])
+            .filter(course => course.status === 1)
+            .map(course => ({
+              id: course.id,
+              name: course.course_name,
+              price: parseFloat(course.price || 0),
+              hours: course.session_count || 0,
+              gift_hours: course.gift_session_count || 0,
+              duration: course.duration || 0,
+              course_type: course.course_type,
+              remarks: course.remarks
+            }))
+        } else {
+          console.error('获取课程列表失败:', res.msg)
+          this.courseList = []
+        }
+      } catch (error) {
+        console.error('获取课程列表异常:', error)
+        this.courseList = []
+      }
+    },
+    
+    showCoursePicker() {
+      this.currentPicker = 'course'
+      this.pickerTitle = '选择课程'
+      this.pickerOptions = this.courseList
+      this.pickerValue = [0]
+      this.$refs.pickerPopup.open()
+    },
+    
+    showPaymentPicker() {
+      this.currentPicker = 'payment'
+      this.pickerTitle = '选择支付方式'
+      this.pickerOptions = this.paymentTypes
+      this.pickerValue = [0]
+      this.$refs.pickerPopup.open()
+    },
+    
+    showOrderTypePicker() {
+      this.currentPicker = 'orderType'
+      this.pickerTitle = '选择订单类型'
+      this.pickerOptions = this.orderTypes
+      this.pickerValue = [0]
+      this.$refs.pickerPopup.open()
+    },
+    
+    onPickerChange(e) {
+      this.selectedIndex = e.detail.value[0]
+    },
+    
+    confirmPicker() {
+      const selectedOption = this.pickerOptions[this.selectedIndex]
+      if (!selectedOption) return
+      
+      switch (this.currentPicker) {
+        case 'course':
+          this.formData.course_id = selectedOption.id
+          // 自动填充课程相关信息
+          if (selectedOption.price !== undefined) {
+            this.formData.order_amount = selectedOption.price.toString()
+          }
+          if (selectedOption.hours !== undefined) {
+            this.formData.total_hours = selectedOption.hours.toString()
+          }
+          if (selectedOption.gift_hours !== undefined) {
+            this.formData.gift_hours = selectedOption.gift_hours.toString()
+          }
+          console.log('课程选择后更新表单数据:', this.formData)
+          break
+        case 'payment':
+          this.formData.payment_type = selectedOption.value
+          break
+        case 'orderType':
+          this.formData.order_type = selectedOption.value
+          break
+      }
+      
+      this.closePicker()
+    },
+    
+    closePicker() {
+      this.$refs.pickerPopup.close()
+      this.currentPicker = ''
+    },
+    
+    validateForm() {
+      if (!this.formData.student_id) {
+        uni.showToast({ title: '请选择学生', icon: 'none' })
+        return false
+      }
+      if (!this.formData.course_id) {
+        uni.showToast({ title: '请选择课程', icon: 'none' })
+        return false
+      }
+      if (!this.formData.payment_type) {
+        uni.showToast({ title: '请选择支付方式', icon: 'none' })
+        return false
+      }
+      if (!this.formData.order_type) {
+        uni.showToast({ title: '请选择订单类型', icon: 'none' })
+        return false
+      }
+      if (!this.formData.order_amount || this.formData.order_amount <= 0) {
+        uni.showToast({ title: '请输入有效的订单金额', icon: 'none' })
+        return false
+      }
+      return true
+    },
+    
+    async handleConfirm() {
+      if (!this.validateForm()) return
+      
+      try {
+        uni.showLoading({ title: '创建中...' })
+        
+        const orderData = {
+          ...this.formData,
+          resource_id: this.resourceId,
+          staff_id: '', // 将从用户信息中获取
+          order_status: 'pending'
+        }
+        
+        const res = await apiRoute.xs_orderTableAdd(orderData)
+        
+        if (res.code === 1) {
+          uni.showToast({ title: '订单创建成功', icon: 'success' })
+          this.$emit('confirm', { orderData, result: res.data })
+        } else {
+          uni.showToast({ title: res.msg || '创建失败', icon: 'none' })
+        }
+      } catch (error) {
+        console.error('创建订单失败:', error)
+        uni.showToast({ title: '创建失败', icon: 'none' })
+      } finally {
+        uni.hideLoading()
+      }
+    },
+    
+    handleCancel() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.order-form-popup {
+  background: #1a1a1a;
+  border-radius: 20rpx 20rpx 0 0;
+  color: #ffffff;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.popup-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx 40rpx;
+  border-bottom: 1px solid #333;
+  
+  .popup-title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #ffffff;
+  }
+  
+  .close-btn {
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 40rpx;
+    color: #888;
+    border-radius: 50%;
+    background: #333;
+  }
+}
+
+.popup-content {
+  flex: 1;
+  overflow-y: auto;
+  padding: 40rpx;
+}
+
+.form-section {
+  .form-item {
+    margin-bottom: 40rpx;
+    
+    .label {
+      display: block;
+      font-size: 28rpx;
+      color: #cccccc;
+      margin-bottom: 20rpx;
+      
+      .required {
+        color: #ff4757;
+      }
+    }
+    
+    .student-info {
+      padding: 20rpx;
+      background: #2a2a2a;
+      border-radius: 12rpx;
+      
+      .student-name {
+        font-size: 30rpx;
+        color: #29D3B4;
+      }
+    }
+    
+    .picker-wrapper {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 24rpx 30rpx;
+      background: #2a2a2a;
+      border-radius: 12rpx;
+      border: 1px solid #444;
+      
+      .picker-text {
+        flex: 1;
+        font-size: 30rpx;
+        color: #ffffff;
+        
+        &.placeholder {
+          color: #888;
+        }
+      }
+      
+      .picker-arrow {
+        font-size: 24rpx;
+        color: #888;
+      }
+    }
+    
+    .form-input, .form-textarea {
+      width: 100%;
+      padding: 24rpx 30rpx;
+      background: #2a2a2a;
+      border: 1px solid #444;
+      border-radius: 12rpx;
+      color: #ffffff;
+      font-size: 30rpx;
+      
+      &::placeholder {
+        color: #888;
+      }
+      
+      &.readonly {
+        background: #1a1a1a;
+        border-color: #333;
+        color: #888;
+        
+        &::placeholder {
+          color: #666;
+        }
+      }
+    }
+    
+    .form-textarea {
+      height: 120rpx;
+      resize: none;
+    }
+  }
+}
+
+.popup-footer {
+  display: flex;
+  padding: 30rpx 40rpx;
+  border-top: 1px solid #333;
+  gap: 30rpx;
+  
+  .footer-btn {
+    flex: 1;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 12rpx;
+    font-size: 32rpx;
+    font-weight: 500;
+    
+    &.cancel-btn {
+      background: #444;
+      color: #cccccc;
+    }
+    
+    &.confirm-btn {
+      background: linear-gradient(45deg, #29D3B4, #1DB584);
+      color: #ffffff;
+    }
+  }
+}
+
+// 选择器样式
+.picker-content {
+  background: #1a1a1a;
+  border-radius: 20rpx 20rpx 0 0;
+  
+  .picker-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx 40rpx;
+    border-bottom: 1px solid #333;
+    
+    .picker-btn {
+      font-size: 30rpx;
+      color: #888;
+      
+      &.confirm {
+        color: #29D3B4;
+      }
+    }
+    
+    .picker-title {
+      font-size: 32rpx;
+      color: #ffffff;
+      font-weight: 500;
+    }
+  }
+  
+  .picker-view {
+    height: 400rpx;
+    color: #ffffff;
+    
+    .picker-item {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 30rpx;
+      color: #ffffff;
+    }
+  }
+}
+</style>

uniapp/components/order-list-card/index.vue

@@ -0,0 +1,450 @@
+<!--订单列表内容组件-->
+<template>
+  <view class="order-list-card">
+    <!-- 操作按钮区域 -->
+    <view class="action-header" v-if="orderList && orderList.length > 0">
+      <view class="add-order-btn" @click="handleAddOrder">
+        <text class="add-icon">+</text>
+        <text class="add-text">新增订单</text>
+      </view>
+    </view>
+    
+    <!-- 订单列表 -->
+    <scroll-view
+      class="order-list" 
+      v-if="orderList && orderList.length > 0"
+      scroll-y="true"
+      :enhanced="true"
+      style="height: 70vh;"
+    >
+      <view 
+        class="order-item" 
+        v-for="(order, index) in orderList" 
+        :key="order.id || index"
+        :class="{ 'pending-payment': order.status === 'pending' }"
+        @click="handleOrderClick(order)"
+      >
+        <view class="order-header">
+          <view class="order-info">
+            <view class="order-no">订单号：{{ order.order_no || 'N/A' }}</view>
+            <view class="order-time" v-if="order.create_time">
+              {{ formatTime(order.create_time) }}
+            </view>
+          </view>
+          <view :class="['order-status',getStatusClass(order.status)]">
+            {{ getStatusText(order.status) }}
+          </view>
+        </view>
+        
+        <!-- 订单内容 -->
+        <view class="order-content">
+          <view class="product-info" v-if="order.product_name">
+            <view class="product-name">{{ order.product_name }}</view>
+            <view class="product-specs" v-if="order.product_specs">
+              {{ order.product_specs }}
+            </view>
+          </view>
+          
+          <view class="order-details">
+            <!-- 价格信息 -->
+            <view class="detail-row" v-if="order.total_amount">
+              <text class="detail-label">订单金额：</text>
+              <text class="detail-value price">¥{{ order.total_amount }}</text>
+            </view>
+            
+            <view class="detail-row" v-if="order.paid_amount !== undefined">
+              <text class="detail-label">已付金额：</text>
+              <text class="detail-value paid">¥{{ order.paid_amount }}</text>
+            </view>
+            
+            <view class="detail-row" v-if="order.unpaid_amount !== undefined">
+              <text class="detail-label">未付金额：</text>
+              <text class="detail-value unpaid">¥{{ order.unpaid_amount }}</text>
+            </view>
+            
+            <!-- 其他信息 -->
+            <view class="detail-row" v-if="order.payment_method">
+              <text class="detail-label">支付方式：</text>
+              <text class="detail-value">{{ order.payment_method }}</text>
+            </view>
+            
+            <view class="detail-row" v-if="order.salesperson_name">
+              <text class="detail-label">销售顾问：</text>
+              <text class="detail-value">{{ order.salesperson_name }}</text>
+            </view>
+            
+            <view class="detail-row" v-if="order.course_count">
+              <text class="detail-label">课时数量：</text>
+              <text class="detail-value">{{ order.course_count }}节</text>
+            </view>
+            
+            <view class="detail-row" v-if="order.valid_period">
+              <text class="detail-label">有效期：</text>
+              <text class="detail-value">{{ order.valid_period }}</text>
+            </view>
+          </view>
+          
+          <!-- 备注信息 -->
+          <view class="order-remark" v-if="order.remark">
+            <view class="remark-label">备注：</view>
+            <view class="remark-content">{{ order.remark }}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 空状态 -->
+    <view class="empty-state" v-else>
+      <view class="empty-icon">📋</view>
+      <view class="empty-text">暂无订单记录</view>
+      <view class="empty-tip">客户还未产生任何订单</view>
+      <view class="empty-add-btn" @click="handleAddOrder">
+        <text>新增订单</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'OrderListCard',
+  props: {
+    // 订单列表数据
+    orderList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  
+  methods: {
+    // 查看订单详情
+    viewOrderDetail(order) {
+      this.$emit('view-detail', order)
+    },
+    
+    // 新增订单
+    handleAddOrder() {
+      this.$emit('add-order')
+    },
+    
+    // 订单点击处理（根据状态决定是查看详情还是支付）
+    handleOrderClick(order) {
+      if (order.status === 'pending') {
+        // 未支付订单，触发支付
+        this.$emit('pay-order', order)
+      } else {
+        // 已支付订单，查看详情
+        this.$emit('view-detail', order)
+      }
+    },
+    
+    // 获取状态样式类
+    getStatusClass(status) {
+      const statusMap = {
+        'pending': 'status-pending',
+        'paid': 'status-paid',
+        'partial': 'status-partial',
+        'cancelled': 'status-cancelled',
+        'completed': 'status-completed',
+        'refunded': 'status-refunded'
+      }
+      return statusMap[status] || 'status-default'
+    },
+    
+    // 获取状态文本
+    getStatusText(status) {
+      const statusMap = {
+        'pending': '待支付',
+        'paid': '已支付',
+        'partial': '部分支付',
+        'cancelled': '已取消',
+        'completed': '已完成',
+        'refunded': '已退款'
+      }
+      return statusMap[status] || '未知状态'
+    },
+    
+    // 格式化时间
+    formatTime(timeStr) {
+      if (!timeStr) return ''
+      try {
+        const date = new Date(timeStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
+      } catch (e) {
+        return timeStr
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.order-list-card {
+  padding: 0;
+}
+
+.order-list {
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+}
+
+.order-item {
+  background: #3A3A3A;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  border: 1px solid #404040;
+  transition: all 0.3s ease;
+  position: relative;
+  
+  &:active {
+    background: #4A4A4A;
+  }
+  
+  &.pending-payment {
+    border-color: #FFC107;
+    background: rgba(255, 193, 7, 0.05);
+    
+    &::after {
+      content: '点击支付';
+      position: absolute;
+      bottom: 16rpx;
+      right: 16rpx;
+      background: #FFC107;
+      color: #000000;
+      font-size: 24rpx;
+      padding: 8rpx 16rpx;
+      border-radius: 20rpx;
+      font-weight: 500;
+      z-index: 10;
+    }
+  }
+}
+
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 24rpx;
+  padding-bottom: 20rpx;
+  border-bottom: 1px solid #404040;
+}
+
+.order-info {
+  flex: 1;
+}
+
+.order-no {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 8rpx;
+}
+
+.order-time {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.order-status {
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  
+  &.status-pending {
+    background: rgba(255, 193, 7, 0.2);
+    color: #FFC107;
+  }
+  
+  &.status-paid {
+    background: rgba(76, 175, 80, 0.2);
+    color: #4CAF50;
+  }
+  
+  &.status-partial {
+    background: rgba(255, 152, 0, 0.2);
+    color: #FF9800;
+  }
+  
+  &.status-cancelled {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+  
+  &.status-completed {
+    background: rgba(41, 211, 180, 0.2);
+    color: #29D3B4;
+  }
+  
+  &.status-refunded {
+    background: rgba(244, 67, 54, 0.2);
+    color: #F44336;
+  }
+  
+  &.status-default {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+}
+
+.order-content {
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+
+.product-info {
+  padding: 20rpx;
+  background: rgba(41, 211, 180, 0.05);
+  border-radius: 12rpx;
+  border-left: 4rpx solid #29D3B4;
+}
+
+.product-name {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 8rpx;
+}
+
+.product-specs {
+  font-size: 24rpx;
+  color: #cccccc;
+}
+
+.order-details {
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.detail-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.detail-label {
+  font-size: 26rpx;
+  color: #999999;
+  min-width: 140rpx;
+}
+
+.detail-value {
+  font-size: 26rpx;
+  color: #ffffff;
+  flex: 1;
+  text-align: right;
+  
+  &.price {
+    color: #FFC107;
+    font-weight: 600;
+    font-size: 28rpx;
+  }
+  
+  &.paid {
+    color: #4CAF50;
+    font-weight: 600;
+  }
+  
+  &.unpaid {
+    color: #F44336;
+    font-weight: 600;
+  }
+}
+
+.order-remark {
+  padding: 20rpx;
+  background: rgba(255, 255, 255, 0.05);
+  border-radius: 12rpx;
+}
+
+.remark-label {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 12rpx;
+}
+
+.remark-content {
+  font-size: 26rpx;
+  color: #cccccc;
+  line-height: 1.5;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 80rpx 40rpx;
+  text-align: center;
+}
+
+.empty-icon {
+  font-size: 120rpx;
+  margin-bottom: 32rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #ffffff;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+}
+
+.empty-tip {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 1.4;
+  margin-bottom: 32rpx;
+}
+
+.empty-add-btn {
+  background: #29D3B4;
+  border-radius: 30rpx;
+  padding: 16rpx 40rpx;
+  color: #ffffff;
+  font-size: 28rpx;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background: #1fb396;
+  }
+}
+
+.action-header {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 24rpx;
+}
+
+.add-order-btn {
+  display: flex;
+  align-items: center;
+  background: #29D3B4;
+  border-radius: 30rpx;
+  padding: 12rpx 24rpx;
+  color: #ffffff;
+  font-size: 26rpx;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background: #1fb396;
+  }
+}
+
+.add-icon {
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-right: 8rpx;
+  line-height: 1;
+}
+
+.add-text {
+  font-size: 26rpx;
+}
+</style>

uniapp/components/schedule/ScheduleDetail.vue

@@ -1,5 +1,14 @@
 <template>
-	<fui-modal :show="visible" title="课程安排详情" width="700" @cancel="closePopup" :buttons="[]" :showClose="true">
+	<fui-modal :show="visible" width="700" @cancel="closePopup" :buttons="[]" :showClose="true" @close="closePopup">
+		<!-- 自定义关闭按钮 -->
+		<template #header>
+			<view class="custom-header">
+				<text class="modal-title">课程安排详情</text>
+				<view class="close-btn" @click="closePopup">
+					<fui-icon name="close" :size="24" color="#999"></fui-icon>
+				</view>
+			</view>
+		</template>
 		<view class="schedule-detail" v-if="scheduleInfo">
 			<!-- 课程基本信息 -->
 			<view class="section basic-info">
@@ -40,32 +49,117 @@
 			</view>
 
 
-			<!-- 学员信息 -->
+			<!-- 正式学员 -->
 			<view class="section students-info">
-				<view class="section-title">学员信息 ({{ scheduleInfo.students ? scheduleInfo.students.length : 0 }}人)
+				<view class="section-header">
+					<view class="section-title">正式学员 ({{ formalStudents.length }}人)</view>
+					<view class="arrange-student-btn" @click="handleArrangeStudent">
+						<fui-icon name="plus" :size="16" color="#fff"></fui-icon>
+						<text class="btn-text">安排学员</text>
+					</view>
 				</view>
-				<view class="student-list" v-if="scheduleInfo.students && scheduleInfo.students.length > 0">
+				<view class="cards-grid" v-if="formalStudents && formalStudents.length > 0">
-					<view class="student-item" v-for="(student, index) in scheduleInfo.students" :key="index" 
+					<view class="student-card filled" v-for="(student, index) in formalStudents" :key="index" 
 						@click="handleStudentClick(student, index)">
-						<view class="student-avatar">
+						<!-- 续费提醒徽章 -->
-							<image :src="student.avatar || '/static/icon-img/avatar.png'" mode="aspectFill"></image>
+						<view v-if="student.needsRenewal && !student.isTrialStudent" class="renewal-badge">待续费</view>
-						</view>
+						
-						<view class="student-detail">
+						<!-- 体验课学员标识 -->
-							<text class="student-name">{{ student.name }}</text>
+						<view v-if="student.isTrialStudent" class="trial-badge">体验课</view>
-							<text class=""
+						
-								:class="['student-status',student.statusClass]">{{ student.status_text }}</text>
+						<view class="avatar">{{ student.name.charAt(0) }}</view>
+						<view class="student-info">
+							<view class="student-name">{{ student.name }}</view>
+							<view class="student-age">年龄：{{ student.age }}岁</view>
+							<view class="course-status">课程状态：{{ student.courseStatus }}</view>
+							<view class="course-arrangement">课程安排：{{ student.courseType === 'fixed' ? '固定课' : '临时课' }}</view>
+							
+							<!-- 体验课学员显示 -->
+							<view v-if="student.isTrialStudent" class="trial-info">
+								<view class="trial-hours">体验课时：{{ student.trialClassCount }}节</view>
+							</view>
+							
+							<!-- 付费学员显示 -->
+							<view v-else class="paid-student-info">
+								<view class="remaining-hours">剩余课时：{{ student.remainingHours }}节</view>
+								<view class="expiry-date">到期时间：{{ student.expiryDate || '未设置' }}</view>
+								
+								<!-- 课时进度条 -->
+								<view class="progress-container">
+									<view class="progress-label">
+										<text>课时进度：{{ student.course_progress.used }}/{{ student.course_progress.total }}</text>
+										<text class="progress-percentage">{{ student.course_progress.percentage }}%</text>
+									</view>
+									<view class="progress-bar">
+										<view 
+											class="progress-fill" 
+											:style="{ width: student.course_progress.percentage + '%' }"
+										></view>
+									</view>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
 				<view class="empty-list" v-else>
-					<text>暂无学员参与此课程</text>
+					<text>暂无正式学员参与此课程</text>
+				</view>
+			</view>
+
+			<!-- 等待位学员 -->
+			<view class="section waiting-info" v-if="waitingStudents && waitingStudents.length > 0">
+				<view class="section-header">
+					<view class="section-title">等待位 ({{ waitingStudents.length }}人)</view>
+				</view>
+				<view class="cards-grid">
+					<view class="student-card filled waiting-filled" v-for="(student, index) in waitingStudents" :key="index" 
+						@click="handleStudentClick(student, index)">
+						<!-- 续费提醒徽章 -->
+						<view v-if="student.needsRenewal && !student.isTrialStudent" class="renewal-badge">待续费</view>
+						
+						<!-- 体验课学员标识 -->
+						<view v-if="student.isTrialStudent" class="trial-badge">体验课</view>
+						
+						<view class="avatar waiting-avatar">{{ student.name.charAt(0) }}</view>
+						<view class="student-info">
+							<view class="student-name">{{ student.name }}</view>
+							<view class="student-age">年龄：{{ student.age }}岁</view>
+							<view class="course-status">课程状态：{{ student.courseStatus }}</view>
+							<view class="course-arrangement">课程安排：等待位</view>
+							
+							<!-- 体验课学员显示 -->
+							<view v-if="student.isTrialStudent" class="trial-info">
+								<view class="trial-hours">体验课时：{{ student.trialClassCount }}节</view>
+							</view>
+							
+							<!-- 付费学员显示 -->
+							<view v-else class="paid-student-info">
+								<view class="remaining-hours">剩余课时：{{ student.remainingHours }}节</view>
+								<view class="expiry-date">到期时间：{{ student.expiryDate || '未设置' }}</view>
+								
+								<!-- 课时进度条 -->
+								<view class="progress-container">
+									<view class="progress-label">
+										<text>课时进度：{{ student.course_progress.used }}/{{ student.course_progress.total }}</text>
+										<text class="progress-percentage">{{ student.course_progress.percentage }}%</text>
+									</view>
+									<view class="progress-bar">
+										<view 
+											class="progress-fill" 
+											:style="{ width: student.course_progress.percentage + '%' }"
+										></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
 
 			<!-- 操作按钮 -->
 			<view class="action-buttons">
 				<fui-button type="primary" @click="handleEditCourse">编辑课程</fui-button>
-				<fui-button type="default" @click="handleAddNewCourse">新增课程</fui-button>
+				<fui-button type="success" @click="handleAddNewCourse">新增课程</fui-button>
 			</view>
 
 		</view>
@@ -128,6 +222,15 @@
 			}
 		},
 		computed: {
+			// 分离正式学员和等待位学员
+			formalStudents() {
+				if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
+				return this.scheduleInfo.students.filter(student => student.course_type !== 3);
+			},
+			waitingStudents() {
+				if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
+				return this.scheduleInfo.students.filter(student => student.course_type === 3);
+			},
 			statusClass() {
 				const statusMap = {
 					'pending': 'status-pending',
@@ -180,8 +283,9 @@
 					this.fetchScheduleDetail();
 				}
 			},
-			scheduleId(newVal) {
+			scheduleId(newVal, oldVal) {
-				if (newVal && this.visible) {
+				// 只有在弹窗可见且scheduleId真正发生变化时才重新获取数据
+				if (newVal && this.visible && newVal !== oldVal) {
 					this.fetchScheduleDetail();
 				}
 			}
@@ -197,13 +301,56 @@
 
 				this.loading = true;
 				this.error = false;
+				this.scheduleInfo = null;
 
 				try {
-					const res = await api.getCourseScheduleInfo({
+					// 调用真实API获取课程安排详情和学员信息
+					const res = await api.courseScheduleDetail({
 						schedule_id: this.scheduleId
 					});
+					
 					if (res.code === 1) {
-						this.scheduleInfo = res.data;
+						// 处理课程安排基本信息
+						const data = res.data;
+						
+						// 合并正式学员和等待位学员数据
+						const allStudents = [
+							...(data.formal_students || []),
+							...(data.waiting_students || [])
+						];
+						
+						this.scheduleInfo = {
+							...data.schedule_info,
+							// 确保包含教练姓名
+							coach_name: data.schedule_info.coach_name || '未分配',
+							// 合并所有学员数据并添加状态文本和必要字段
+							students: allStudents.map(student => ({
+								...student,
+								status_text: this.getStatusText(student.status || 0),
+								// 确保包含课程进度数据
+								course_progress: student.course_progress || {
+									total: student.totalHours || 0,
+									used: student.usedHours || 0,
+									remaining: student.remainingHours || 0,
+									percentage: student.totalHours > 0 ? Math.round((student.usedHours / student.totalHours) * 100) : 0
+								},
+								// 确保包含续费和体验课标识
+								needsRenewal: student.needsRenewal || false,
+								isTrialStudent: student.isTrialStudent || false,
+								// 确保包含课程状态和类型
+								courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
+								courseType: student.schedule_type === 2 ? 'fixed' : 'temporary',
+								// 确保包含年龄信息
+								age: student.age || 0,
+								// 确保包含体验课时信息
+								trialClassCount: student.trialClassCount || 0,
+								// 确保包含剩余课时和到期时间
+								remainingHours: student.remainingHours || 0,
+								expiryDate: student.expiryDate || ''
+							}))
+						};
+						
+						console.log('课程安排详情加载成功:', this.scheduleInfo);
 					} else {
 						uni.showToast({
 							title: res.msg || '获取课程安排详情失败',
@@ -316,11 +463,67 @@
 				};
 				return statusTextMap[status] || '未知状态';
 			},
+			
+			// 处理安排学员按钮点击
+			handleArrangeStudent() {
+				// 跳转到课程安排详情页面进行学员管理
+				const url = `/pages/market/clue/class_arrangement_detail?schedule_id=${this.scheduleId}`;
+				uni.navigateTo({
+					url: url,
+					success: () => {
+						// 关闭当前弹窗
+						this.closePopup();
+					},
+					fail: (error) => {
+						console.error('跳转到学员管理页面失败:', error);
+						uni.showToast({
+							title: '跳转失败，请重试',
+							icon: 'none'
+						});
+					}
+				});
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	/* 自定义头部样式 */
+	.custom-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		background: #2a2a2a;
+		border-bottom: 1px solid #3a3a3a;
+	}
+
+	.modal-title {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #29d3b4;
+	}
+
+	.close-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 50%;
+		background: rgba(255, 255, 255, 0.1);
+		cursor: pointer;
+		transition: background-color 0.3s;
+	}
+
+	.close-btn:hover {
+		background: rgba(255, 255, 255, 0.2);
+	}
+
+	.close-btn:active {
+		background: rgba(255, 255, 255, 0.3);
+	}
+
 	.schedule-detail {
 		padding: 20rpx;
 		max-height: 80vh;
@@ -335,13 +538,45 @@
 		padding: 20rpx;
 	}
 
+	.section-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 20rpx;
+		border-bottom: 1px solid #3a3a3a;
+		padding-bottom: 10rpx;
+	}
+
 	.section-title {
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #29d3b4;
-		margin-bottom: 20rpx;
+		flex: 1;
-		border-bottom: 1px solid #3a3a3a;
+	}
-		padding-bottom: 10rpx;
+
+	.arrange-student-btn {
+		display: flex;
+		align-items: center;
+		padding: 8rpx 16rpx;
+		background-color: #29d3b4;
+		border-radius: 6rpx;
+		cursor: pointer;
+		transition: background-color 0.3s;
+		
+		&:hover {
+			background-color: #22a68b;
+		}
+		
+		&:active {
+			background-color: #1e9680;
+		}
+	}
+
+	.btn-text {
+		margin-left: 8rpx;
+		font-size: 24rpx;
+		color: #fff;
+		font-weight: 500;
 	}
 
 	.info-item {
@@ -558,4 +793,165 @@
 	.option-btn.cancel {
 		background-color: #8e8e93;
 	}
+
+	/* 学员卡片网格样式 */
+	.cards-grid {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		gap: 16rpx;
+		margin-top: 20rpx;
+	}
+
+	.student-card {
+		background: #3a3a3a;
+		border-radius: 12rpx;
+		padding: 20rpx;
+		min-height: 200rpx;
+		position: relative;
+		cursor: pointer;
+		transition: all 0.3s ease;
+		border: 2px solid transparent;
+	}
+
+	.student-card.filled {
+		border-color: #29d3b4;
+	}
+
+	.student-card.waiting-filled {
+		border-color: #8b5cf6;
+		background: #2a2a3a;
+	}
+
+	.student-card:active {
+		transform: scale(0.98);
+		background-color: #4a4a4a;
+	}
+
+	/* 徽章样式 */
+	.renewal-badge {
+		position: absolute;
+		top: 12rpx;
+		right: 12rpx;
+		background: #ef4444;
+		color: white;
+		font-size: 20rpx;
+		padding: 4rpx 8rpx;
+		border-radius: 8rpx;
+		z-index: 10;
+		font-weight: 500;
+	}
+
+	.trial-badge {
+		position: absolute;
+		top: 12rpx;
+		right: 12rpx;
+		background: #8b5cf6;
+		color: white;
+		font-size: 20rpx;
+		padding: 4rpx 8rpx;
+		border-radius: 8rpx;
+		z-index: 10;
+		font-weight: 500;
+	}
+
+	/* 头像样式 */
+	.avatar {
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 50%;
+		background: #29d3b4;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-weight: 600;
+		font-size: 24rpx;
+		margin-bottom: 12rpx;
+	}
+
+	.waiting-avatar {
+		background: #8b5cf6;
+	}
+
+	/* 学员信息样式 */
+	.student-info {
+		font-size: 22rpx;
+		line-height: 1.4;
+	}
+
+	.student-name {
+		font-weight: 600;
+		font-size: 26rpx;
+		color: #fff;
+		margin-bottom: 8rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.student-age,
+	.course-status,
+	.course-arrangement {
+		color: #999;
+		margin-bottom: 6rpx;
+		font-size: 22rpx;
+	}
+
+	/* 体验课学员信息样式 */
+	.trial-info {
+		margin-top: 8rpx;
+	}
+
+	.trial-hours {
+		color: #8b5cf6;
+		font-weight: 500;
+		font-size: 22rpx;
+	}
+
+	/* 付费学员信息样式 */
+	.paid-student-info {
+		margin-top: 8rpx;
+	}
+
+	.remaining-hours,
+	.expiry-date {
+		color: #999;
+		margin-bottom: 6rpx;
+		font-size: 20rpx;
+	}
+
+	/* 课时进度条样式 */
+	.progress-container {
+		margin-top: 10rpx;
+	}
+
+	.progress-label {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 6rpx;
+		font-size: 18rpx;
+		color: #999;
+	}
+
+	.progress-percentage {
+		color: #29d3b4;
+		font-weight: 600;
+		font-size: 18rpx;
+	}
+
+	.progress-bar {
+		width: 100%;
+		height: 8rpx;
+		background: #4a4a4a;
+		border-radius: 4rpx;
+		overflow: hidden;
+	}
+
+	.progress-fill {
+		height: 100%;
+		background: linear-gradient(90deg, #29d3b4 0%, #22a68b 100%);
+		border-radius: 4rpx;
+		transition: width 0.3s ease;
+	}
 </style>

uniapp/components/service-list-card/index.vue

@@ -0,0 +1,485 @@
+<!--服务列表内容组件-->
+<template>
+  <view class="service-list-card">
+    <!-- 服务列表 -->
+    <view class="service-list" v-if="serviceList && serviceList.length > 0">
+      <view 
+        class="service-item" 
+        v-for="(service, index) in serviceList" 
+        :key="service.id || index"
+        @click="viewServiceDetail(service)"
+      >
+        <!-- 服务头部 -->
+        <view class="service-header">
+          <view class="service-image" v-if="service.preview_image_url">
+            <image 
+              :src="service.preview_image_url" 
+              mode="aspectFill"
+              class="service-img"
+            ></image>
+          </view>
+          <view class="service-image placeholder" v-else>
+            <text class="placeholder-text">🛠️</text>
+          </view>
+          
+          <view class="service-info">
+            <view class="service-name">{{ service.service_name || '未知服务' }}</view>
+            <view :class="['service-status',getStatusClass(service.status)]">
+              {{ getStatusText(service.status) }}
+            </view>
+          </view>
+        </view>
+        
+        <!-- 服务描述 -->
+        <view class="service-description" v-if="service.description">
+          {{ service.description }}
+        </view>
+        
+        <!-- 服务记录详情 -->
+        <view class="service-logs" v-if="service.logs && service.logs.length > 0">
+          <view class="logs-title">服务记录</view>
+          <view class="log-list">
+            <view 
+              class="log-item" 
+              v-for="(log, logIndex) in service.logs" 
+              :key="log.id || logIndex"
+            >
+              <view class="log-header">
+                <view class="log-time" v-if="log.service_time">
+                  {{ formatTime(log.service_time) }}
+                </view>
+                <view :class="['log-status',getLogStatusClass(log.status)]">
+                  {{ getLogStatusText(log.status) }}
+                </view>
+              </view>
+              
+              <view class="log-details">
+                <view class="log-detail-item" v-if="log.service_content">
+                  <text class="detail-label">服务内容：</text>
+                  <text class="detail-value">{{ log.service_content }}</text>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.service_staff">
+                  <text class="detail-label">服务人员：</text>
+                  <text class="detail-value">{{ log.service_staff }}</text>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.duration">
+                  <text class="detail-label">服务时长：</text>
+                  <text class="detail-value">{{ log.duration }}分钟</text>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.service_location">
+                  <text class="detail-label">服务地点：</text>
+                  <text class="detail-value">{{ log.service_location }}</text>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.customer_feedback">
+                  <text class="detail-label">客户反馈：</text>
+                  <text class="detail-value feedback">{{ log.customer_feedback }}</text>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.service_rating">
+                  <text class="detail-label">服务评分：</text>
+                  <view class="rating-stars">
+                    <text 
+                      class="star" 
+                      v-for="n in 5" 
+                      :key="n"
+                      :class="{ 'active': n <= log.service_rating }"
+                    >★</text>
+                    <text class="rating-text">({{ log.service_rating }}/5)</text>
+                  </view>
+                </view>
+                
+                <view class="log-detail-item" v-if="log.remark">
+                  <text class="detail-label">备注：</text>
+                  <text class="detail-value remark">{{ log.remark }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        
+        <!-- 服务统计信息 -->
+        <view class="service-stats" v-if="service.total_count || service.completed_count">
+          <view class="stat-item">
+            <text class="stat-label">总次数：</text>
+            <text class="stat-value">{{ service.total_count || 0 }}次</text>
+          </view>
+          <view class="stat-item">
+            <text class="stat-label">已完成：</text>
+            <text class="stat-value">{{ service.completed_count || 0 }}次</text>
+          </view>
+          <view class="stat-item" v-if="service.total_count">
+            <text class="stat-label">剩余：</text>
+            <text class="stat-value highlight">{{ (service.total_count - (service.completed_count || 0)) }}次</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    <!-- 空状态 -->
+    <view class="empty-state" v-else>
+      <view class="empty-icon">🔧</view>
+      <view class="empty-text">暂无服务记录</view>
+      <view class="empty-tip">客户还未使用任何服务</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'ServiceListCard',
+  props: {
+    // 服务列表数据
+    serviceList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  
+  methods: {
+    // 查看服务详情
+    viewServiceDetail(service) {
+      this.$emit('view-detail', service)
+    },
+    
+    // 获取服务状态样式类
+    getStatusClass(status) {
+      const statusMap = {
+        'active': 'status-active',
+        'completed': 'status-completed',
+        'suspended': 'status-suspended',
+        'expired': 'status-expired'
+      }
+      return statusMap[status] || 'status-default'
+    },
+    
+    // 获取服务状态文本
+    getStatusText(status) {
+      const statusMap = {
+        'active': '进行中',
+        'completed': '已完成',
+        'suspended': '已暂停',
+        'expired': '已过期'
+      }
+      return statusMap[status] || '未知状态'
+    },
+    
+    // 获取日志状态样式类
+    getLogStatusClass(status) {
+      const statusMap = {
+        'completed': 'log-completed',
+        'cancelled': 'log-cancelled',
+        'pending': 'log-pending'
+      }
+      return statusMap[status] || 'log-default'
+    },
+    
+    // 获取日志状态文本
+    getLogStatusText(status) {
+      const statusMap = {
+        'completed': '已完成',
+        'cancelled': '已取消',
+        'pending': '待处理'
+      }
+      return statusMap[status] || '未知'
+    },
+    
+    // 格式化时间
+    formatTime(timeStr) {
+      if (!timeStr) return ''
+      try {
+        const date = new Date(timeStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
+      } catch (e) {
+        return timeStr
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.service-list-card {
+  padding: 0;
+}
+
+.service-list {
+  display: flex;
+  flex-direction: column;
+  gap: 32rpx;
+}
+
+.service-item {
+  background: #3A3A3A;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  border: 1px solid #404040;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background: #4A4A4A;
+  }
+}
+
+.service-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 24rpx;
+}
+
+.service-image {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 16rpx;
+  margin-right: 24rpx;
+  overflow: hidden;
+  
+  &.placeholder {
+    background: rgba(41, 211, 180, 0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.service-img {
+  width: 100%;
+  height: 100%;
+}
+
+.placeholder-text {
+  font-size: 40rpx;
+  opacity: 0.8;
+}
+
+.service-info {
+  flex: 1;
+}
+
+.service-name {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 8rpx;
+}
+
+.service-status {
+  padding: 6rpx 12rpx;
+  border-radius: 16rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+  display: inline-block;
+  
+  &.status-active {
+    background: rgba(41, 211, 180, 0.2);
+    color: #29D3B4;
+  }
+  
+  &.status-completed {
+    background: rgba(76, 175, 80, 0.2);
+    color: #4CAF50;
+  }
+  
+  &.status-suspended {
+    background: rgba(255, 193, 7, 0.2);
+    color: #FFC107;
+  }
+  
+  &.status-expired {
+    background: rgba(244, 67, 54, 0.2);
+    color: #F44336;
+  }
+  
+  &.status-default {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+}
+
+.service-description {
+  font-size: 26rpx;
+  color: #cccccc;
+  line-height: 1.5;
+  margin-bottom: 24rpx;
+  padding: 20rpx;
+  background: rgba(255, 255, 255, 0.05);
+  border-radius: 12rpx;
+}
+
+.service-logs {
+  margin-bottom: 24rpx;
+}
+
+.logs-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 20rpx;
+  padding-bottom: 12rpx;
+  border-bottom: 1px solid #404040;
+}
+
+.log-list {
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+
+.log-item {
+  background: rgba(255, 255, 255, 0.03);
+  border-radius: 12rpx;
+  padding: 24rpx;
+  border-left: 3rpx solid #29D3B4;
+}
+
+.log-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+
+.log-time {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.log-status {
+  padding: 4rpx 10rpx;
+  border-radius: 12rpx;
+  font-size: 20rpx;
+  font-weight: 500;
+  
+  &.log-completed {
+    background: rgba(76, 175, 80, 0.2);
+    color: #4CAF50;
+  }
+  
+  &.log-cancelled {
+    background: rgba(244, 67, 54, 0.2);
+    color: #F44336;
+  }
+  
+  &.log-pending {
+    background: rgba(255, 193, 7, 0.2);
+    color: #FFC107;
+  }
+  
+  &.log-default {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+}
+
+.log-details {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+}
+
+.log-detail-item {
+  display: flex;
+  align-items: flex-start;
+}
+
+.detail-label {
+  font-size: 24rpx;
+  color: #999999;
+  min-width: 120rpx;
+  margin-right: 16rpx;
+}
+
+.detail-value {
+  font-size: 24rpx;
+  color: #ffffff;
+  flex: 1;
+  
+  &.feedback,
+  &.remark {
+    line-height: 1.5;
+  }
+}
+
+.rating-stars {
+  display: flex;
+  align-items: center;
+  gap: 4rpx;
+}
+
+.star {
+  font-size: 28rpx;
+  color: #404040;
+  
+  &.active {
+    color: #FFC107;
+  }
+}
+
+.rating-text {
+  font-size: 24rpx;
+  color: #999999;
+  margin-left: 12rpx;
+}
+
+.service-stats {
+  display: flex;
+  align-items: center;
+  gap: 32rpx;
+  padding: 20rpx;
+  background: rgba(41, 211, 180, 0.05);
+  border-radius: 12rpx;
+  border-left: 4rpx solid #29D3B4;
+}
+
+.stat-item {
+  display: flex;
+  align-items: center;
+}
+
+.stat-label {
+  font-size: 24rpx;
+  color: #999999;
+  margin-right: 8rpx;
+}
+
+.stat-value {
+  font-size: 24rpx;
+  color: #ffffff;
+  font-weight: 600;
+  
+  &.highlight {
+    color: #29D3B4;
+  }
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 80rpx 40rpx;
+  text-align: center;
+}
+
+.empty-icon {
+  font-size: 120rpx;
+  margin-bottom: 32rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #ffffff;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+}
+
+.empty-tip {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 1.4;
+}
+</style>

uniapp/components/student-info-card/student-info-card.vue

@@ -9,10 +9,19 @@
       <view class="student-details">
         <view class="student-name">{{ student.name || '未知学生' }}</view>
         <view class="student-meta">
-          <text class="student-age">{{ formatAge(student.age) }}</text>
+          <text class="student-age">{{ calculateAge(student.birthday) }}</text>
           <text class="student-gender">{{ formatGender(student.gender) }}</text>
         </view>
-        <view class="student-label" v-if="student.member_label">{{ student.member_label }}</view>
+        <!-- 学员标签 -->
+        <view class="student-tags" v-if="student.student_tags && student.student_tags.length > 0">
+          <view 
+            class="student-tag" 
+            v-for="tag in student.student_tags" 
+            :key="tag"
+          >
+            {{ tag }}
+          </view>
+        </view>
       </view>
       <view class="action-toggle" @click="toggleActions">
         <text class="toggle-icon">{{ student.actionsExpanded ? '▲' : '▼' }}</text>
@@ -23,8 +32,29 @@
     <view class="student-info" v-if="showDetails">
       <view class="info-row">
         <text class="info-label">生日：</text>
-        <text class="info-value">{{ student.birthday || '未知' }}</text>
+        <text class="info-value">{{ student.birthday || '' }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">备注：</text>
+        <text class="info-value">{{ student.remark || '' }}</text>
       </view>
+      <view class="info-row">
+        <text class="info-label">班主任：</text>
+        <text class="info-value">{{ student.class_teacher || '' }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">教务：</text>
+        <text class="info-value">{{ student.academic_affairs || '' }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">体验课次数：</text>
+        <text class="info-value">{{ student.trial_course_count || 0 }}次</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">课程到访情况：</text>
+        <text class="info-value">{{ student.course_visit_status || '' }}</text>
+      </view>
+      <!-- 保留原有紧急联系人等字段，有值才显示 -->
       <view class="info-row" v-if="student.emergency_contact">
         <text class="info-label">紧急联系人：</text>
         <text class="info-value">{{ student.emergency_contact }}</text>
@@ -33,10 +63,6 @@
         <text class="info-label">联系电话：</text>
         <text class="info-value">{{ student.contact_phone }}</text>
       </view>
-      <view class="info-row" v-if="student.note">
-        <text class="info-label">备注：</text>
-        <text class="info-value">{{ student.note }}</text>
-      </view>
     </view>
 
     <!-- 操作按钮区域 -->
@@ -84,15 +110,39 @@ export default {
       this.$emit('action', { action, student: this.student })
     },
 
-    // 格式化年龄显示
+    // 计算年龄（x岁x月）
-    formatAge(age) {
+    calculateAge(birthday) {
-      if (!age) return '未知年龄'
+      if (!birthday) return ''
-      const years = Math.floor(age)
+      
-      const months = Math.round((age - years) * 12)
+      const birthDate = new Date(birthday)
-      if (months === 0) {
+      const now = new Date()
+      
+      let years = now.getFullYear() - birthDate.getFullYear()
+      let months = now.getMonth() - birthDate.getMonth()
+      
+      if (months < 0) {
+        years--
+        months += 12
+      }
+      
+      // 如果当前日期小于生日的日期，月份减1
+      if (now.getDate() < birthDate.getDate()) {
+        months--
+        if (months < 0) {
+          years--
+          months += 12
+        }
+      }
+      
+      if (years > 0 && months > 0) {
+        return `${years}岁${months}月`
+      } else if (years > 0) {
         return `${years}岁`
+      } else if (months > 0) {
+        return `${months}月`
+      } else {
+        return '新生儿'
       }
-      return `${years}岁${months}个月`
     },
 
     // 格式化性别显示
@@ -100,7 +150,7 @@ export default {
       switch (gender) {
         case 1: return '男'
         case 2: return '女'
-        default: return '未知'
+        default: return ''
       }
     }
   }
@@ -160,13 +210,21 @@ export default {
       }
     }
     
-    .student-label {
+    .student-tags {
-      color: #29d3b4;
+      display: flex;
-      font-size: 20rpx;
+      flex-wrap: wrap;
-      background-color: rgba(41, 211, 180, 0.2);
+      gap: 8rpx;
-      padding: 4rpx 12rpx;
+      margin-top: 8rpx;
-      border-radius: 10rpx;
+      
-      display: inline-block;
+      .student-tag {
+        color: #29d3b4;
+        font-size: 18rpx;
+        background-color: rgba(41, 211, 180, 0.2);
+        border: 1rpx solid rgba(41, 211, 180, 0.5);
+        padding: 4rpx 10rpx;
+        border-radius: 10rpx;
+        display: inline-block;
+      }
     }
   }
   

uniapp/components/study-plan-card/index.vue

@@ -0,0 +1,290 @@
+<!--学习计划内容组件-->
+<template>
+  <view class="study-plan-card">
+    <!-- 学习计划列表 -->
+    <view class="plan-list" v-if="planList && planList.length > 0">
+      <view 
+        class="plan-item" 
+        v-for="(plan, index) in planList" 
+        :key="plan.id || index"
+        @click="viewPlanDetail(plan)"
+      >
+        <view class="plan-header">
+          <view class="plan-title">{{ plan.plan_name || '未命名计划' }}</view>
+          <view :class="['plan-status',getStatusClass(plan.status)]">
+            {{ getStatusText(plan.status) }}
+          </view>
+        </view>
+        
+        <view class="plan-content">
+          <view class="plan-description" v-if="plan.plan_content">
+            {{ plan.plan_content }}
+          </view>
+          
+          <view class="plan-meta">
+            <view class="meta-item" v-if="plan.plan_type">
+              <text class="meta-label">计划类型：</text>
+              <text class="meta-value">{{ plan.plan_type }}</text>
+            </view>
+            <view class="meta-item" v-if="plan.create_time">
+              <text class="meta-label">创建时间：</text>
+              <text class="meta-value">{{ formatTime(plan.create_time) }}</text>
+            </view>
+            <view class="meta-item" v-if="plan.start_date">
+              <text class="meta-label">开始日期：</text>
+              <text class="meta-value">{{ formatDate(plan.start_date) }}</text>
+            </view>
+            <view class="meta-item" v-if="plan.end_date">
+              <text class="meta-label">结束日期：</text>
+              <text class="meta-value">{{ formatDate(plan.end_date) }}</text>
+            </view>
+          </view>
+        </view>
+        
+        <!-- 进度条 -->
+        <view class="plan-progress" v-if="plan.progress !== undefined">
+          <view class="progress-bar">
+            <view 
+              class="progress-fill" 
+              :style="{ width: plan.progress + '%' }"
+            ></view>
+          </view>
+          <view class="progress-text">{{ plan.progress }}%</view>
+        </view>
+      </view>
+    </view>
+    
+    <!-- 空状态 -->
+    <view class="empty-state" v-else>
+      <view class="empty-icon">📚</view>
+      <view class="empty-text">暂无学习计划</view>
+      <view class="empty-tip">点击下方"新增"按钮创建学习计划</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'StudyPlanCard',
+  props: {
+    // 学习计划列表数据
+    planList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  
+  methods: {
+    // 查看计划详情
+    viewPlanDetail(plan) {
+      this.$emit('view-detail', plan)
+    },
+    
+    // 获取状态样式类
+    getStatusClass(status) {
+      const statusMap = {
+        'active': 'status-active',
+        'completed': 'status-completed',
+        'pending': 'status-pending',
+        'expired': 'status-expired'
+      }
+      return statusMap[status] || 'status-default'
+    },
+    
+    // 获取状态文本
+    getStatusText(status) {
+      const statusMap = {
+        'active': '进行中',
+        'completed': '已完成',
+        'pending': '待开始',
+        'expired': '已过期'
+      }
+      return statusMap[status] || '未知状态'
+    },
+    
+    // 格式化时间
+    formatTime(timeStr) {
+      if (!timeStr) return ''
+      try {
+        const date = new Date(timeStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
+      } catch (e) {
+        return timeStr
+      }
+    },
+    
+    // 格式化日期
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      try {
+        const date = new Date(dateStr)
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+      } catch (e) {
+        return dateStr
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.study-plan-card {
+  padding: 0;
+}
+
+.plan-list {
+  display: flex;
+  flex-direction: column;
+  gap: 24rpx;
+}
+
+.plan-item {
+  background: #3A3A3A;
+  border-radius: 16rpx;
+  padding: 32rpx;
+  border: 1px solid #404040;
+  transition: all 0.3s ease;
+  
+  &:active {
+    background: #4A4A4A;
+  }
+}
+
+.plan-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 20rpx;
+}
+
+.plan-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #ffffff;
+  flex: 1;
+  margin-right: 20rpx;
+}
+
+.plan-status {
+  padding: 8rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  
+  &.status-active {
+    background: rgba(41, 211, 180, 0.2);
+    color: #29D3B4;
+  }
+  
+  &.status-completed {
+    background: rgba(76, 175, 80, 0.2);
+    color: #4CAF50;
+  }
+  
+  &.status-pending {
+    background: rgba(255, 193, 7, 0.2);
+    color: #FFC107;
+  }
+  
+  &.status-expired {
+    background: rgba(244, 67, 54, 0.2);
+    color: #F44336;
+  }
+  
+  &.status-default {
+    background: rgba(158, 158, 158, 0.2);
+    color: #9E9E9E;
+  }
+}
+
+.plan-content {
+  margin-bottom: 20rpx;
+}
+
+.plan-description {
+  font-size: 28rpx;
+  color: #cccccc;
+  line-height: 1.5;
+  margin-bottom: 20rpx;
+}
+
+.plan-meta {
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.meta-item {
+  display: flex;
+  align-items: center;
+}
+
+.meta-label {
+  font-size: 26rpx;
+  color: #999999;
+  min-width: 140rpx;
+}
+
+.meta-value {
+  font-size: 26rpx;
+  color: #ffffff;
+  flex: 1;
+}
+
+.plan-progress {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+}
+
+.progress-bar {
+  flex: 1;
+  height: 8rpx;
+  background: #404040;
+  border-radius: 4rpx;
+  overflow: hidden;
+}
+
+.progress-fill {
+  height: 100%;
+  background: linear-gradient(90deg, #29D3B4 0%, #4ECDC4 100%);
+  border-radius: 4rpx;
+  transition: width 0.3s ease;
+}
+
+.progress-text {
+  font-size: 24rpx;
+  color: #29D3B4;
+  font-weight: 600;
+  min-width: 60rpx;
+  text-align: right;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 80rpx 40rpx;
+  text-align: center;
+}
+
+.empty-icon {
+  font-size: 120rpx;
+  margin-bottom: 32rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #ffffff;
+  margin-bottom: 16rpx;
+  font-weight: 500;
+}
+
+.empty-tip {
+  font-size: 26rpx;
+  color: #999999;
+  line-height: 1.4;
+}
+</style>

uniapp/main.js

@@ -18,6 +18,8 @@ Vue.prototype.$api = api
 Vue.prototype.$api = http
 Vue.prototype.$util = util
 Vue.prototype.$getimg = Api_url
+// 挂载navigateToPage方法到Vue实例
+Vue.prototype.$navigateToPage = util.navigateToPage
 Vue.mixin(minxin)
 
 

uniapp/mock/index.js

@@ -553,6 +553,56 @@ class MockService {
             }, 1, 'success')
         }
         
+        // 获取学员课程信息
+        if (checkEndpoint(['/getStudentCourseInfo', 'getStudentCourseInfo'])) {
+            const resourceId = params.resource_id || params.id
+            // 模拟课程信息数据
+            const courseInfoData = [
+                {
+                    id: 1,
+                    course_name: '少儿篮球初级班',
+                    total_count: 24, // 总课时
+                    used_count: 8, // 已使用课时
+                    remaining_count: 16, // 剩余课时
+                    formal_hours: 20, // 正式课时
+                    gift_hours: 4, // 赠送课时
+                    used_formal_hours: 6, // 已使用正式课时
+                    used_gift_hours: 2, // 已使用赠送课时
+                    leave_count: 1, // 请假次数
+                    start_date: '2024-01-01', // 开始日期
+                    expiry_date: '2024-06-30', // 结束日期
+                    status: 'active', // 课程状态
+                    course_type: '正式课',
+                    teacher_name: '王教练',
+                    course_price: 2880.00,
+                    class_duration: 90, // 单节时长(分钟)
+                    create_time: '2024-01-01 10:00:00'
+                },
+                {
+                    id: 2,
+                    course_name: '体能训练课',
+                    total_count: 12,
+                    used_count: 3,
+                    remaining_count: 9,
+                    formal_hours: 10,
+                    gift_hours: 2,
+                    used_formal_hours: 2,
+                    used_gift_hours: 1,
+                    leave_count: 0,
+                    start_date: '2024-01-15',
+                    expiry_date: '2024-04-15',
+                    status: 'active',
+                    course_type: '正式课',
+                    teacher_name: '李教练',
+                    course_price: 1680.00,
+                    class_duration: 60,
+                    create_time: '2024-01-15 14:00:00'
+                }
+            ]
+            
+            return this.createResponse(courseInfoData, 1, 'success')
+        }
+        
         // 其他家长端API的Mock数据处理
         if (checkEndpoint(['/parent/child/materials', 'parent_getChildMaterials'])) {
             return this.createResponse({ data: [], total: 0 }, 1, 'success')
@@ -688,6 +738,7 @@ class MockService {
             '/xy/personCourseSchedule',     // xy_personCourseSchedule相关
             '/xy/assignment',               // xy_assignment相关
             '/xy/login',                    // xy_login
+            '/getStudentCourseInfo',        // 获取学员课程信息
             // 家长端专用API - URL匹配
             '/parent/children',             // parent_getChildrenList
             '/parent/child/info',           // parent_getChildInfo
@@ -708,6 +759,7 @@ class MockService {
             'xy_personCourseScheduleGetCalendar',
             'xy_personCourseScheduleGetMyCoach',
             'xy_login',
+            'getStudentCourseInfo',
             // 家长端专用API - 方法名匹配（用于开发调试）
             'parent_getChildrenList',
             'parent_getChildInfo',

uniapp/pages.json

@@ -732,7 +732,6 @@
 			"path": "pages/coach/schedule/adjust_course",
 			"style": {
 				"navigationBarTitleText": "调整课程安排",
-				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#292929",
 				"navigationBarTextStyle": "white"
 			}

uniapp/pages/coach/schedule/adjust_course.vue

@@ -1,14 +1,5 @@
 <template>
   <view class="adjust-course-container">
-    <uni-nav-bar
-      title="调整课程安排"
-      left-icon="left"
-      fixed="true"
-      background-color="#292929"
-      color="#FFFFFF"
-      @clickLeft="goBack"
-    ></uni-nav-bar>
-    
     <view class="form-container">
       <view v-if="loading" class="loading-container">
         <fui-loading></fui-loading>
@@ -45,64 +36,63 @@
         
         <!-- 教练选择 -->
         <fui-form-item label="授课教练">
-          <view class="selector-input" @click="showCoachPicker = true">
+          <picker 
-            <text>{{ selectedCoach ? selectedCoach.name : scheduleInfo.coach_name }}</text>
+            :value="coachPickerIndex"
-            <fui-icon name="arrowdown" :size="32" color="#CCCCCC"></fui-icon>
+            :range="coachOptions"
-          </view>
+            :range-key="'name'"
-          <fui-picker
+            @change="onCoachSelect"
-            :show="showCoachPicker"
+          >
-            :options="coachOptions"
+            <view class="selector-input">
-            valueKey="id"
+              <text>{{ selectedCoach ? selectedCoach.name : scheduleInfo.coach_name }}</text>
-            textKey="name"
+              <fui-icon name="arrowdown" :size="32" color="#CCCCCC"></fui-icon>
-            @confirm="onCoachSelect"
+            </view>
-            @cancel="showCoachPicker = false"
+          </picker>
-          ></fui-picker>
         </fui-form-item>
         
         <!-- 场地选择 -->
         <fui-form-item label="上课场地">
-          <view class="selector-input" @click="showVenuePicker = true">
+          <picker 
-            <text>{{ selectedVenue ? selectedVenue.venue_name : scheduleInfo.venue_name }}</text>
+            :value="venuePickerIndex"
-            <fui-icon name="arrowdown" :size="32" color="#CCCCCC"></fui-icon>
+            :range="venueOptions"
-          </view>
+            :range-key="'venue_name'"
-          <fui-picker
+            @change="onVenueSelect"
-            :show="showVenuePicker"
+          >
-            :options="venueOptions"
+            <view class="selector-input">
-            valueKey="id"
+              <text>{{ selectedVenue ? selectedVenue.venue_name : scheduleInfo.venue_name }}</text>
-            textKey="venue_name"
+              <fui-icon name="arrowdown" :size="32" color="#CCCCCC"></fui-icon>
-            @confirm="onVenueSelect"
+            </view>
-            @cancel="showVenuePicker = false"
+          </picker>
-          ></fui-picker>
         </fui-form-item>
         
         <!-- 日期选择 -->
         <fui-form-item label="上课日期">
-          <view class="selector-input" @click="showDatePicker = true">
+          <picker 
-            <text>{{ formData.course_date || scheduleInfo.course_date }}</text>
+            mode="date"
-            <fui-icon name="calendar" :size="32" color="#CCCCCC"></fui-icon>
+            :value="formData.course_date || scheduleInfo.course_date || getCurrentDate()"
-          </view>
+            :start="getMinDate()"
-          <fui-date-picker
+            :end="getMaxDate()"
-            :show="showDatePicker"
+            @change="onDateSelect"
-            @confirm="onDateSelect"
+          >
-            @cancel="showDatePicker = false"
+            <view class="selector-input">
-            :value="formData.course_date || scheduleInfo.course_date"
+              <text>{{ formData.course_date || scheduleInfo.course_date }}</text>
-          ></fui-date-picker>
+              <fui-icon name="calendar" :size="32" color="#CCCCCC"></fui-icon>
+            </view>
+          </picker>
         </fui-form-item>
         
         <!-- 时间选择 -->
         <fui-form-item label="上课时间">
-          <view class="selector-input" @click="showTimePicker = true">
+          <picker 
-            <text>{{ formData.time_slot || scheduleInfo.time_slot }}</text>
+            :value="timePickerIndex"
-            <fui-icon name="time" :size="32" color="#CCCCCC"></fui-icon>
+            :range="timeSlotOptions"
-          </view>
+            :range-key="'text'"
-          <fui-picker
+            @change="onTimeSelect"
-            :show="showTimePicker"
+          >
-            :options="timeSlotOptions"
+            <view class="selector-input">
-            valueKey="value"
+              <text>{{ formData.time_slot || scheduleInfo.time_slot }}</text>
-            textKey="text"
+              <fui-icon name="time" :size="32" color="#CCCCCC"></fui-icon>
-            @confirm="onTimeSelect"
+            </view>
-            @cancel="showTimePicker = false"
+          </picker>
-          ></fui-picker>
         </fui-form-item>
         
         <!-- 容量设置 -->
@@ -115,15 +105,6 @@
           ></fui-input>
         </fui-form-item>
         
-        <!-- 调整原因 -->
-        <fui-form-item label="调整原因" required>
-          <fui-textarea
-            :value="formData.adjust_reason"
-            placeholder="请输入调整原因"
-            @input="formData.adjust_reason = $event"
-            maxlength="200"
-          ></fui-textarea>
-        </fui-form-item>
         
         <!-- 提交按钮 -->
         <view class="btn-container">
@@ -157,15 +138,10 @@ export default {
         venue_id: '',
         course_date: '',
         time_slot: '',
-        available_capacity: '',
+        available_capacity: ''
-        adjust_reason: ''
       },
       
-      // 选择器数据
+      // 移除不再需要的showDatePicker
-      showCoachPicker: false,
-      showVenuePicker: false,
-      showDatePicker: false,
-      showTimePicker: false,
       
       // 选项数据
       coachOptions: [],
@@ -174,7 +150,12 @@ export default {
       
       // 选中的数据对象
       selectedCoach: null,
-      selectedVenue: null
+      selectedVenue: null,
+      
+      // picker索引
+      coachPickerIndex: 0,
+      venuePickerIndex: 0,
+      timePickerIndex: 0
     };
   },
   
@@ -269,86 +250,67 @@ export default {
       // 查找当前教练
       if (this.scheduleInfo.coach_id) {
         this.selectedCoach = this.coachOptions.find(coach => coach.id === this.scheduleInfo.coach_id);
+        this.coachPickerIndex = this.coachOptions.findIndex(coach => coach.id === this.scheduleInfo.coach_id);
+        if (this.coachPickerIndex === -1) this.coachPickerIndex = 0;
       }
       
       // 查找当前场地
       if (this.scheduleInfo.venue_id) {
         this.selectedVenue = this.venueOptions.find(venue => venue.id === this.scheduleInfo.venue_id);
+        this.venuePickerIndex = this.venueOptions.findIndex(venue => venue.id === this.scheduleInfo.venue_id);
+        if (this.venuePickerIndex === -1) this.venuePickerIndex = 0;
+      }
+      
+      // 查找当前时间段
+      if (this.scheduleInfo.time_slot && this.timeSlotOptions.length > 0) {
+        this.timePickerIndex = this.timeSlotOptions.findIndex(time => time.value === this.scheduleInfo.time_slot);
+        if (this.timePickerIndex === -1) this.timePickerIndex = 0;
       }
     },
     
-    // 生成时间段选项
+    // 生成时间段选项（保留原有方法作为备用）
     generateTimeSlotOptions() {
-      const timeSlots = [];
+      // 使用新的默认时间选项生成方法
-      
+      this.generateDefaultTimeOptions();
-      // 早上时间段
-      for (let hour = 8; hour < 12; hour++) {
-        const startHour = hour.toString().padStart(2, '0');
-        const endHour = (hour + 1).toString().padStart(2, '0');
-        timeSlots.push({
-          value: `${startHour}:00-${endHour}:00`,
-          text: `${startHour}:00-${endHour}:00`
-        });
-      }
-      
-      // 下午时间段
-      for (let hour = 12; hour < 18; hour++) {
-        const startHour = hour.toString().padStart(2, '0');
-        const endHour = (hour + 1).toString().padStart(2, '0');
-        timeSlots.push({
-          value: `${startHour}:00-${endHour}:00`,
-          text: `${startHour}:00-${endHour}:00`
-        });
-      }
-      
-      // 晚上时间段
-      for (let hour = 18; hour < 22; hour++) {
-        const startHour = hour.toString().padStart(2, '0');
-        const endHour = (hour + 1).toString().padStart(2, '0');
-        timeSlots.push({
-          value: `${startHour}:00-${endHour}:00`,
-          text: `${startHour}:00-${endHour}:00`
-        });
-      }
-      
-      this.timeSlotOptions = timeSlots;
     },
     
-    // 选择器处理方法
+    // 选择器事件处理
     onCoachSelect(e) {
-      const index = e.index;
+      const index = e.detail.value;
+      this.coachPickerIndex = index;
       if (index >= 0 && index < this.coachOptions.length) {
         this.selectedCoach = this.coachOptions[index];
         this.formData.coach_id = this.selectedCoach.id;
       }
-      this.showCoachPicker = false;
     },
     
     onVenueSelect(e) {
-      const index = e.index;
+      const index = e.detail.value;
+      this.venuePickerIndex = index;
       if (index >= 0 && index < this.venueOptions.length) {
         this.selectedVenue = this.venueOptions[index];
         this.formData.venue_id = this.selectedVenue.id;
         
-        // 如果场地有默认容量，设置容量
+        // 自动填充场地容量
-        if (this.selectedVenue.capacity && !this.formData.available_capacity) {
+        if (this.selectedVenue.capacity) {
           this.formData.available_capacity = this.selectedVenue.capacity;
         }
+        
+        // 获取该场地的时间选项
+        this.loadVenueTimeOptions(this.selectedVenue.id);
       }
-      this.showVenuePicker = false;
     },
     
     onDateSelect(e) {
-      this.formData.course_date = e.result;
+      this.formData.course_date = e.detail.value;
-      this.showDatePicker = false;
     },
     
     onTimeSelect(e) {
-      const index = e.index;
+      const index = e.detail.value;
+      this.timePickerIndex = index;
       if (index >= 0 && index < this.timeSlotOptions.length) {
         this.formData.time_slot = this.timeSlotOptions[index].value;
       }
-      this.showTimePicker = false;
     },
     
     // 表单验证
@@ -368,17 +330,95 @@ export default {
         return false;
       }
       
-      if (!this.formData.adjust_reason) {
-        uni.showToast({
-          title: '请输入调整原因',
-          icon: 'none'
-        });
-        return false;
-      }
       
       return true;
     },
     
+    // 获取场地时间选项
+    async loadVenueTimeOptions(venueId) {
+      if (!venueId) {
+        // 如果没有选择场地，使用默认时间选项
+        this.generateDefaultTimeOptions();
+        return;
+      }
+      
+      try {
+        const res = await api.getVenueTimeOptions({ venue_id: venueId });
+        
+        if (res.code === 1) {
+          this.timeSlotOptions = res.data.time_options || [];
+          // 更新时间picker索引
+          this.updateTimePickerIndex();
+        } else {
+          console.error('获取场地时间选项失败:', res.msg);
+          // 如果获取失败，使用默认时间选项
+          this.generateDefaultTimeOptions();
+          this.updateTimePickerIndex();
+        }
+      } catch (error) {
+        console.error('获取场地时间选项失败:', error);
+        // 如果获取失败，使用默认时间选项
+        this.generateDefaultTimeOptions();
+        this.updateTimePickerIndex();
+      }
+    },
+
+    // 生成默认时间选项（8:30开始，每小时一档）
+    generateDefaultTimeOptions() {
+      const timeSlots = [];
+      
+      for (let hour = 8; hour < 22; hour++) {
+        const minute = (hour === 8) ? '30' : '00'; // 8:30开始
+        const startHour = hour.toString().padStart(2, '0');
+        const endHour = (hour + 1).toString().padStart(2, '0');
+        const startTime = `${startHour}:${minute}`;
+        const endTime = `${endHour}:${minute}`;
+        
+        timeSlots.push({
+          value: `${startTime}-${endTime}`,
+          text: `${startTime}-${endTime}`
+        });
+      }
+      
+      this.timeSlotOptions = timeSlots;
+    },
+
+    // 更新时间picker索引
+    updateTimePickerIndex() {
+      if (this.formData.time_slot && this.timeSlotOptions.length > 0) {
+        this.timePickerIndex = this.timeSlotOptions.findIndex(time => time.value === this.formData.time_slot);
+        if (this.timePickerIndex === -1) this.timePickerIndex = 0;
+      }
+    },
+
+    // 获取最小日期（当前日期）
+    getMinDate() {
+      const today = new Date();
+      const year = today.getFullYear();
+      const month = (today.getMonth() + 1).toString().padStart(2, '0');
+      const day = today.getDate().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
+    // 获取最大日期（一年后）
+    getMaxDate() {
+      const nextYear = new Date();
+      nextYear.setFullYear(nextYear.getFullYear() + 1);
+      const year = nextYear.getFullYear();
+      const month = (nextYear.getMonth() + 1).toString().padStart(2, '0');
+      const day = nextYear.getDate().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
+    // 获取当前日期作为默认值
+    getCurrentDate() {
+      const today = new Date();
+      const year = today.getFullYear();
+      const month = (today.getMonth() + 1).toString().padStart(2, '0');
+      const day = today.getDate().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
     // 提交表单
     async submitForm() {
       if (!this.validateForm()) {
@@ -424,7 +464,6 @@ export default {
 .adjust-course-container {
   min-height: 100vh;
   background-color: #18181c;
-  padding-top: 88rpx;
 }
 
 .form-container {
@@ -494,4 +533,51 @@ export default {
   margin-top: 60rpx;
   padding: 0 30rpx;
 }
+
+/* Picker样式 */
+.picker-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: flex-end;
+}
+
+.picker-content {
+  width: 100%;
+  background-color: #23232a;
+  border-radius: 20rpx 20rpx 0 0;
+  max-height: 80vh;
+}
+
+.picker-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1px solid #333;
+}
+
+.picker-cancel, .picker-confirm {
+  font-size: 28rpx;
+  color: #29d3b4;
+}
+
+.picker-title {
+  font-size: 32rpx;
+  color: #fff;
+  font-weight: bold;
+}
+
+.picker-item {
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #fff;
+}
 </style>

uniapp/pages/coach/schedule/schedule_table.vue

@@ -1286,13 +1286,13 @@ export default {
       }
       
       // 打开添加课程安排页面
-      uni.navigateTo({ url });
+      this.$navigateTo({ url });
     },
 
     // 添加课程
     addCourse() {
       // 跳转到添加课程页面
-      uni.navigateTo({
+      this.$navigateTo({
         url: '/pages/coach/schedule/add_schedule',
       })
     },
@@ -1306,7 +1306,7 @@ export default {
     
     // 处理编辑课程事件
     handleEditCourse(data) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/coach/schedule/adjust_course?id=${data.scheduleId}`,
       })
     },
@@ -1321,7 +1321,7 @@ export default {
         url += `&time=${startTime}&time_slot=${timeSlot}`;
       }
       
-      uni.navigateTo({ url });
+      this.$navigateTo({ url });
     },
 
     // 处理学员点名事件

uniapp/pages/coach/student/student_detail.vue

@@ -321,8 +321,8 @@
 				}
 			},
 			viewSchedule() {
-				uni.navigateTo({
+				this.$navigateToPage(`/pages/coach/student/timetable`, {
-					url: `/pages/coach/student/timetable?id=${this.id}`
+					id: this.id
 				});
 			}
 		}

uniapp/pages/coach/student/student_list.vue

@@ -175,8 +175,8 @@
         }
 			},
 			goToDetail(student) {
-				uni.navigateTo({
+				this.$navigateToPage(`/pages/market/clue/clue_info`, {
-					url: `/pages/market/clue/clue_info?resource_sharing_id=`+student.resource_sharing_id
+					resource_sharing_id: student.resource_sharing_id
 				});
 			},
       getRemainingCourses(item) {

uniapp/pages/common/home/index.vue

@@ -51,6 +51,11 @@
 						icon: 'person-filled',
 						path: '/pages/market/clue/index'
 					},
+					{
+						title: '添加资源',
+						icon: 'plus-filled',
+						path: '/pages/market/clue/add_clues'
+					},
 					{
 						title: '课程安排',
 						icon: 'calendar-filled',
@@ -116,15 +121,8 @@
 				}
 			},
 			handleGridClick(item) {
-				uni.navigateTo({
+				this.$navigateTo({
-					url: item.path,
+					url: item.path
-					fail: (err) => {
-						console.error('页面跳转失败:', err);
-						uni.showToast({
-							title: '页面暂未开放',
-							icon: 'none'
-						});
-					}
 				});
 			}
 		}

uniapp/pages/common/profile/index.vue

@@ -104,15 +104,8 @@
 					}
 				} else if (item.path) {
 					// 页面跳转
-					uni.navigateTo({
+					this.$navigateTo({
-						url: item.path,
+						url: item.path
-						fail: (err) => {
-							console.error('页面跳转失败:', err);
-							uni.showToast({
-								title: '页面暂未开放',
-								icon: 'none'
-							});
-						}
 					});
 				}
 			},

uniapp/pages/market/clue/add_clues.vue

@@ -135,6 +135,60 @@
                 </view>
               </fui-form-item>
 
+              <!--转介绍资源选择-->
+              <fui-form-item
+                  v-if="formData.source == 3"
+                  label="转介绍资源"
+                  asterisk asteriskPosition="right"
+                  labelSize='26'
+                  prop=""
+                  background='#434544'
+                  labelColor='#fff'
+                  :bottomBorder='false'
+              >
+                <view class="input-title" style="margin-right:14rpx;">
+                  <!-- 搜索输入框 -->
+                  <view class="referral-search-container">
+                    <fui-input
+                        :borderBottom="false"
+                        :padding="[0]"
+                        placeholder="输入姓名或手机号搜索"
+                        v-model="referralSearchQuery"
+                        backgroundColor="#434544"
+                        size="26"
+                        color="#fff"
+                        @input="searchReferralResources"
+                    ></fui-input>
+                    
+                    <!-- 搜索结果列表 -->
+                    <view v-if="referralSearchResults.length > 0" class="referral-search-results">
+                      <view 
+                        v-for="resource in referralSearchResults" 
+                        :key="resource.id" 
+                        class="referral-search-item"
+                        :class="{ 'selected': formData.referral_resource_id === resource.id }"
+                        @click="selectReferralResource(resource)"
+                      >
+                        <view class="resource-info">
+                          <view class="resource-name">{{ resource.name }}</view>
+                          <view class="resource-phone">{{ resource.phone_number }}</view>
+                        </view>
+                        <view v-if="formData.referral_resource_id === resource.id" class="check-icon">✓</view>
+                      </view>
+                    </view>
+                    
+                    <!-- 已选择的资源显示 -->
+                    <view v-if="selectedReferralResource && !referralSearchQuery" class="selected-referral-resource">
+                      <view class="selected-resource-info">
+                        <view class="selected-resource-name">{{ selectedReferralResource.name }}</view>
+                        <view class="selected-resource-phone">{{ selectedReferralResource.phone_number }}</view>
+                      </view>
+                      <view class="clear-selection" @click="clearReferralSelection">✕</view>
+                    </view>
+                  </view>
+                </view>
+              </fui-form-item>
+
               <fui-form-item
                   v-show="false"
                   label="顾问"
@@ -166,7 +220,9 @@
                   labelColor='#fff'
                   :bottomBorder='false'>
                 <view class="input-title" style="margin-right:14rpx;">
-                  <view @click="picker_show_birthday = true">
+                  <view 
+                    @click="openBirthdayPicker"
+                    style="color: #fff; cursor: pointer;">
                     {{ formData.birthday ? formData.birthday : '请选择生日' }}
                   </view>
                   <fui-date-picker
@@ -174,8 +230,9 @@
                     type="3"
                     :minDate="minDate"
                     :maxDate="maxDate"
+                    :value="getCurrentBirthdayValue()"
                     @change="changePickerBirthday"
-                    @cancel="picker_show_birthday = false"
+                    @cancel="closeBirthdayPicker"
                   ></fui-date-picker>
                 </view>
               </fui-form-item>
@@ -648,7 +705,8 @@ export default {
         staff_id:'',//人员ID
         distance:'',//距离
         optional_class_time:'',//可选上课时间
-		campus:''
+		campus:'',
+        referral_resource_id:'',//转介绍资源ID
       },
 		campus_list:[],
       //下拉选择器相关
@@ -725,8 +783,8 @@ export default {
 
       //生日选择器
       picker_show_birthday: false,
-      minDate: new Date(1900, 0, 1).toISOString(), // 最小日期
+      minDate: '1900-01-01', // 最小日期 
-      maxDate: new Date().toISOString(), // 最大日期
+      maxDate: new Date().toISOString().split('T')[0], // 最大日期，只取日期部分
 
 
       //地区三级联动
@@ -754,6 +812,12 @@ export default {
           name: '添加六要素'
         }
       ],
+
+      // 转介绍资源相关
+      referralSearchQuery: '', // 转介绍资源搜索关键词
+      referralSearchResults: [], // 搜索结果列表
+      selectedReferralResource: null, // 已选择的转介绍资源
+      referralSearchTimer: null, // 搜索防抖定时器
     }
   },
   onLoad() {
@@ -763,6 +827,13 @@ export default {
   onShow() {
     this.init()
   },
+  onUnload() {
+    // 清理定时器
+    if (this.referralSearchTimer) {
+      clearTimeout(this.referralSearchTimer)
+      this.referralSearchTimer = null
+    }
+  },
   methods: {
     // 预加载字典数据
     async preloadDictData() {
@@ -938,6 +1009,55 @@ export default {
       // return formats.slash    // 斜杠格式
     },
 
+    // 统一日期格式处理方法
+    normalizeDate(dateStr) {
+      if (!dateStr) return ''
+      
+      // 如果已经是标准格式 YYYY-MM-DD，直接返回
+      if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
+        return dateStr
+      }
+      
+      // 处理 YYYY/MM/DD 格式
+      if (/^\d{4}\/\d{1,2}\/\d{1,2}$/.test(dateStr)) {
+        const parts = dateStr.split('/')
+        const year = parts[0]
+        const month = String(parts[1]).padStart(2, '0')
+        const day = String(parts[2]).padStart(2, '0')
+        return `${year}-${month}-${day}`
+      }
+      
+      // 处理 YYYY.MM.DD 格式
+      if (/^\d{4}\.\d{1,2}\.\d{1,2}$/.test(dateStr)) {
+        const parts = dateStr.split('.')
+        const year = parts[0]
+        const month = String(parts[1]).padStart(2, '0')
+        const day = String(parts[2]).padStart(2, '0')
+        return `${year}-${month}-${day}`
+      }
+      
+      // 处理中文格式 YYYY年MM月DD日
+      if (/^\d{4}年\d{1,2}月\d{1,2}日$/.test(dateStr)) {
+        const year = dateStr.match(/^(\d{4})年/)[1]
+        const month = String(dateStr.match(/年(\d{1,2})月/)[1]).padStart(2, '0')
+        const day = String(dateStr.match(/月(\d{1,2})日/)[1]).padStart(2, '0')
+        return `${year}-${month}-${day}`
+      }
+      
+      // 其他格式尝试用Date对象解析
+      try {
+        const date = new Date(dateStr)
+        if (!isNaN(date.getTime())) {
+          return this.formatDate(date)
+        }
+      } catch (error) {
+        console.warn('日期格式解析失败:', dateStr, error)
+      }
+      
+      // 如果都无法解析，返回原值
+      return dateStr
+    },
+
     // 获取当前日期（用于日期选择器的默认显示）
     getCurrentDate() {
       const today = new Date()
@@ -1502,6 +1622,11 @@ export default {
         }
       }
 
+      // 清空转介绍资源选择，当来源改变时
+      if(input_name == 'source'){
+        this.clearReferralSelection()
+      }
+
       this.cancelCicker()
     },
     //关闭下拉选择器
@@ -1511,6 +1636,101 @@ export default {
       this.picker_options = []
     },
 
+    // 转介绍资源搜索功能
+    async searchReferralResources() {
+      // 清除之前的定时器
+      if (this.referralSearchTimer) {
+        clearTimeout(this.referralSearchTimer)
+      }
+
+      // 如果搜索关键词为空，清空结果
+      if (!this.referralSearchQuery.trim()) {
+        this.referralSearchResults = []
+        return
+      }
+
+      // 设置防抖定时器
+      this.referralSearchTimer = setTimeout(async () => {
+        await this.doReferralSearch()
+      }, 300) // 300ms防抖
+    },
+
+    // 实际执行搜索的方法
+    async doReferralSearch() {
+      try {
+        // 搜索客户资源 - 优化参数处理
+        let param = {}
+        const searchQuery = this.referralSearchQuery.trim()
+        
+        // 判断搜索内容是手机号还是姓名
+        if (/^1[3-9]\d{9}$/.test(searchQuery)) {
+          // 如果是手机号格式，只传递phone_number参数
+          param.phone_number = searchQuery
+        } else if (/^\d+$/.test(searchQuery)) {
+          // 如果是纯数字但不是手机号格式，也当作手机号搜索
+          param.phone_number = searchQuery
+        } else {
+          // 如果包含非数字字符，当作姓名搜索
+          param.name = searchQuery
+        }
+        
+        let res = await apiRoute.xs_getAllCustomerResources(param)
+        if (res.code != 1) {
+          if (res.msg !== '暂无数据') {
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+          }
+          this.referralSearchResults = []
+          return
+        }
+
+        // 过滤掉当前正在添加的客户（如果手机号相同）
+        this.referralSearchResults = (res.data || []).filter(resource => {
+          return resource.phone_number !== this.formData.phone_number
+        })
+
+        // 如果没有搜索结果，给用户提示
+        if (this.referralSearchResults.length === 0 && searchQuery.length >= 2) {
+          // 静默处理，不显示"暂无数据"提示，让用户继续输入
+          console.log('未找到匹配的转介绍资源')
+        }
+
+      } catch (error) {
+        console.error('搜索转介绍资源失败:', error)
+        this.referralSearchResults = []
+        // 网络错误时给用户提示
+        if (this.referralSearchQuery.trim()) {
+          uni.showToast({
+            title: '搜索失败，请重试',
+            icon: 'none'
+          })
+        }
+      }
+    },
+
+    // 选择转介绍资源
+    selectReferralResource(resource) {
+      this.formData.referral_resource_id = resource.id
+      this.selectedReferralResource = resource
+      this.referralSearchQuery = ''
+      this.referralSearchResults = []
+      
+      uni.showToast({
+        title: '已选择转介绍资源',
+        icon: 'success'
+      })
+    },
+
+    // 清空转介绍资源选择
+    clearReferralSelection() {
+      this.formData.referral_resource_id = ''
+      this.selectedReferralResource = null
+      this.referralSearchQuery = ''
+      this.referralSearchResults = []
+    },
+
 
     //######-----时间选择器组件相关-----######
     //打开日期选择器
@@ -1570,10 +1790,35 @@ export default {
       this.date_picker_show = false
     },
 
+    // 打开生日选择器
+    openBirthdayPicker() {
+      console.log('打开生日选择器')
+      this.picker_show_birthday = true
+    },
+
+    // 关闭生日选择器
+    closeBirthdayPicker() {
+      console.log('关闭生日选择器')
+      this.picker_show_birthday = false
+    },
+
+    // 获取生日选择器的当前值
+    getCurrentBirthdayValue() {
+      if (this.formData.birthday) {
+        return this.formData.birthday
+      }
+      // 默认返回30年前的日期作为初始值
+      const defaultDate = new Date()
+      defaultDate.setFullYear(defaultDate.getFullYear() - 30)
+      return this.formatDate(defaultDate)
+    },
+
     //生日选择器
     changePickerBirthday(e) {
       console.log('生日选择器返回数据:', e)
       let val = ''
+      
+      // 尝试多种方式获取返回值
       if (e.result) {
         val = e.result
       } else if (e.value) {
@@ -1582,17 +1827,36 @@ export default {
         val = e.detail.result
       } else if (e.detail && e.detail.value) {
         val = e.detail.value
+      } else if (Array.isArray(e) && e.length >= 3) {
+        // 如果返回数组格式 [2023, 1, 15] 
+        const year = e[0]
+        const month = String(e[1]).padStart(2, '0')
+        const day = String(e[2]).padStart(2, '0')
+        val = `${year}-${month}-${day}`
       }
 
+      // 处理不同的日期格式
       if (val && typeof val === 'string') {
+        // 如果是时间戳格式
         if (/^\d+$/.test(val)) {
           const date = new Date(parseInt(val))
           val = this.formatDate(date)
         }
+        // 如果包含时间部分，只保留日期部分
+        else if (val.includes('T')) {
+          val = val.split('T')[0]
+        }
+        // 如果包含空格，只保留日期部分
+        else if (val.includes(' ')) {
+          val = val.split(' ')[0]
+        }
+        // 统一日期格式
+        val = this.normalizeDate(val)
       }
 
+      console.log('最终设置的生日值:', val)
       this.formData.birthday = val
-      this.picker_show_birthday = false
+      this.closeBirthdayPicker()
     },
 
     //下一步 index|0=添加客户,1六要素
@@ -1629,6 +1893,16 @@ export default {
 	    return false
 	  }
 	  
+	  //转介绍资源必填（当来源为转介绍时）
+	  if(data.source == 3 && !data.referral_resource_id){
+	    uni.showToast({
+	      title: '请选择转介绍资源',
+	      icon: 'none'
+	    })
+	    this.nextStep('0')
+	    return false
+	  }
+	  
       return true
     },
     //提交
@@ -1993,4 +2267,94 @@ export default {
     color: #fff;
   }
 }
+
+// 转介绍资源选择相关样式
+.referral-search-container {
+  position: relative;
+  
+  .referral-search-results {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    right: 0;
+    background: #333;
+    border-radius: 8rpx;
+    border: 1px solid #555;
+    max-height: 400rpx;
+    overflow-y: auto;
+    z-index: 100;
+    margin-top: 8rpx;
+    
+    .referral-search-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 20rpx;
+      border-bottom: 1px solid #555;
+      transition: background-color 0.2s;
+      
+      &:last-child {
+        border-bottom: none;
+      }
+      
+      &:hover, &.selected {
+        background: #434544;
+      }
+      
+      .resource-info {
+        flex: 1;
+        
+        .resource-name {
+          font-size: 28rpx;
+          color: #fff;
+          margin-bottom: 8rpx;
+        }
+        
+        .resource-phone {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+      
+      .check-icon {
+        color: #29d3b4;
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+    }
+  }
+  
+  .selected-referral-resource {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16rpx;
+    background: #4a4a4a;
+    border-radius: 8rpx;
+    margin-top: 8rpx;
+    
+    .selected-resource-info {
+      flex: 1;
+      
+      .selected-resource-name {
+        font-size: 28rpx;
+        color: #29d3b4;
+        margin-bottom: 8rpx;
+      }
+      
+      .selected-resource-phone {
+        font-size: 24rpx;
+        color: #999;
+      }
+    }
+    
+    .clear-selection {
+      color: #f44336;
+      font-size: 32rpx;
+      font-weight: bold;
+      padding: 8rpx;
+      cursor: pointer;
+    }
+  }
+}
 </style>

uniapp/pages/market/clue/class_arrangement.vue

@@ -116,6 +116,7 @@
 				date: '',
 				courseList: [],
 				resource_id: '',
+        student_id: '',
 				
 				// 查询弹窗相关
 				showSearchPopup: false,
@@ -133,7 +134,8 @@
 			};
 		},
 		onLoad(options) {
-			this.resource_id = options.resource_id
+			this.resource_id = options.resource_id || '';
+			this.student_id = options.student_id || '';
 			this.getDate();
 			
 		},
@@ -166,8 +168,10 @@
 			},
 			viewDetail(course) {
 				// 跳转到课程详情页
+				const resourceId = this.resource_id || '';
+				const studentId = this.student_id || '';
 				this.$navigateTo({
-					url: '/pages/market/clue/class_arrangement_detail?id=' + course.id+'&resource_id='+this.resource_id
+					url: '/pages/market/clue/class_arrangement_detail?schedule_id=' + course.id + '&resource_id=' + resourceId + '&student_id=' + studentId
 				});
 			},
 			onCalendarConfirm(e) {

uniapp/pages/market/clue/class_arrangement_detail_bak.vue

@@ -0,0 +1,633 @@
+<template>
+  <div class="course-schedule">
+    <!-- Header -->
+    <div class="header">
+      <div class="back-btn" @click="goBack">
+        <ChevronLeftIcon class="w-6 h-6" />
+      </div>
+      <h1 class="title">课程安排详情</h1>
+    </div>
+
+    <!-- Course Info -->
+    <div class="course-info">
+      <h2 class="course-title">课程安排详情</h2>
+      <p class="course-time">日期：2025-07-24 08:30-09:30</p>
+    </div>
+
+    <!-- Formal Students Section -->
+    <div class="section">
+      <h3 class="section-title">正式学员</h3>
+      <div class="cards-grid">
+        <!-- Student Card with Data -->
+        <div class="student-card filled">
+          <div class="renewal-badge">待续费</div>
+          <div class="avatar">未</div>
+          <div class="student-info">
+            <div class="student-name">张小明同学的名字很长需要省略</div>
+            <div class="student-age">年龄：8岁</div>
+            <div class="course-status">课程状态：正式课</div>
+            <div class="course-arrangement">课程安排：固定课</div>
+            <div class="remaining-hours">剩余课时：12节</div>
+            <div class="expiry-date">到期时间：2025-12-31</div>
+          </div>
+        </div>
+
+        <!-- Empty Slots -->
+        <div
+          v-for="n in 6"
+          :key="n"
+          class="student-card empty"
+          @click="openStudentModal('formal', n)"
+        >
+          <div class="add-icon">
+            <PlusIcon class="w-8 h-8" />
+          </div>
+          <div class="add-text">
+            <div class="slot-title">空位</div>
+            <div class="slot-subtitle">点击添加学员</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Waiting List Section -->
+    <div class="section">
+      <h3 class="section-title">等待位</h3>
+      <div class="cards-grid">
+        <div
+          v-for="n in 2"
+          :key="n"
+          class="student-card waiting"
+          @click="openStudentModal('waiting', n)"
+        >
+          <div class="add-icon waiting-icon">
+            <PlusIcon class="w-8 h-8" />
+          </div>
+          <div class="add-text">
+            <div class="slot-title">等待位</div>
+            <div class="slot-subtitle">点击添加学员</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Bottom Popup Modal -->
+    <div v-if="showModal" class="modal-overlay" @click="closeModal">
+      <div class="modal-content" @click.stop>
+        <div class="modal-header">
+          <h3>添加学员</h3>
+        </div>
+
+        <div class="modal-body">
+          <!-- Customer Selection -->
+          <div class="form-section">
+            <label class="form-label">客户选择</label>
+            <div class="search-tabs">
+              <button
+                :class="['tab-btn', { active: searchType === 'phone' }]"
+                @click="searchType = 'phone'"
+              >
+                手机号检索
+              </button>
+              <button
+                :class="['tab-btn', { active: searchType === 'name' }]"
+                @click="searchType = 'name'"
+              >
+                姓名检索
+              </button>
+            </div>
+
+            <input
+              v-model="searchQuery"
+              :placeholder="searchType === 'phone' ? '请输入手机号' : '请输入姓名'"
+              class="search-input"
+              @input="searchStudents"
+            />
+
+            <!-- Search Results -->
+            <div v-if="searchResults.length > 0" class="search-results">
+              <div
+                v-for="student in searchResults"
+                :key="student.id"
+                :class="['student-item', { selected: selectedStudent?.id === student.id }]"
+                @click="selectStudent(student)"
+              >
+                <div class="student-avatar">{{ student.name.charAt(0) }}</div>
+                <div class="student-details">
+                  <div class="student-name">{{ student.name }}</div>
+                  <div class="student-phone">{{ student.phone }}</div>
+                </div>
+                <div v-if="selectedStudent?.id === student.id" class="check-icon">
+                  <CheckIcon class="w-5 h-5" />
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- Course Arrangement -->
+          <div class="form-section">
+            <label class="form-label">课程安排</label>
+            <div class="radio-group">
+              <label class="radio-item">
+                <input
+                  type="radio"
+                  value="temporary"
+                  v-model="courseArrangement"
+                />
+                <span class="radio-text">临时课</span>
+              </label>
+              <label class="radio-item">
+                <input
+                  type="radio"
+                  value="fixed"
+                  v-model="courseArrangement"
+                />
+                <span class="radio-text">固定课</span>
+              </label>
+            </div>
+          </div>
+
+          <!-- Remarks -->
+          <div class="form-section">
+            <label class="form-label">备注</label>
+            <textarea
+              v-model="remarks"
+              placeholder="请输入备注信息"
+              class="remarks-textarea"
+              rows="3"
+            ></textarea>
+          </div>
+        </div>
+
+        <!-- Modal Footer -->
+        <div class="modal-footer">
+          <button class="btn btn-cancel" @click="closeModal">取消</button>
+          <button class="btn btn-confirm" @click="confirmSelection">确定</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { ChevronLeftIcon, PlusIcon, CheckIcon } from 'lucide-vue-next'
+
+export default {
+  name: 'CourseSchedule',
+  components: {
+    ChevronLeftIcon,
+    PlusIcon,
+    CheckIcon
+  },
+  data() {
+    return {
+      showModal: false,
+      searchType: 'phone',
+      searchQuery: '',
+      courseArrangement: 'temporary',
+      remarks: '',
+      selectedStudent: null,
+      currentSlot: null,
+      searchResults: [],
+      // Mock student data
+      allStudents: [
+        { id: 1, name: '张小明', phone: '13800138001', age: 8 },
+        { id: 2, name: '李小红', phone: '13800138002', age: 9 },
+        { id: 3, name: '王小华', phone: '13800138003', age: 7 },
+        { id: 4, name: '赵小强', phone: '13800138004', age: 10 }
+      ]
+    }
+  },
+  methods: {
+    goBack() {
+      this.$router.go(-1)
+    },
+    openStudentModal(type, index) {
+      this.showModal = true
+      this.currentSlot = { type, index }
+      this.resetForm()
+    },
+    closeModal() {
+      this.showModal = false
+      this.resetForm()
+    },
+    resetForm() {
+      this.searchQuery = ''
+      this.searchResults = []
+      this.selectedStudent = null
+      this.courseArrangement = 'temporary'
+      this.remarks = ''
+    },
+    searchStudents() {
+      if (!this.searchQuery.trim()) {
+        this.searchResults = []
+        return
+      }
+
+      this.searchResults = this.allStudents.filter(student => {
+        if (this.searchType === 'phone') {
+          return student.phone.includes(this.searchQuery)
+        } else {
+          return student.name.includes(this.searchQuery)
+        }
+      })
+    },
+    selectStudent(student) {
+      this.selectedStudent = student
+    },
+    confirmSelection() {
+      if (!this.selectedStudent) {
+        alert('请选择学员')
+        return
+      }
+
+      // Here you would typically save the selection
+      console.log('Selected:', {
+        student: this.selectedStudent,
+        slot: this.currentSlot,
+        arrangement: this.courseArrangement,
+        remarks: this.remarks
+      })
+
+      this.closeModal()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.course-schedule {
+  min-height: 100vh;
+  background: #1a1a1a;
+  color: white;
+  padding: 0;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+  padding: 16px 20px;
+  background: #2a2a2a;
+}
+
+.back-btn {
+  margin-right: 16px;
+  cursor: pointer;
+}
+
+.title {
+  font-size: 18px;
+  font-weight: 600;
+  margin: 0;
+}
+
+.course-info {
+  padding: 24px 20px;
+}
+
+.course-title {
+  font-size: 24px;
+  font-weight: 600;
+  margin: 0 0 12px 0;
+}
+
+.course-time {
+  color: #4ade80;
+  font-size: 16px;
+  margin: 0;
+}
+
+.section {
+  margin: 24px 20px;
+}
+
+.section-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #fbbf24;
+  margin: 0 0 16px 0;
+}
+
+.cards-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 12px;
+}
+
+.student-card {
+  background: #2a2a2a;
+  border-radius: 12px;
+  padding: 16px;
+  min-height: 160px;
+  position: relative;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.student-card.empty {
+  border: 2px dashed #fbbf24;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+
+.student-card.waiting {
+  border: 2px dashed #8b5cf6;
+}
+
+.student-card.filled {
+  border: 1px solid #374151;
+}
+
+.student-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+}
+
+.renewal-badge {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  background: #ef4444;
+  color: white;
+  font-size: 10px;
+  padding: 2px 6px;
+  border-radius: 8px;
+}
+
+.avatar {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  background: #4ade80;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 600;
+  margin-bottom: 8px;
+}
+
+.student-info {
+  font-size: 12px;
+  line-height: 1.4;
+}
+
+.student-name {
+  font-weight: 600;
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.student-age,
+.course-status,
+.course-arrangement,
+.remaining-hours,
+.expiry-date {
+  color: #9ca3af;
+  margin-bottom: 2px;
+}
+
+.add-icon {
+  color: #fbbf24;
+  margin-bottom: 8px;
+}
+
+.waiting-icon {
+  color: #8b5cf6;
+}
+
+.add-text {
+  text-align: center;
+}
+
+.slot-title {
+  font-size: 16px;
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+
+.slot-subtitle {
+  font-size: 12px;
+  color: #9ca3af;
+}
+
+/* Modal Styles */
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: flex-end;
+  z-index: 1000;
+}
+
+.modal-content {
+  background: white;
+  border-radius: 16px 16px 0 0;
+  width: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
+  animation: slideUp 0.3s ease-out;
+}
+
+@keyframes slideUp {
+  from {
+    transform: translateY(100%);
+  }
+  to {
+    transform: translateY(0);
+  }
+}
+
+.modal-header {
+  padding: 20px;
+  border-bottom: 1px solid #e5e7eb;
+  text-align: center;
+}
+
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+  color: #1f2937;
+}
+
+.modal-body {
+  padding: 20px;
+  color: #1f2937;
+}
+
+.form-section {
+  margin-bottom: 24px;
+}
+
+.form-label {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 8px;
+  color: #374151;
+}
+
+.search-tabs {
+  display: flex;
+  margin-bottom: 12px;
+  background: #f3f4f6;
+  border-radius: 8px;
+  padding: 4px;
+}
+
+.tab-btn {
+  flex: 1;
+  padding: 8px 16px;
+  border: none;
+  background: transparent;
+  border-radius: 6px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.tab-btn.active {
+  background: white;
+  color: #1f2937;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.search-input {
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #d1d5db;
+  border-radius: 8px;
+  font-size: 16px;
+}
+
+.search-results {
+  max-height: 200px;
+  overflow-y: auto;
+  border: 1px solid #e5e7eb;
+  border-radius: 8px;
+  margin-top: 8px;
+}
+
+.student-item {
+  display: flex;
+  align-items: center;
+  padding: 12px;
+  border-bottom: 1px solid #f3f4f6;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.student-item:hover {
+  background: #f9fafb;
+}
+
+.student-item.selected {
+  background: #eff6ff;
+  border-color: #3b82f6;
+}
+
+.student-avatar {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  background: #3b82f6;
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 600;
+  margin-right: 12px;
+}
+
+.student-details {
+  flex: 1;
+}
+
+.student-details .student-name {
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+
+.student-details .student-phone {
+  color: #6b7280;
+  font-size: 14px;
+}
+
+.check-icon {
+  color: #3b82f6;
+}
+
+.radio-group {
+  display: flex;
+  gap: 16px;
+}
+
+.radio-item {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+}
+
+.radio-item input[type="radio"] {
+  margin-right: 8px;
+}
+
+.radio-text {
+  font-size: 14px;
+}
+
+.remarks-textarea {
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #d1d5db;
+  border-radius: 8px;
+  font-size: 14px;
+  resize: vertical;
+  font-family: inherit;
+}
+
+.modal-footer {
+  padding: 20px;
+  border-top: 1px solid #e5e7eb;
+  display: flex;
+  gap: 12px;
+}
+
+.btn {
+  flex: 1;
+  padding: 12px 24px;
+  border-radius: 8px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.btn-cancel {
+  background: #f3f4f6;
+  color: #374151;
+  border: 1px solid #d1d5db;
+}
+
+.btn-cancel:hover {
+  background: #e5e7eb;
+}
+
+.btn-confirm {
+  background: #3b82f6;
+  color: white;
+  border: 1px solid #3b82f6;
+}
+
+.btn-confirm:hover {
+  background: #2563eb;
+}
+</style>

uniapp/pages/market/clue/clue_info.less

@@ -990,18 +990,38 @@
   margin-top: 20rpx;
 }
 
+// 区块标题头部样式
+.section-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx;
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #fff;
+  }
+}
+
 .add-student-btn {
   display: flex;
   align-items: center;
   background: #29d3b4;
   color: #fff;
   border-radius: 20rpx;
-  padding: 8rpx 16rpx;
+  padding: 12rpx 20rpx;
   font-size: 24rpx;
+  flex-shrink: 0; // 防止被压缩
   
   .add-icon {
-    margin-right: 6rpx;
+    margin-right: 8rpx;
     font-weight: bold;
+    font-size: 20rpx;
+  }
+  
+  .add-text {
+    white-space: nowrap; // 防止文字换行
   }
 }
 
@@ -1010,29 +1030,75 @@
   transform: scale(0.95);
 }
 
+// 学生卡片容器样式，使用CSS calc计算高度
+.student-cards {
+  width: 100%;
+  // 计算高度：100vh - 导航栏高度 - 客户信息卡片(约120px) - tab切换器(约60px) - 标题栏(约40px) - 底部安全区域(约34px) - 边距(约60px)
+  height: calc(100vh - 44px - 120px - 60px - 40px - 34px - 60px);
+  min-height: 400rpx;
+  max-height: 80vh; // 最大高度限制，避免在小屏幕设备上过高
+  overflow: hidden;
+  margin: 20rpx auto;
+  
+  // 小屏幕适配
+  @media screen and (max-height: 667px) {
+    height: calc(100vh - 300px);
+    min-height: 300rpx;
+  }
+  
+  // 大屏幕适配
+  @media screen and (min-height: 812px) {
+    height: calc(100vh - 400px);
+  }
+}
+
 .student-cards-container {
   width: 92%;
   margin: 20rpx auto;
 }
 
 .student-swiper {
-  height: 400rpx;
+  width: 100%;
+  height: 100%; // 继承父容器的calc高度
   
-  &::v-deep .uni-swiper-dots {
+  // 修复swiper指示器样式
-    bottom: 20rpx;
+  ::v-deep .uni-swiper-dots {
+    bottom: 20rpx !important;
+    display: flex !important;
+    justify-content: center !important;
+    position: absolute !important;
+    left: 50% !important;
+    transform: translateX(-50%) !important;
+    z-index: 10 !important;
   }
   
-  &::v-deep .uni-swiper-dot {
+  ::v-deep .uni-swiper-dot {
-    width: 12rpx;
+    width: 12rpx !important;
-    height: 12rpx;
+    height: 12rpx !important;
-    background: rgba(255, 255, 255, 0.5);
+    background: rgba(255, 255, 255, 0.6) !important;
+    border-radius: 50% !important;
+    margin: 0 6rpx !important;
+    display: inline-block !important;
+    transition: all 0.3s ease !important;
   }
   
-  &::v-deep .uni-swiper-dot-active {
+  ::v-deep .uni-swiper-dot-active {
-    background: #29d3b4;
+    background: #29d3b4 !important;
+    width: 16rpx !important;
+    height: 16rpx !important;
+    transform: scale(1.2) !important;
   }
 }
 
+// 学生swiper内容容器
+.student-swiper-content {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 0 10rpx;
+  box-sizing: border-box;
+}
+
 .student-swiper-item {
   padding: 0 10rpx;
 }
@@ -1041,10 +1107,11 @@
   background: #3D3D3D;
   border-radius: 20rpx;
   padding: 30rpx;
-  min-height: 340rpx;
+  height: calc(100% - 100rpx); // 减去操作按钮的高度
   display: flex;
   flex-direction: column;
   color: #fff;
+  box-sizing: border-box;
 }
 
 .student-card-header {
@@ -1357,6 +1424,23 @@
   gap: 15rpx;
 }
 
+// 操作按钮区域容器样式
+.action-buttons-section {
+  display: flex;
+  gap: 8rpx;
+  margin-top: 15rpx;
+  padding: 15rpx;
+  flex-wrap: nowrap; // 禁止换行，强制一行显示
+  height: 100rpx; // 固定高度
+  box-sizing: border-box;
+  
+  // 确保一行展示所有按钮
+  .action-item {
+    flex: 1;
+    min-width: 0; // 允许缩小
+  }
+}
+
 .action-item {
   display: flex;
   flex-direction: column;
@@ -1364,21 +1448,24 @@
   justify-content: center;
   background: rgba(255, 255, 255, 0.05);
   border: 1px solid rgba(41, 211, 180, 0.3);
-  border-radius: 12rpx;
+  border-radius: 8rpx;
-  padding: 20rpx 15rpx;
+  padding: 12rpx 8rpx;
-  min-width: 120rpx;
+  min-width: 80rpx;
   flex: 1;
   transition: all 0.3s ease;
   
   .action-icon {
-    font-size: 28rpx;
+    font-size: 24rpx;
-    margin-bottom: 8rpx;
+    margin-bottom: 5rpx;
+    line-height: 1;
   }
   
   .action-text {
-    font-size: 22rpx;
+    font-size: 18rpx;
     color: #fff;
     text-align: center;
+    line-height: 1.2;
+    word-break: break-all;
   }
 }
 
@@ -1612,6 +1699,34 @@
     ::v-deep .uni-swiper-slide {
       height: 650rpx !important;
     }
+    
+    // 确保指示器在集成容器中也显示
+    ::v-deep .uni-swiper-dots {
+      bottom: 20rpx !important;
+      display: flex !important;
+      justify-content: center !important;
+      position: absolute !important;
+      left: 50% !important;
+      transform: translateX(-50%) !important;
+      z-index: 10 !important;
+    }
+    
+    ::v-deep .uni-swiper-dot {
+      width: 12rpx !important;
+      height: 12rpx !important;
+      background: rgba(255, 255, 255, 0.6) !important;
+      border-radius: 50% !important;
+      margin: 0 6rpx !important;
+      display: inline-block !important;
+      transition: all 0.3s ease !important;
+    }
+    
+    ::v-deep .uni-swiper-dot-active {
+      background: #29d3b4 !important;
+      width: 16rpx !important;
+      height: 16rpx !important;
+      transform: scale(1.2) !important;
+    }
   }
   
   .student-swiper-item {
@@ -2150,39 +2265,84 @@
   }
 }
 
-// 整合后的学生卡片容器样式
+// 弹窗底部按钮样式（适配暗色主题）
-.integrated-cards-container {
+.popup-footer-btns {
-  margin: 20rpx;
+  display: flex;
-  min-height: 670rpx;
+  gap: 20rpx;
-  display: block;
+  padding: 0; // 移除padding，让BottomPopup组件的footer处理
+  background: transparent;
   
-  .student-swiper {
+  .footer-btn {
-    height: 650rpx !important;
+    flex: 1;
-    min-height: 650rpx;
+    height: 80rpx;
-    
+    display: flex;
-    // 强制设置swiper内部组件的高度
+    align-items: center;
-    ::v-deep .uni-swiper-wrapper {
+    justify-content: center;
-      height: 650rpx !important;
+    border-radius: 40rpx;
-    }
+    font-size: 28rpx;
+    font-weight: 500;
+    transition: all 0.3s ease;
     
-    ::v-deep .uni-swiper-slides {
+    &.secondary {
-      height: 650rpx !important;
+      background: rgba(255, 255, 255, 0.1);
+      color: #ccc;
+      border: 1rpx solid rgba(255, 255, 255, 0.2);
+      
+      &:active {
+        background: rgba(255, 255, 255, 0.2);
+        color: #fff;
+      }
     }
     
-    ::v-deep .uni-swiper-slide {
+    &.primary {
-      height: 650rpx !important;
+      background: #29d3b4;
+      color: #fff;
+      
+      &:active {
+        background: #1ea08e;
+        transform: scale(0.98);
+      }
     }
   }
+}
+
+// 通用空状态样式
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60rpx 20rpx;
+  min-height: 200rpx;
   
-  .student-swiper-item {
+  .empty-icon {
-    height: 620rpx !important;
+    font-size: 60rpx;
-    min-height: 620rpx;
+    opacity: 0.6;
-    display: flex;
+    margin-bottom: 20rpx;
-    flex-direction: column;
+  }
+  
+  .empty-text {
+    color: #999;
+    font-size: 28rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  .empty-add-btn {
+    background: #29d3b4;
+    color: #fff;
+    padding: 12rpx 24rpx;
+    border-radius: 20rpx;
+    font-size: 24rpx;
+    transition: all 0.3s ease;
+    
+    &:active {
+      background: #1ea08e;
+      transform: scale(0.95);
+    }
   }
 }
 
-// 空状态样式
+// 空状态样式（旧的，保持兼容）
 .empty-records {
   display: flex;
   flex-direction: column;

uniapp/pages/market/clue/order_list.vue

@@ -928,15 +928,8 @@ export default {
         uni.hideLoading()
         
         // 跳转到合同签订页面
-        uni.navigateTo({
+        this.$navigateToPage(`/pages/market/clue/contract_sign`, {
-          url: `/pages/market/clue/contract_sign?order_id=${orderData.id}`
+          order_id: orderData.id
-        }).catch(err => {
-          // 如果页面不存在，则显示提示
-          console.error('导航错误:', err)
-          uni.showToast({
-            title: '合同签订功能开发中',
-            icon: 'none'
-          })
         })
       }, 500)
     },

uniapp/pages/market/reimbursement/list.vue

@@ -65,19 +65,19 @@ export default {
 		
 	},
     goAdd() {
-      uni.navigateTo({
+      this.$navigateTo({
         url: '/pages/market/reimbursement/add'
       });
     },
     goDetail(item) {
       // 待审批状态可编辑，否则只能查看
       if (item.status === 'pending') {
-        uni.navigateTo({
+        this.$navigateToPage(`/pages/market/reimbursement/add`, {
-          url: `/pages/market/reimbursement/add?id=${item.id}`
+          id: item.id
         });
       } else {
-        uni.navigateTo({
+        this.$navigateToPage(`/pages/market/reimbursement/detail`, {
-          url: `/pages/market/reimbursement/detail?id=${item.id}`
+          id: item.id
         });
       }
     }

uniapp/pages/parent/user-info/index.vue

@@ -229,8 +229,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/user-info/child-detail`, {
-				url: `/pages/parent/user-info/child-detail?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -242,8 +242,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/courses/index`, {
-				url: `/pages/parent/courses/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -255,8 +255,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/materials/index`, {
-				url: `/pages/parent/materials/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -268,8 +268,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/services/index`, {
-				url: `/pages/parent/services/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -281,8 +281,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/orders/index`, {
-				url: `/pages/parent/orders/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -294,8 +294,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/messages/index`, {
-				url: `/pages/parent/messages/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		},
 		
@@ -307,8 +307,8 @@ export default {
 				})
 				return
 			}
-			uni.navigateTo({
+			this.$navigateToPage(`/pages/parent/contracts/index`, {
-				url: `/pages/parent/contracts/index?childId=${this.selectedChild.id}`
+				childId: this.selectedChild.id
 			})
 		}
 	}

uniapp/test-validation.md

@@ -1,127 +0,0 @@
-# UniApp功能重构验证测试
-
-## 环境配置验证
-
-### 1. 环境变量文件检查
-- ✅ `.env.development` - 开发环境配置（Mock默认开启）
-- ✅ `.env.production` - 生产环境配置（Mock默认关闭）
-- ✅ `common/config.js` - 支持环境变量读取
-
-### 2. Mock数据服务验证
-- ✅ `mock/index.js` - 完整Mock数据服务
-- ✅ 支持用户信息、课程表、考试成绩等数据
-- ✅ 统一的响应格式 `{code, message, data}`
-- ✅ 分页响应支持
-
-### 3. API集成验证
-- ✅ `common/axios.js` - 集成Mock数据回退
-- ✅ 环境变量控制Mock开关
-- ✅ API失败自动切换Mock数据
-- ✅ 调试信息支持
-
-## 功能验证
-
-### 1. 演示页面验证
-- ✅ `/pages/demo/mock-demo.vue` - Mock数据演示页面
-- ✅ 正常渲染用户信息和课程表
-- ✅ 交互功能正常（刷新数据、状态显示）
-- ✅ 响应式布局和样式
-
-### 2. 配置文件验证
-- ✅ `pages.json` - 添加演示页面配置
-- ✅ `package.json` - 添加Vue3、TypeScript、Pinia支持
-- ✅ 脚本命令配置
-
-## 测试用例
-
-### 测试用例1: Mock数据开关控制
-```javascript
-// 开发环境 (.env.development)
-VUE_APP_MOCK_ENABLED=true  // Mock数据开启
-期望结果: 直接返回Mock数据，无需API请求
-
-// 生产环境 (.env.production)  
-VUE_APP_MOCK_ENABLED=false  // Mock数据关闭
-期望结果: 发送真实API请求
-```
-
-### 测试用例2: API回退机制
-```javascript
-// 场景：API请求失败
-1. 发送真实API请求
-2. 请求失败或超时
-3. 自动切换到Mock数据
-4. 显示"使用模拟数据"提示
-期望结果: 用户无感知地获取Mock数据
-```
-
-### 测试用例3: 数据结构一致性
-```javascript
-// Mock数据响应格式
-{
-  "code": 200,
-  "message": "success", 
-  "data": { ... },
-  "timestamp": 1640995200000
-}
-
-// 期望结果：与PHP API响应格式完全一致
-```
-
-### 测试用例4: 页面功能验证
-```javascript
-// 演示页面功能
-1. 页面加载 → 显示环境信息和Mock状态
-2. 数据加载 → 显示用户信息和课程表
-3. 刷新功能 → 重新加载数据
-4. 状态显示 → 正确显示课程状态
-期望结果: 所有功能正常运行
-```
-
-## 部署验证
-
-### 1. 本地开发验证
-```bash
-# 在uniapp目录下运行
-npm install
-npm run dev:h5
-# 访问 /pages/demo/mock-demo 页面
-```
-
-### 2. 生产环境验证
-```bash
-# 修改环境变量
-VUE_APP_MOCK_ENABLED=false
-npm run build:h5
-# 验证Mock数据已关闭
-```
-
-## 验证结果
-
-### ✅ 通过的验证项目
-1. 环境变量控制Mock数据开关 ✅
-2. Mock数据服务正常工作 ✅  
-3. API回退机制正常 ✅
-4. 数据结构与API一致 ✅
-5. 演示页面功能完整 ✅
-6. 跨平台兼容性保持 ✅
-
-### 📋 验证清单确认
-- [x] 环境变量控制Mock数据（默认开启）
-- [x] 正常渲染和功能交互
-- [x] 数据结构与API对齐
-- [x] 自动回退机制
-- [x] 调试信息支持
-- [x] 演示页面完整
-
-## 结论
-
-✅ **UniApp功能重构验证通过**
-
-所有核心功能已实现并通过验证：
-- Mock数据策略完全符合PRP要求
-- 环境变量控制机制工作正常
-- API回退功能保证开发体验
-- 演示页面展示完整功能
-
-系统已准备好进行进一步的Vue3迁移和TypeScript集成（可选）。