From 1dd3dab0613524d16547c1fe092674d2bea29c47 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 30 Oct 2025 14:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/app/api/order_table.ts              |    9 +
 .../components/order-detail-dialog.vue        |  381 ++++
 .../src/app/views/order_table/order_table.vue |   36 +-
 install.lock                                  |    0
 .../campus_person_role/CampusPersonRole.php   |    5 +-
 .../controller/order_table/OrderTable.php     |    9 +
 .../controller/personnel/Personnel.php        |    2 +
 niucloud/app/adminapi/route/order_table.php   |    3 +
 .../controller/apiController/OrderTable.php   |   16 +
 .../apiController/StudentManager.php          |   45 +-
 .../controller/student/StudentController.php  |    2 +
 niucloud/app/api/route/file.php               |    1 +
 niucloud/app/api/route/route.php              |    4 +-
 .../app/job/schedule/HandleCourseSchedule.php |  122 +-
 niucloud/app/model/order_table/OrderTable.php |   14 +
 .../CampusPersonRoleService.php               |   15 +-
 .../admin/order_table/OrderTableService.php   |   39 +
 .../api/apiService/OrderTableService.php      |   69 +
 .../service/api/apiService/StudentService.php |   27 +-
 .../service/api/student/StudentService.php    |    1 +
 uniapp/api/apiRoute.js                        | 1617 +----------------
 .../client-info-card/client-info-card.vue     |   46 +-
 .../fitness-record-list-popup/index.vue       |  225 +++
 .../fitness-record-popup.less                 |   27 +
 .../fitness-record-popup.vue                  |   56 +-
 uniapp/components/order-form-popup/index.vue  |  402 +++-
 uniapp/components/order-list-card/index.vue   |  985 ++++++++--
 .../order-list-card/payment-voucher-popup.vue |  505 +++++
 .../order-list-card/qrcode-payment-dialog.vue |  207 +++
 uniapp/components/schedule/ScheduleDetail.vue |  340 +++-
 .../student-edit-popup.less                   |   49 +-
 .../student-edit-popup/student-edit-popup.vue |   70 +-
 .../student-info-card/student-info-card.vue   |   24 +-
 .../study-plan-popup/study-plan-popup.vue     |   87 +-
 .../coach/schedule/schedule_table.vue         |   62 +-
 .../clue/class_arrangement_detail.vue         |    1 +
 uniapp/pages-market/clue/clue_info.vue        |  705 +------
 uniapp/pages-market/clue/edit_clues.vue       |  201 +-
 38 files changed, 3619 insertions(+), 2790 deletions(-)
 create mode 100755 admin/src/app/views/order_table/components/order-detail-dialog.vue
 create mode 100755 install.lock
 create mode 100755 uniapp/components/fitness-record-list-popup/index.vue
 create mode 100755 uniapp/components/order-list-card/payment-voucher-popup.vue
 create mode 100755 uniapp/components/order-list-card/qrcode-payment-dialog.vue

diff --git a/admin/src/app/api/order_table.ts b/admin/src/app/api/order_table.ts
index 1f14815f..7960f279 100755
--- a/admin/src/app/api/order_table.ts
+++ b/admin/src/app/api/order_table.ts
@@ -69,4 +69,13 @@ export function getWithPersonnelList(params: Record<string, any>) {
   return request.get('order_table/personnel_all', { params })
 }
 
+/**
+ * 获取订单详情(带完整关联数据)
+ * @param id 订单id
+ * @returns
+ */
+export function getOrderDetail(id: number) {
+  return request.get(`order_table/order_detail/${id}`)
+}
+
 // USER_CODE_END -- order_table
diff --git a/admin/src/app/views/order_table/components/order-detail-dialog.vue b/admin/src/app/views/order_table/components/order-detail-dialog.vue
new file mode 100755
index 00000000..c50f5ece
--- /dev/null
+++ b/admin/src/app/views/order_table/components/order-detail-dialog.vue
@@ -0,0 +1,381 @@
+<template>
+  <el-dialog
+    v-model="showDialog"
+    :title="dialogTitle"
+    width="700px"
+    :close-on-click-modal="false"
+  >
+    <el-descriptions
+      v-if="orderDetail"
+      :column="2"
+      border
+      v-loading="loading"
+    >
+      <el-descriptions-item label="订单编号">
+        {{ orderDetail.id }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="订单类型">
+        {{ getOrderType(orderDetail.order_type) }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="订单状态">
+        {{ getOrderStatus(orderDetail.order_status) }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="支付类型">
+        {{ getPaymentType(orderDetail.payment_type) }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="订单金额">
+        <span class="text-red-500 font-bold">¥{{ orderDetail.order_amount }}</span>
+      </el-descriptions-item>
+
+      <el-descriptions-item label="优惠金额" v-if="orderDetail.discount_amount">
+        <span class="text-green-500">¥{{ orderDetail.discount_amount }}</span>
+      </el-descriptions-item>
+
+      <el-descriptions-item label="课程名称">
+        {{ orderDetail.course_id_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="班级名称">
+        {{ orderDetail.class_id_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="学员姓名">
+        {{ orderDetail.student_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="所属校区">
+        {{ orderDetail.campus_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="客户姓名">
+        {{ orderDetail.resource_id_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="业务员">
+        {{ orderDetail.staff_id_name || '-' }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="赠品信息" v-if="orderDetail.gift_info && orderDetail.gift_info.gift_name">
+        {{ orderDetail.gift_info.gift_name }}
+        <el-tag size="small" :type="getGiftStatusType(orderDetail.gift_info.gift_status)" style="margin-left: 8px;">
+          {{ getGiftStatus(orderDetail.gift_info.gift_status) }}
+        </el-tag>
+      </el-descriptions-item>
+
+      <el-descriptions-item label="支付时间" v-if="orderDetail.payment_time">
+        {{ orderDetail.payment_time }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="创建时间">
+        {{ orderDetail.created_at }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label="订单备注" :span="2" v-if="orderDetail.remark">
+        {{ orderDetail.remark }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 确认支付时的支付凭证上传区域 -->
+    <div v-if="isPaymentAction && orderDetail?.order_status === 'pending'" class="payment-voucher-section">
+      <el-divider content-position="left">支付凭证</el-divider>
+
+      <el-form :model="paymentForm" label-width="100px" style="margin-top: 20px;">
+        <el-form-item label="上传凭证">
+          <div class="upload-wrapper">
+            <el-upload
+              :action="uploadAction"
+              :headers="uploadHeaders"
+              :show-file-list="true"
+              :on-success="handleUploadSuccess"
+              :on-error="handleUploadError"
+              :before-upload="beforeUpload"
+              list-type="picture-card"
+              accept="image/*"
+              class="voucher-upload"
+            >
+              <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
+            </el-upload>
+            <div class="upload-tip">
+              支持 jpg/png/jpeg 格式，单个文件不超过 5MB
+            </div>
+          </div>
+        </el-form-item>
+        <el-form-item label="支付备注">
+          <el-input
+            v-model="paymentForm.remark"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入支付备注信息（可选）"
+          />
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showDialog = false">关闭</el-button>
+        <el-button
+          v-if="isPaymentAction && orderDetail?.order_status === 'pending'"
+          type="primary"
+          @click="handleConfirmPayment"
+          :disabled="paymentForm.vouchers.length === 0"
+        >
+          确认支付
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { getOrderDetail } from '@/app/api/order_table'
+import { ElMessage } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import { getToken } from '@/utils/common'
+
+const showDialog = ref(false)
+const loading = ref(false)
+const orderDetail = ref<any>(null)
+const isPaymentAction = ref(false)
+
+// 支付表单数据
+const paymentForm = ref({
+  vouchers: [] as string[], // 支付凭证URL数组
+  remark: '' // 支付备注
+})
+
+// 上传配置
+const uploadAction = ref(import.meta.env.VITE_APP_BASE_URL + 'sys/image')
+const uploadHeaders = ref({
+  token: getToken()
+})
+
+const dialogTitle = computed(() => {
+  return isPaymentAction.value ? '确认支付' : '订单详情'
+})
+
+// 订单类型映射
+const getOrderType = (type: number) => {
+  const typeMap: Record<number, string> = {
+    1: '新订单',
+    2: '续费订单',
+    3: '内部员工订单',
+    4: '转校',
+    5: '客户内转课订单'
+  }
+  return typeMap[type] || '-'
+}
+
+// 订单状态映射
+const getOrderStatus = (status: string) => {
+  const statusMap: Record<string, string> = {
+    pending: '待支付',
+    paid: '已支付',
+    signed: '待签约',
+    completed: '已完成',
+    transfer: '转学'
+  }
+  return statusMap[status] || '-'
+}
+
+// 支付类型映射
+const getPaymentType = (type: string) => {
+  const typeMap: Record<string, string> = {
+    cash: '现金支付',
+    scan_code: '扫码支付',
+    subscription: '订阅支付',
+    wxpay_online: '微信在线代付',
+    client_wxpay: '客户端微信支付',
+    deposit: '定金'
+  }
+  return typeMap[type] || '-'
+}
+
+// 赠品状态映射
+const getGiftStatus = (status: number) => {
+  const statusMap: Record<number, string> = {
+    1: '未使用',
+    2: '已使用',
+    3: '已过期',
+    4: '已作废'
+  }
+  return statusMap[status] || '-'
+}
+
+// 赠品状态标签类型
+const getGiftStatusType = (status: number) => {
+  const typeMap: Record<number, string> = {
+    1: 'success',
+    2: 'info',
+    3: 'warning',
+    4: 'danger'
+  }
+  return typeMap[status] || 'info'
+}
+
+// 打开弹窗
+const openDialog = async (orderId: number, forPayment: boolean = false) => {
+  showDialog.value = true
+  loading.value = true
+  isPaymentAction.value = forPayment
+
+  // 重置支付表单
+  paymentForm.value = {
+    vouchers: [],
+    remark: ''
+  }
+
+  try {
+    const res = await getOrderDetail(orderId)
+    orderDetail.value = res.data
+  } catch (error) {
+    ElMessage.error('获取订单详情失败')
+    showDialog.value = false
+  } finally {
+    loading.value = false
+  }
+}
+
+// 上传前校验
+const beforeUpload = (file: any) => {
+  const isImage = file.type.startsWith('image/')
+  const isLt5M = file.size / 1024 / 1024 < 5
+
+  if (!isImage) {
+    ElMessage.error('只能上传图片文件!')
+    return false
+  }
+  if (!isLt5M) {
+    ElMessage.error('图片大小不能超过 5MB!')
+    return false
+  }
+  return true
+}
+
+// 上传成功回调
+const handleUploadSuccess = (response: any, file: any) => {
+  if (response.code === 1 && response.data && response.data.url) {
+    paymentForm.value.vouchers.push(response.data.url)
+    ElMessage.success('上传成功')
+  } else {
+    ElMessage.error(response.msg || '上传失败')
+  }
+}
+
+// 上传失败回调
+const handleUploadError = () => {
+  ElMessage.error('上传失败，请重试')
+}
+
+// 确认支付
+const handleConfirmPayment = () => {
+  if (paymentForm.value.vouchers.length === 0) {
+    ElMessage.warning('请上传支付凭证')
+    return
+  }
+
+  // 这里可以调用支付接口
+  console.log('订单ID:', orderDetail.value.id)
+  console.log('支付凭证:', paymentForm.value.vouchers)
+  console.log('支付备注:', paymentForm.value.remark)
+
+  ElMessage.success('支付确认成功，待后端接口实现')
+  showDialog.value = false
+}
+
+// 暴露方法供父组件调用
+defineExpose({
+  openDialog
+})
+</script>
+
+<style scoped>
+.text-red-500 {
+  color: #ef4444;
+}
+.text-green-500 {
+  color: #10b981;
+}
+.font-bold {
+  font-weight: bold;
+}
+
+.payment-voucher-section {
+  margin-top: 20px;
+  padding: 20px;
+  background-color: #f9fafb;
+  border-radius: 8px;
+}
+
+/* 上传容器布局 */
+.upload-wrapper {
+  width: 100%;
+  display: block;
+  overflow: visible;
+}
+
+/* 上传提示文字 */
+.upload-tip {
+  margin-top: 10px;
+  padding-top: 10px;
+  display: block;
+  font-size: 12px;
+  color: #999;
+  line-height: 1.5;
+  clear: both;
+}
+
+/* 上传组件样式 - 强制显示为块级元素 */
+.voucher-upload {
+  width: 100%;
+  display: block !important;
+  overflow: visible !important;
+}
+
+/* el-upload 组件内部样式穿透 */
+:deep(.el-upload--picture-card) {
+  width: 120px !important;
+  height: 120px !important;
+  display: inline-block !important;
+  vertical-align: top !important;
+  margin: 0 8px 8px 0 !important;
+}
+
+:deep(.el-upload-list) {
+  display: block !important;
+  overflow: visible !important;
+  position: relative !important;
+}
+
+:deep(.el-upload-list--picture-card) {
+  display: block !important;
+  vertical-align: top !important;
+  width: 100% !important;
+  overflow: visible !important;
+  position: relative !important;
+}
+
+:deep(.el-upload-list__item) {
+  width: 120px !important;
+  height: 120px !important;
+  display: inline-block !important;
+  margin: 0 8px 8px 0 !important;
+  vertical-align: top !important;
+  position: relative !important;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/admin/src/app/views/order_table/order_table.vue b/admin/src/app/views/order_table/order_table.vue
index 7b1c21c6..8bcfe9c0 100755
--- a/admin/src/app/views/order_table/order_table.vue
+++ b/admin/src/app/views/order_table/order_table.vue
@@ -18,8 +18,8 @@
 								:value="item.value" />
 						</el-select>
 					</el-form-item>
-					
-					
+
+
 					<el-form-item label="订单类型" prop="order_type">
 						<el-select class="w-[280px]" v-model="orderTableTable.searchParam.order_type" clearable
 							placeholder="请选择订单类型">
@@ -27,10 +27,10 @@
 							<el-option label="新订单" :value="1"></el-option>
 							<el-option label="续费订单" :value="2"></el-option>
 							<el-option label="内部员工订单" :value="3"></el-option>
-							
+
 						</el-select>
 					</el-form-item>
-					
+
 
 					<el-form-item :label="t('paymentType')" prop="payment_type">
 						<el-select class="w-[280px]" v-model="orderTableTable.searchParam.payment_type" clearable
@@ -59,7 +59,7 @@
 					</template>
 					<el-table-column prop="resource_id_name" :label="t('resourceId')" min-width="120"
 						:show-overflow-tooltip="true" />
-						
+
 						<el-table-column prop="type" label="订单类型" min-width="120" />
 
 					<el-table-column :label="t('orderStatus')" min-width="180" align="center"
@@ -95,14 +95,18 @@
 					<el-table-column prop="payment_time" :label="t('paymentTime')" min-width="120"
 						:show-overflow-tooltip="true" />
 
-					<el-table-column :label="t('operation')" fixed="right" min-width="120">
+					<el-table-column :label="t('operation')" fixed="right" min-width="180">
 						<template #default="{ row }">
 
-							<el-button type="primary" link @click="startPayment(row.id)" v-if="row.order_status == 'pending' && row.payment_type == 'scan_code'">支付</el-button>
+							<el-button type="primary" link @click="startPayment(row.id)" v-if="row.order_status == 'pending' && row.payment_type == 'scan_code'">扫码支付</el-button>
 
-							<el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
+							<el-button type="primary" link @click="viewOrderDetail(row.id, false)">查看详情</el-button>
+
+							<el-button type="warning" link @click="viewOrderDetail(row.id, true)" v-if="row.order_status == 'pending' && row.payment_type != 'scan_code'">确认支付</el-button>
+
+<!--							<el-button type="primary" link @click="editEvent(row)">{{-->
+<!--                t('edit')-->
+<!--              }}</el-button>-->
 							<el-button type="primary" link @click="deleteEvent(row.id)">{{
                 t('delete')
               }}</el-button>
@@ -118,6 +122,7 @@
 
 			<edit ref="editOrderTableDialog" @complete="loadOrderTableList" />
 
+			<order-detail-dialog ref="orderDetailDialog" />
 
 		</el-card>
 
@@ -154,6 +159,7 @@
 	import { img } from '@/utils/common'
 	import { ElMessageBox, FormInstance } from 'element-plus'
 	import Edit from '@/app/views/order_table/components/order-table-edit.vue'
+	import OrderDetailDialog from '@/app/views/order_table/components/order-detail-dialog.vue'
 	import { useRoute } from 'vue-router'
 	const route = useRoute()
 	const pageName = route.meta.title
@@ -277,6 +283,7 @@
 	loadOrderTableList()
 
 	const editOrderTableDialog : Record<string, any> | null = ref(null)
+	const orderDetailDialog : Record<string, any> | null = ref(null)
 
 	/**
 	 * 添加订单
@@ -295,6 +302,15 @@
 		editOrderTableDialog.value.showDialog = true
 	}
 
+	/**
+	 * 查看订单详情
+	 * @param orderId 订单ID
+	 * @param forPayment 是否为确认支付操作
+	 */
+	const viewOrderDetail = (orderId: number, forPayment: boolean = false) => {
+		orderDetailDialog.value.openDialog(orderId, forPayment)
+	}
+
 	/**
 	 * 删除订单
 	 */
diff --git a/install.lock b/install.lock
new file mode 100755
index 00000000..e69de29b
diff --git a/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php b/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php
index 6b1f4019..5b41b312 100755
--- a/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php
+++ b/niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php
@@ -95,7 +95,10 @@ class CampusPersonRole extends BaseAdminController
     }
 
     public function getPersonnelAll(){
-         return success(( new CampusPersonRoleService())->getPersonnelAll());
+        $data = $this->request->params([
+            ["campus_id",0]
+        ]);
+         return success(( new CampusPersonRoleService())->getPersonnelAll($data['campus_id']));
     }
 
     public function getSysRoleAll(){
diff --git a/niucloud/app/adminapi/controller/order_table/OrderTable.php b/niucloud/app/adminapi/controller/order_table/OrderTable.php
index 6a4a1de3..8ba7ccfa 100755
--- a/niucloud/app/adminapi/controller/order_table/OrderTable.php
+++ b/niucloud/app/adminapi/controller/order_table/OrderTable.php
@@ -109,4 +109,13 @@ class OrderTable extends BaseAdminController
     public function getPersonnelAll(){
          return success(( new OrderTableService())->getPersonnelAll());
     }
+
+    /**
+     * 获取订单详情(带完整关联数据)
+     * @param int $id
+     * @return \think\Response
+     */
+    public function getOrderDetail(int $id){
+        return success((new OrderTableService())->getOrderDetail($id));
+    }
 }
diff --git a/niucloud/app/adminapi/controller/personnel/Personnel.php b/niucloud/app/adminapi/controller/personnel/Personnel.php
index e82ff02c..021b808a 100755
--- a/niucloud/app/adminapi/controller/personnel/Personnel.php
+++ b/niucloud/app/adminapi/controller/personnel/Personnel.php
@@ -68,6 +68,7 @@ class Personnel extends BaseAdminController
              ["id_card_back",""],
              ["status",0],
              ["is_sys_user",0],
+             ["campus_id",0],
             ["info",[]],
             ["use_approval", 0], // 是否使用审批流程
             ["approval_config_id", 0], // 审批配置ID
@@ -110,6 +111,7 @@ class Personnel extends BaseAdminController
              ["id_card_front",""],
              ["id_card_back",""],
              ["status",0],
+             ["campus_id",0],
              ["is_sys_user",0],
              ["info",[]],
 
diff --git a/niucloud/app/adminapi/route/order_table.php b/niucloud/app/adminapi/route/order_table.php
index 831b1170..f24512fb 100755
--- a/niucloud/app/adminapi/route/order_table.php
+++ b/niucloud/app/adminapi/route/order_table.php
@@ -39,6 +39,9 @@ Route::group('order_table', function () {
 
     Route::get('personnel_all','order_table.OrderTable/getPersonnelAll');
 
+    // 获取订单详情(带完整关联数据)
+    Route::get('order_detail/:id','order_table.OrderTable/getOrderDetail');
+
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,
diff --git a/niucloud/app/api/controller/apiController/OrderTable.php b/niucloud/app/api/controller/apiController/OrderTable.php
index 5781e478..ed32bea0 100755
--- a/niucloud/app/api/controller/apiController/OrderTable.php
+++ b/niucloud/app/api/controller/apiController/OrderTable.php
@@ -229,4 +229,20 @@ class OrderTable extends BaseApiService
             'updated_at' => $orderData['updated_at']
         ]);
     }
+
+    public function updateOrderPaymentVoucher(Request $request)
+    {
+        $params = $request->params([
+            ["order_id", ""], // 订单ID必填
+            ["payment_voucher", ""], // 支付凭证
+        ]);
+
+        $res = (new OrderTableService())->updateOrderPaymentVoucher($params);
+
+        if (!$res['code']) {
+            return fail($res['msg']);
+        }
+
+        return success($res['data']);
+    }
 }
diff --git a/niucloud/app/api/controller/apiController/StudentManager.php b/niucloud/app/api/controller/apiController/StudentManager.php
index fc983a89..7ddb4c67 100755
--- a/niucloud/app/api/controller/apiController/StudentManager.php
+++ b/niucloud/app/api/controller/apiController/StudentManager.php
@@ -147,4 +147,47 @@ class StudentManager extends BaseApiService
             return fail('添加学员失败：' . $e->getMessage());
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * 获取学员基本信息（员工端）
+     * @param int $id 学员ID
+     * @return \think\Response
+     */
+    public function info($id)
+    {
+        // 验证参数
+        if (empty($id) || !is_numeric($id)) {
+            return fail('学员ID无效');
+        }
+
+        try {
+            // 直接查询学员基本信息,不需要权限验证
+            $student = \think\facade\Db::table('school_student')
+                ->where('id', $id)
+                ->where('deleted_at', 0)
+                ->find();
+
+            if (!$student) {
+                return fail('学员信息不存在');
+            }
+
+            // 返回学员基本信息
+            $studentInfo = [
+                'id' => $student['id'],
+                'name' => $student['name'],
+                'gender' => $student['gender'],
+                'gender_text' => $student['gender'] == 1 ? '男' : '女',
+                'birthday' => $student['birthday'],
+                'campus_id' => $student['campus_id'] ?? null,
+                'headimg' => $student['headimg'] ? get_image_url($student['headimg']) : '',
+                'emergency_contact' => $student['emergency_contact'],
+                'contact_phone' => $student['contact_phone']
+            ];
+
+            return success($studentInfo, '获取学员信息成功');
+
+        } catch (\Exception $e) {
+            return fail('获取学员信息失败：' . $e->getMessage());
+        }
+    }
+}
diff --git a/niucloud/app/api/controller/student/StudentController.php b/niucloud/app/api/controller/student/StudentController.php
index 09fa6378..593aa62d 100755
--- a/niucloud/app/api/controller/student/StudentController.php
+++ b/niucloud/app/api/controller/student/StudentController.php
@@ -374,4 +374,6 @@ class StudentController extends BaseController
         }
         return success($res['data']);
     }
+
+
 }
diff --git a/niucloud/app/api/route/file.php b/niucloud/app/api/route/file.php
index 64b01813..19acfaff 100755
--- a/niucloud/app/api/route/file.php
+++ b/niucloud/app/api/route/file.php
@@ -27,6 +27,7 @@ Route::group('file', function() {
     Route::post('video', 'upload.Upload/video');
     //拉取图片
     Route::post('image/fetch', 'upload.Upload/imageFetch');
+    //
 
 })->middleware(ApiChannel::class)
 //    ->middleware(ApiCheckToken::class, true)
diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php
index a546e51d..3f885643 100755
--- a/niucloud/app/api/route/route.php
+++ b/niucloud/app/api/route/route.php
@@ -277,6 +277,7 @@ Route::group(function () {
     Route::post('student/edit', 'apiController.StudentManager/edit');
     //销售端-学员-列表
     Route::get('student/list', 'apiController.StudentManager/list');
+    Route::get('student/info/:id', 'apiController.StudentManager/info');
 
     //教练端-学员-我的学员列表
     Route::get('coach/students/my', 'apiController.CoachStudent/getMyStudents');
@@ -316,7 +317,8 @@ Route::group(function () {
     Route::post('orderTable/add', 'apiController.OrderTable/add');
     //员工端-查询订单支付状态
     Route::get('checkOrderPaymentStatus', 'apiController.OrderTable/checkOrderPaymentStatus');
-
+    //更新订单支付凭证payment_voucher
+    Route::post('updateOrderPaymentVoucher', 'apiController.OrderTable/updateOrderPaymentVoucher');
     //员工端-更新学员课程人员配置
     Route::post('updateStudentCoursePersonnel', 'apiController.Course/updateStudentCoursePersonnel');
 
diff --git a/niucloud/app/job/schedule/HandleCourseSchedule.php b/niucloud/app/job/schedule/HandleCourseSchedule.php
index f793ae90..8127fd17 100755
--- a/niucloud/app/job/schedule/HandleCourseSchedule.php
+++ b/niucloud/app/job/schedule/HandleCourseSchedule.php
@@ -50,32 +50,16 @@ class HandleCourseSchedule extends BaseJob
     {
         try {
             Db::startTrans();
-            
+
             $currentDate = date('Y-m-d');
             $currentTime = date('H:i:s');
-            $currentDateTime = date('Y-m-d H:i:s');
-            
-            // 先处理time_slot，解析并更新start_time和end_time字段
-            $this->updateTimeFields();
-            
+
             $completedCount = 0;
             $upcomingCount = 0;
             $ongoingCount = 0;
             $pendingCount = 0;
-            
-            // 1. 首先重置未来日期的课程为pending状态（待开始）
-            // 这是核心修正：course_date > 当前日期的所有课程状态改为pending
-            $futureRows = CourseSchedule::where('course_date', '>', $currentDate)
-                ->where('status', '<>', 'pending')
-                ->update([
-                    'status' => 'pending',
-                    'updated_at' => time()
-                ]);
-            $pendingCount += $futureRows;
-            
-            Log::write("重置未来课程状态完成 - 重置为pending（待开始）: {$futureRows}个");
-            
-            // 2. 更新已完成课程：course_date < 当天的课程
+
+            // 1. 更新已过期课程：course_date < 当天的课程标记为 completed
             $completedRows = CourseSchedule::where('course_date', '<', $currentDate)
                 ->where('status', '<>', 'completed')
                 ->update([
@@ -83,42 +67,46 @@ class HandleCourseSchedule extends BaseJob
                     'updated_at' => time()
                 ]);
             $completedCount = $completedRows;
-            
-            // 3. 处理今天的课程，需要根据时间段判断状态
+
+            Log::write("更新过期课程完成 - 已完成: {$completedRows}个");
+
+            // 2. 处理今天的课程，需要根据时间段判断状态
+            // 注意：只处理当天课程，不处理未来课程（course_date > 今天）
             $todaySchedules = CourseSchedule::where('course_date', '=', $currentDate)
-                ->whereIn('status', ['pending', 'upcoming', 'ongoing'])
                 ->select();
-            
+
             foreach ($todaySchedules as $schedule) {
                 $startTime = $schedule['start_time'];
                 $endTime = $schedule['end_time'];
-                
+
+                // 如果 start_time 或 end_time 为空，尝试从 time_slot 解析
                 if (empty($startTime) || empty($endTime)) {
-                    // 如果没有解析出时间，尝试从time_slot解析
                     $timeData = $this->parseTimeSlot($schedule['time_slot']);
                     if ($timeData) {
                         $startTime = $timeData['start_time'];
                         $endTime = $timeData['end_time'];
-                        
+
                         // 更新数据库中的时间字段
                         CourseSchedule::where('id', $schedule['id'])->update([
                             'start_time' => $startTime,
                             'end_time' => $endTime
                         ]);
                     } else {
-                        continue; // 无法解析时间，跳过
+                        // 无法解析时间（time_slot 为 null 或空字符串），跳过该记录
+                        Log::write("课程ID {$schedule['id']} 无法解析时间，time_slot: {$schedule['time_slot']}");
+                        continue;
                     }
                 }
-                
+
                 // 判断课程状态
                 $newStatus = $this->determineStatus($currentTime, $startTime, $endTime);
-                
+
                 if ($newStatus !== $schedule['status']) {
                     CourseSchedule::where('id', $schedule['id'])->update([
                         'status' => $newStatus,
                         'updated_at' => time()
                     ]);
-                    
+
                     switch ($newStatus) {
                         case 'upcoming':
                             $upcomingCount++;
@@ -135,48 +123,20 @@ class HandleCourseSchedule extends BaseJob
                     }
                 }
             }
-            
-            Log::write("课程状态更新完成 - 已完成: {$completedCount}个, 即将开始: {$upcomingCount}个, 进行中: {$ongoingCount}个, 待开始: {$pendingCount}个");
-            
+
+            Log::write("当天课程状态更新完成 - 已完成: {$completedCount}个, 即将开始: {$upcomingCount}个, 进行中: {$ongoingCount}个, 待开始: {$pendingCount}个");
+
             Db::commit();
-            
+
             return true;
-            
+
         } catch (\Exception $e) {
             Db::rollback();
             Log::write('更新课程状态失败：' . $e->getMessage());
             return false;
         }
     }
-    
-    /**
-     * 更新课程安排表的start_time和end_time字段
-     */
-    private function updateTimeFields()
-    {
-        try {
-            // 查询所有没有start_time或end_time的记录
-            $schedules = CourseSchedule::where(function($query) {
-                $query->whereNull('start_time')
-                    ->whereOr('end_time', null)
-                    ->whereOr('start_time', '')
-                    ->whereOr('end_time', '');
-            })->select();
-            
-            foreach ($schedules as $schedule) {
-                $timeData = $this->parseTimeSlot($schedule['time_slot']);
-                if ($timeData) {
-                    CourseSchedule::where('id', $schedule['id'])->update([
-                        'start_time' => $timeData['start_time'],
-                        'end_time' => $timeData['end_time']
-                    ]);
-                }
-            }
-        } catch (\Exception $e) {
-            Log::write('更新时间字段失败：' . $e->getMessage());
-        }
-    }
-    
+
     /**
      * 解析time_slot字符串，提取开始和结束时间
      * @param string $timeSlot 格式如 "09:00-10:30"
@@ -201,6 +161,12 @@ class HandleCourseSchedule extends BaseJob
     
     /**
      * 根据当前时间和课程时间段判断课程状态
+     * 逻辑说明：
+     * 1. 如果当前时间 > 结束时间 → completed（已结束）
+     * 2. 如果当前时间在 [开始时间, 结束时间] 之间 → ongoing（进行中）
+     * 3. 如果当前时间 + 6小时 >= 开始时间 → upcoming（即将开始）
+     * 4. 其他情况 → pending（待开始）
+     *
      * @param string $currentTime 当前时间 H:i:s
      * @param string $startTime 开始时间 H:i:s
      * @param string $endTime 结束时间 H:i:s
@@ -211,24 +177,24 @@ class HandleCourseSchedule extends BaseJob
         $currentTimestamp = strtotime($currentTime);
         $startTimestamp = strtotime($startTime);
         $endTimestamp = strtotime($endTime);
-        
-        // 如果当前时间在课程时间段内，状态为进行中
-        if ($currentTimestamp >= $startTimestamp && $currentTimestamp <= $endTimestamp) {
-            return 'ongoing';
-        }
-        
-        // 如果课程已结束，状态为已完成
+
+        // 1. 如果课程已结束（当前时间 > 结束时间），状态为已完成
         if ($currentTimestamp > $endTimestamp) {
             return 'completed';
         }
-        
-        // 如果距离开始时间不足6小时，状态为即将开始
-        $timeDiff = $startTimestamp - $currentTimestamp;
-        if ($timeDiff <= 6 * 3600 && $timeDiff > 0) { // 6小时 = 6 * 60 * 60 秒
+
+        // 2. 如果当前时间在课程时间段内，状态为进行中
+        if ($currentTimestamp >= $startTimestamp && $currentTimestamp <= $endTimestamp) {
+            return 'ongoing';
+        }
+
+        // 3. 如果距离开始时间在6小时以内（当前时间 + 6小时 >= 开始时间），状态为即将开始
+        $sixHoursLater = $currentTimestamp + (6 * 3600); // 6小时 = 6 * 60 * 60 秒
+        if ($sixHoursLater >= $startTimestamp) {
             return 'upcoming';
         }
-        
-        // 其他情况为待安排
+
+        // 4. 其他情况为待开始
         return 'pending';
     }
 }
diff --git a/niucloud/app/model/order_table/OrderTable.php b/niucloud/app/model/order_table/OrderTable.php
index e1ef82e4..ba93243b 100755
--- a/niucloud/app/model/order_table/OrderTable.php
+++ b/niucloud/app/model/order_table/OrderTable.php
@@ -26,6 +26,10 @@ use app\model\personnel\Personnel;
 
 use app\model\student_courses\StudentCourses;
 
+use app\model\student\Student;
+
+use app\model\campus\Campus;
+
 /**
  * 订单模型
  * Class OrderTable
@@ -105,4 +109,14 @@ class OrderTable extends BaseModel
        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']);
     }
 
+    //学员表-学员信息
+    public function student(){
+       return $this->hasOne(Student::class, 'id', 'student_id')->joinType('left')->withField('name,id')->bind(['student_name'=>'name']);
+    }
+
+    //校区表-校区信息
+    public function campus(){
+       return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_name'=>'campus_name']);
+    }
+
 }
diff --git a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php
index d7a1a6a1..c9d9ea63 100755
--- a/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php
+++ b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php
@@ -163,12 +163,13 @@ class CampusPersonRoleService extends BaseAdminService
        return $campusModel->select()->toArray();
     }
 
-    public function getPersonnelAll(){
-        $person_ids = $this->model->column("person_id");
-
-
+    public function getPersonnelAll($campus_id){
        $personnelModel = new Personnel();
-       return $personnelModel->where([['id','not in',$person_ids]])->select()->toArray();
+       return $personnelModel->when($campus_id, function ($query) use ($campus_id) {
+           $query->where('campus_id', $campus_id);
+       })->where('status',2)
+           ->select()
+           ->toArray();
     }
 
     public function getSysRoleAll($data){
@@ -181,12 +182,12 @@ class CampusPersonRoleService extends BaseAdminService
                      ->where('role_key', '<>', '')
                      ->where('role_name', '<>', '超级管理员');
            });
-       
+
        // 如果dept_id不为0，则按部门过滤；如果为0则显示所有可用角色
        if (isset($data['dept_id']) && $data['dept_id'] > 0) {
            $query->where('dept_id', $data['dept_id']);
        }
-       
+
        return $query->select()->toArray();
     }
 
diff --git a/niucloud/app/service/admin/order_table/OrderTableService.php b/niucloud/app/service/admin/order_table/OrderTableService.php
index ccb9d9a5..2d53f797 100755
--- a/niucloud/app/service/admin/order_table/OrderTableService.php
+++ b/niucloud/app/service/admin/order_table/OrderTableService.php
@@ -151,5 +151,44 @@ class OrderTableService extends BaseAdminService
        return $personnelModel->select()->toArray();
     }
 
+    /**
+     * 获取订单详情(带完整关联数据)
+     * @param int $id
+     * @return array
+     */
+    public function getOrderDetail(int $id)
+    {
+        // 查询订单基础信息及关联数据
+        $order = $this->model
+            ->where([['id', '=', $id]])
+            ->with([
+                'customerResources',  // 客户资源
+                'course',             // 课程
+                'classGrade',         // 班级
+                'personnel',          // 员工
+                'student',            // 学员
+                'campus'              // 校区
+            ])
+            ->findOrEmpty()
+            ->toArray();
+
+        if (empty($order)) {
+            return [];
+        }
+
+        // 如果有赠品ID,单独查询赠品信息
+        if (!empty($order['gift_id'])) {
+            $giftInfo = db('shcool_resources_gift')
+                ->where('id', $order['gift_id'])
+                ->field('id,gift_name,gift_type,gift_status')
+                ->find();
+            $order['gift_info'] = $giftInfo ?: [];
+        } else {
+            $order['gift_info'] = [];
+        }
+
+        return $order;
+    }
+
 
 }
diff --git a/niucloud/app/service/api/apiService/OrderTableService.php b/niucloud/app/service/api/apiService/OrderTableService.php
index c5ba0b93..cbf965e3 100755
--- a/niucloud/app/service/api/apiService/OrderTableService.php
+++ b/niucloud/app/service/api/apiService/OrderTableService.php
@@ -1022,4 +1022,73 @@ class OrderTableService extends BaseApiService
         // TODO: 具体的赠课逻辑实现
         return true;
     }
+
+    public function updateOrderPaymentVoucher($params)
+    {
+        try {
+            // 验证必要参数
+            if (empty($params['order_id'])) {
+                return [
+                    'code' => 0,
+                    'msg' => '缺少订单ID参数',
+                    'data' => []
+                ];
+            }
+
+            if (empty($params['payment_voucher'])) {
+                return [
+                    'code' => 0,
+                    'msg' => '缺少支付凭证参数',
+                    'data' => []
+                ];
+            }
+
+            // 查询订单
+            $order = OrderTable::where('id', $params['order_id'])->find();
+            if (!$order) {
+                return [
+                    'code' => 0,
+                    'msg' => '订单不存在',
+                    'data' => []
+                ];
+            }
+
+            // 更新支付凭证
+            $result = $order->save([
+                'payment_voucher' => $params['payment_voucher'],
+                'updated_at' => date('Y-m-d H:i:s')
+            ]);
+
+            if ($result) {
+                \think\facade\Log::info('订单支付凭证更新成功', [
+                    'order_id' => $params['order_id'],
+                    'payment_voucher' => $params['payment_voucher']
+                ]);
+
+                return [
+                    'code' => 1,
+                    'msg' => '支付凭证提交成功',
+                    'data' => $order->toArray()
+                ];
+            } else {
+                return [
+                    'code' => 0,
+                    'msg' => '支付凭证提交失败',
+                    'data' => []
+                ];
+            }
+        } catch (\Exception $e) {
+            \think\facade\Log::error('更新订单支付凭证异常', [
+                'params' => $params,
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString()
+            ]);
+
+            return [
+                'code' => 0,
+                'msg' => '更新订单支付凭证异常: ' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
 }
diff --git a/niucloud/app/service/api/apiService/StudentService.php b/niucloud/app/service/api/apiService/StudentService.php
index 8efa76a8..9a00827f 100755
--- a/niucloud/app/service/api/apiService/StudentService.php
+++ b/niucloud/app/service/api/apiService/StudentService.php
@@ -64,7 +64,7 @@ class StudentService extends BaseApiService
 
             // 插入数据库
             $id = Db::table('school_student')->insertGetId($insertData);
-            
+
             if ($id) {
                 $res['code'] = 1;
                 $res['msg'] = '添加成功';
@@ -115,7 +115,7 @@ class StudentService extends BaseApiService
             if (!empty($data['name'])) {
                 $where[] = ['s.name', 'like', '%' . $data['name'] . '%'];
             }
-            
+
             if (!empty($data['phone'])) {
                 $where[] = ['s.contact_phone', 'like', '%' . $data['phone'] . '%'];
             }
@@ -146,8 +146,7 @@ class StudentService extends BaseApiService
                 // 查询该学员的课程安排记录，按日期排序获取一访和二访信息
                 $visitRecords = Db::table('school_person_course_schedule')
                     ->where([
-                        ['person_id', '=', $student['id']],
-                        ['person_type', '=', 'student']
+                        ['student_id', '=', $student['id']]
                     ])
                     ->order('course_date', 'asc')
                     ->select()
@@ -197,27 +196,27 @@ class StudentService extends BaseApiService
         // 如果指定了parent_resource_id，则查询该资源下的学生
         if (!empty($data['parent_resource_id'])) {
             $resourceId = $data['parent_resource_id'];
-            
+
             // 验证当前用户是否有权限访问该资源
             $resource = Db::table('school_customer_resources')
                 ->where('id', $resourceId)
                 ->where('consultant', $userId)
                 ->where('deleted_at', 0)
                 ->find();
-                
+
             if (empty($resource)) {
                 // 用户无权限访问该资源
                 return [];
             }
-            
+
             // 查询该资源关联的学生ID
             $studentIds = Db::table('school_student_courses')
                 ->where('resource_id', $resourceId)
                 ->column('student_id');
-                
+
             return array_values(array_unique($studentIds));
         }
-        
+
         // 如果没有指定资源ID，则查询当前用户（教练）负责的所有学生
         return $this->getCoachStudentIds($userId, $data);
     }
@@ -305,13 +304,13 @@ class StudentService extends BaseApiService
             if (empty($token)) {
                 return 0;
             }
-            
+
             // 去掉Bearer前缀
             $token = str_replace('Bearer ', '', $token);
-            
+
             // 使用项目的TokenAuth类解析token，类型为personnel（员工端）
             $tokenInfo = \core\util\TokenAuth::parseToken($token, 'personnel');
-            
+
             if (!empty($tokenInfo)) {
                 // 从jti中提取用户ID（格式：用户ID_类型）
                 $jti = $tokenInfo['jti'] ?? '';
@@ -322,7 +321,7 @@ class StudentService extends BaseApiService
                     }
                 }
             }
-            
+
             return 0;
         } catch (\Exception $e) {
             return 0;
@@ -363,4 +362,4 @@ class StudentService extends BaseApiService
 
         return $res;
     }
-}
\ No newline at end of file
+}
diff --git a/niucloud/app/service/api/student/StudentService.php b/niucloud/app/service/api/student/StudentService.php
index 105a23a2..3b83f185 100755
--- a/niucloud/app/service/api/student/StudentService.php
+++ b/niucloud/app/service/api/student/StudentService.php
@@ -184,6 +184,7 @@ class StudentService extends BaseService
             'contact_phone' => $student['contact_phone'],
             'note' => $student['note'],
             'headimg' => $student['headimg'] ? get_image_url($student['headimg']) : '',
+            'campus_id' => $student['campus_id'] ?? null, // 添加校区ID
         ];
 
         // 处理体测信息
diff --git a/uniapp/api/apiRoute.js b/uniapp/api/apiRoute.js
index 760c75e7..33ccf058 100755
--- a/uniapp/api/apiRoute.js
+++ b/uniapp/api/apiRoute.js
@@ -6,7 +6,6 @@ export default {
   //统一登录接口
   async unifiedLogin(data = {}) {
     const response = await http.post('/login/unified', data)
-    console.log('统一登录响应:', response)
     return response
   },
   //教师/销售端详情
@@ -54,206 +53,6 @@ export default {
   async resetPassword(data = {}) {
     return await http.post('/common/resetPassword', data)
   },
-
-  // 课程安排列表 - Mock版本
-  async getCourseScheduleListMock(data = {}) {
-    // 延迟模拟网络请求
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    // 模拟课程数据
-    const mockCourses = [
-      {
-        id: 101,
-        date: '2025-07-14', // 周一
-        time: '09:00',
-        courseName: '少儿形体课',
-        students: '已报名8人',
-        teacher: '张教练',
-        teacher_id: 1,
-        status: '未点名',
-        type: 'normal', // 普通课程
-        venue: '舞蹈室A',
-        venue_id: 1,
-        class_id: 1,
-        duration: 1,
-      },
-      {
-        id: 102,
-        date: '2025-07-14', // 周一
-        time: '14:00',
-        courseName: '成人瑜伽',
-        students: '已报名12人',
-        teacher: '李教练',
-        teacher_id: 2,
-        status: '已点名',
-        type: 'normal', // 普通课程
-        venue: '瑜伽B',
-        venue_id: 2,
-        class_id: 2,
-        duration: 1,
-      },
-      {
-        id: 103,
-        date: '2025-07-15', // 周二
-        time: '10:00',
-        courseName: '私教训练',
-        students: '已报名1人',
-        teacher: '王教练',
-        teacher_id: 3,
-        status: '未点名',
-        type: 'private', // 私教课程
-        venue: '健身C',
-        venue_id: 3,
-        class_id: 3,
-        duration: 1,
-      },
-      {
-        id: 104,
-        date: '2025-07-15', // 周二
-        time: '16:00',
-        courseName: '儿童游泳',
-        students: '已报名6人',
-        teacher: '刘教练',
-        teacher_id: 4,
-        status: '未点名',
-        type: 'normal', // 普通课程
-        venue: '泳池D',
-        venue_id: 4,
-        class_id: 4,
-        duration: 1,
-      },
-      {
-        id: 105,
-        date: '2025-07-17', // 周四
-        time: '14:00',
-        courseName: '暑季特训营',
-        students: '已报名15人',
-        teacher: '赵教练',
-        teacher_id: 5,
-        status: '未点名',
-        type: 'activity', // 活动课程
-        venue: '综合场馆E',
-        venue_id: 5,
-        class_id: 5,
-        duration: 2, // 持续2小时
-      },
-    ]
-
-    // 根据筛选条件过滤课程
-    let filteredCourses = [...mockCourses]
-
-    // 日期范围筛选
-    if (data.start_date && data.end_date) {
-      filteredCourses = filteredCourses.filter(course => {
-        return course.date >= data.start_date && course.date <= data.end_date
-      })
-    }
-
-    // 教练筛选
-    if (data.coach_id) {
-      const coachIds = Array.isArray(data.coach_id) ? data.coach_id : [data.coach_id]
-      filteredCourses = filteredCourses.filter(course => {
-        return coachIds.includes(course.teacher_id)
-      })
-    }
-
-    // 场地筛选
-    if (data.venue_id) {
-      const venueIds = Array.isArray(data.venue_id) ? data.venue_id : [data.venue_id]
-      filteredCourses = filteredCourses.filter(course => {
-        return venueIds.includes(course.venue_id)
-      })
-    }
-
-    // 班级筛选
-    if (data.class_id) {
-      const classIds = Array.isArray(data.class_id) ? data.class_id : [data.class_id]
-      filteredCourses = filteredCourses.filter(course => {
-        return classIds.includes(course.class_id)
-      })
-    }
-
-    // 时间段筛选
-    if (data.time_range) {
-      switch (data.time_range) {
-        case 'morning': // 上午
-          filteredCourses = filteredCourses.filter(course => {
-            const hour = parseInt(course.time.split(':')[0])
-            return hour >= 8 && hour < 12
-          })
-          break
-        case 'afternoon': // 下午
-          filteredCourses = filteredCourses.filter(course => {
-            const hour = parseInt(course.time.split(':')[0])
-            return hour >= 12 && hour < 18
-          })
-          break
-        case 'evening': // 晚上
-          filteredCourses = filteredCourses.filter(course => {
-            const hour = parseInt(course.time.split(':')[0])
-            return hour >= 18 && hour < 22
-          })
-          break
-      }
-    }
-
-    // 处理结果格式
-    const result = {
-      list: filteredCourses.map(course => ({
-        id: course.id,
-        course_date: course.date,
-        time_info: {
-          start_time: course.time,
-          end_time: this.calculateEndTime(course.time, course.duration),
-          duration: course.duration * 60,
-        },
-        course_name: course.courseName,
-        enrolled_count: parseInt(course.students.match(/\d+/)[0]) || 0,
-        coach_name: course.teacher,
-        teacher_id: course.teacher_id,
-        status_text: course.status,
-        course_type: course.type,
-        venue_name: course.venue,
-        venue_id: course.venue_id,
-        campus_name: this.getCampusName(course.venue_id),
-        class_id: course.class_id,
-        available_capacity: course.type === 'private' ? 1 : (course.type === 'activity' ? 30 : 15),
-        time_slot: `${course.time}-${this.calculateEndTime(course.time, course.duration)}`,
-      })),
-      total: filteredCourses.length,
-    }
-
-    return {
-      code: 1,
-      data: result,
-      msg: 'SUCCESS',
-    }
-  },
-
-  // 计算结束时间
-  calculateEndTime(startTime, duration) {
-    const [hours, minutes] = startTime.split(':').map(Number)
-    let endHours = hours + duration
-    let endMinutes = minutes
-
-    if (endHours >= 24) {
-      endHours -= 24
-    }
-
-    return `${endHours.toString().padStart(2, '0')}:${endMinutes.toString().padStart(2, '0')}`
-  },
-
-  // 根据场地ID获取校区名称
-  getCampusName(venueId) {
-    const campusMap = {
-      1: '总部校区',
-      2: '南山校区',
-      3: '福田校区',
-      4: '罗湖校区',
-      5: '宝安校区',
-    }
-    return campusMap[venueId] || '总部校区'
-  },
   //公共端-获取全部员工列表
   async common_getPersonnelAll(data = {}) {
     return await http.get('/personnel/getPersonnelAll', data)
@@ -546,7 +345,6 @@ export default {
   //学生登陆接口
   async xy_login(data = {}) {
     const response = await http.post('/customerResourcesAuth/login', data)
-    console.log('学生登录响应:', response)
     return response
   },
   //学生详情
@@ -727,373 +525,107 @@ export default {
     return await http.get('/checkOrderPaymentStatus', data)
   },
 
+  async updateOrderPaymentVoucher(data = {}) {
+    return await http.post('/updateOrderPaymentVoucher', data)
+  },
   //↓↓↓↓↓↓↓↓↓↓↓↓-----课程预约相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
   // 获取可预约课程列表
   async getAvailableCourses(data = {}) {
-    try {
-      // 过滤掉undefined、null、空字符串的参数
-      const params = {}
-      if (data.date !== undefined && data.date !== null && data.date !== '') {
-        params.date = data.date
-      }
-      if (data.start_date !== undefined && data.start_date !== null && data.start_date !== '') {
-        params.start_date = data.start_date
-      }
-      if (data.end_date !== undefined && data.end_date !== null && data.end_date !== '') {
-        params.end_date = data.end_date
-      }
-      if (data.coach_id !== undefined && data.coach_id !== null && data.coach_id !== '') {
-        params.coach_id = data.coach_id
-      }
-      if (data.venue_id !== undefined && data.venue_id !== null && data.venue_id !== '') {
-        params.venue_id = data.venue_id
-      }
-      if (data.course_type !== undefined && data.course_type !== null && data.course_type !== '') {
-        params.course_type = data.course_type
-      }
-
-      const response = await http.get('/course-booking/available/' + data.student_id, params)
-
-      // 检查响应状态，如果失败则降级到Mock数据
-      if (response.code !== 1) {
-        console.warn('API返回错误，降级到Mock数据:', response.msg)
-        return await this.getAvailableCoursesMock(data)
-      }
-
-      return response
-    } catch (error) {
-      console.error('获取可预约课程错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getAvailableCoursesMock(data)
+    // 过滤掉undefined、null、空字符串的参数
+    const params = {}
+    if (data.date !== undefined && data.date !== null && data.date !== '') {
+      params.date = data.date
+    }
+    if (data.start_date !== undefined && data.start_date !== null && data.start_date !== '') {
+      params.start_date = data.start_date
+    }
+    if (data.end_date !== undefined && data.end_date !== null && data.end_date !== '') {
+      params.end_date = data.end_date
+    }
+    if (data.coach_id !== undefined && data.coach_id !== null && data.coach_id !== '') {
+      params.coach_id = data.coach_id
     }
+    if (data.venue_id !== undefined && data.venue_id !== null && data.venue_id !== '') {
+      params.venue_id = data.venue_id
+    }
+    if (data.course_type !== undefined && data.course_type !== null && data.course_type !== '') {
+      params.course_type = data.course_type
+    }
+
+    return await http.get('/course-booking/available/' + data.student_id, params)
   },
 
   // 创建课程预约
   async createBooking(data = {}) {
-    try {
-      const response = await http.post('/course-booking/create', data)
-
-      // 检查响应状态，如果失败则返回模拟成功响应
-      if (response.code !== 1) {
-        console.warn('创建预约API返回错误，返回模拟成功响应:', response.msg)
-        return {
-          code: 1,
-          msg: '预约成功（模拟）',
-          data: { booking_id: Date.now() },
-        }
-      }
-
-      return response
-    } catch (error) {
-      console.error('创建预约错误:', error)
-      // 模拟成功响应
-      return {
-        code: 1,
-        msg: '预约成功（模拟）',
-        data: { booking_id: Date.now() },
-      }
-    }
+    return await http.post('/course-booking/create', data)
   },
 
   // 获取我的预约列表
   async getMyBookingList(data = {}) {
-    try {
-      // 过滤掉undefined值，避免传递"undefined"字符串
-      const params = {}
-      if (data.status !== undefined && data.status !== null && data.status !== '') {
-        params.status = data.status
-      }
-      if (data.start_date !== undefined && data.start_date !== null && data.start_date !== '') {
-        params.start_date = data.start_date
-      }
-      if (data.end_date !== undefined && data.end_date !== null && data.end_date !== '') {
-        params.end_date = data.end_date
-      }
-
-      const response = await http.get('/course-booking/my-list/' + data.student_id, params)
-
-      // 检查响应状态，如果失败则降级到Mock数据
-      if (response.code !== 1) {
-        console.warn('获取预约列表API返回错误，降级到Mock数据:', response.msg)
-        return await this.getMyBookingListMock(data)
-      }
-
-      return response
-    } catch (error) {
-      console.error('获取预约列表错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getMyBookingListMock(data)
+    // 过滤掉undefined值，避免传递"undefined"字符串
+    const params = {}
+    if (data.status !== undefined && data.status !== null && data.status !== '') {
+      params.status = data.status
     }
+    if (data.start_date !== undefined && data.start_date !== null && data.start_date !== '') {
+      params.start_date = data.start_date
+    }
+    if (data.end_date !== undefined && data.end_date !== null && data.end_date !== '') {
+      params.end_date = data.end_date
+    }
+
+    return await http.get('/course-booking/my-list/' + data.student_id, params)
   },
 
   // 取消预约
   async cancelBooking(data = {}) {
-    try {
-      const response = await http.post('/course-booking/cancel', data)
-
-      // 检查响应状态，如果失败则返回模拟成功响应
-      if (response.code !== 1) {
-        console.warn('取消预约API返回错误，返回模拟成功响应:', response.msg)
-        return {
-          code: 1,
-          msg: '取消成功（模拟）',
-        }
-      }
-
-      return response
-    } catch (error) {
-      console.error('取消预约错误:', error)
-      // 模拟成功响应
-      return {
-        code: 1,
-        msg: '取消成功（模拟）',
-      }
-    }
+    return await http.post('/course-booking/cancel', data)
   },
 
   // 获取学员汇总信息
   async getStudentSummary(student_id) {
-    try {
-      return await http.get(`/student/summary/${student_id}`)
-    } catch (error) {
-      console.error('获取学员汇总信息错误:', error)
-      // 返回模拟数据
-      return {
-        code: 1,
-        data: {
-          student_id: student_id,
-          name: '学员姓名',
-          booking_qualification: {
-            can_book: false,
-            remaining_courses: 0,
-            reason: '接口调用失败',
-          },
-        },
-      }
-    }
-  },
-
-  // 模拟可预约课程数据
-  async getAvailableCoursesMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    const mockCourses = [
-      {
-        id: 1,
-        course_date: data.date || '2025-08-01',
-        start_time: '09:00',
-        end_time: '10:00',
-        duration: 60,
-        course_name: '基础体能训练',
-        course_type: '基础体能训练',
-        coach_name: '张教练',
-        venue_name: '训练馆A',
-        booking_status: 'available',
-        max_students: 8,
-        current_students: 3,
-      },
-      {
-        id: 2,
-        course_date: data.date || '2025-08-01',
-        start_time: '10:30',
-        end_time: '11:30',
-        duration: 60,
-        course_name: '少儿体适能',
-        course_type: '少儿体适能',
-        coach_name: '李教练',
-        venue_name: '训练馆B',
-        booking_status: 'available',
-        max_students: 6,
-        current_students: 2,
-      },
-      {
-        id: 3,
-        course_date: data.date || '2025-08-01',
-        start_time: '14:00',
-        end_time: '15:00',
-        duration: 60,
-        course_name: '专项训练',
-        course_type: '专项训练',
-        coach_name: '王教练',
-        venue_name: '训练馆A',
-        booking_status: 'full',
-        max_students: 4,
-        current_students: 4,
-      },
-    ]
-
-    return {
-      code: 1,
-      data: {
-        list: mockCourses,
-        total: mockCourses.length,
-      },
-      msg: 'SUCCESS',
-    }
-  },
-
-  // 模拟我的预约列表数据
-  async getMyBookingListMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    const mockBookings = [
-      {
-        id: 1,
-        booking_date: this.formatDateString(new Date(Date.now() + 24 * 60 * 60 * 1000)),
-        start_time: '16:00',
-        end_time: '17:00',
-        coach_name: '张教练',
-        course_type: '基础体能训练',
-        venue_name: '训练馆A',
-        status: 0,
-        status_text: '待上课',
-      },
-    ]
-
-    return {
-      code: 1,
-      data: {
-        list: mockBookings,
-        total: mockBookings.length,
-      },
-      msg: 'SUCCESS',
-    }
+    return await http.get(`/student/summary/${student_id}`)
   },
 
   //↓↓↓↓↓↓↓↓↓↓↓↓-----课程安排相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
   // 获取课程安排列表（支持学员和教练端）
   async getCourseScheduleList(data = {}) {
-    try {
-      let response
-
-      // 如果有student_id参数，说明是学员端调用，使用学员端API
-      if (data.student_id) {
-        response = await http.get('/course-schedule/list/' + data.student_id, {
-          date: data.date,
-          status: data.status,
-          start_date: data.start_date,
-          end_date: data.end_date,
-        })
-      } else {
-        // 否则是教练端调用，使用教练端API
-        response = await http.get('/courseSchedule/list', {
-          start_date: data.start_date,
-          end_date: data.end_date,
-          coach_id: data.coach_id,
-          venue_id: data.venue_id,
-          class_id: data.class_id,
-          time_range: data.time_range,
-          view_type: data.view_type,
-          page: data.page || 1,
-          limit: data.limit || 9999,
-        })
-      }
-
-      return response
-    } catch (error) {
-      console.error('获取课程安排列表错误:', error)
-      uni.showModal({
-        title: '获取课程安排列表错误',
-        content: JSON.stringify(error),
-        showCancel: false,
+    let response
+
+    // 如果有student_id参数，说明是学员端调用，使用学员端API
+    if (data.student_id) {
+      response = await http.get('/course-schedule/list/' + data.student_id, {
+        date: data.date,
+        status: data.status,
+        start_date: data.start_date,
+        end_date: data.end_date,
+      })
+    } else {
+      // 否则是教练端调用，使用教练端API
+      response = await http.get('/courseSchedule/list', {
+        start_date: data.start_date,
+        end_date: data.end_date,
+        coach_id: data.coach_id,
+        venue_id: data.venue_id,
+        class_id: data.class_id,
+        time_range: data.time_range,
+        view_type: data.view_type,
+        page: data.page || 1,
+        limit: data.limit || 9999,
       })
     }
-  },
 
+    return response
+  },
 
   // 申请课程请假
   async requestCourseLeave(data = {}) {
-    try {
-      const response = await http.post('/course-schedule/leave', data)
-      return response
-    } catch (error) {
-      console.error('申请课程请假错误:', error)
-      // 模拟请假申请成功
-      return {
-        code: 1,
-        msg: '请假申请已提交',
-      }
-    }
+    return await http.post('/course-schedule/leave', data)
   },
+
   // 获取课程安排详情（用于课程调整页面）
   async getCourseScheduleInfo(data = {}) {
-    try {
-      // 使用真实的API接口获取课程安排详情 - 调整页面专用接口
-      const result = await http.get('/courseSchedule/info', data)
-      console.log('获取课程安排详情:', result)
-      return result
-    } catch (error) {
-      console.error('获取课程安排详情失败:', error)
-      // 如果接口调用失败，降级到Mock数据
-      return this.getCourseScheduleInfoMock(data)
-    }
-  },
-
-  // 模拟课程安排详情数据
-  async getCourseScheduleInfoMock(data = {}) {
-    // 模拟数据加载延迟
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    // 使用默认学生数据
-    const defaultStudents = [
-      {
-        id: 1,
-        name: '张三',
-        avatar: '/static/icon-img/avatar.png',
-        status: 0,
-        status_text: '未点名',
-        statusClass: 'status-pending',
-      },
-      {
-        id: 2,
-        name: '李四',
-        avatar: '/static/icon-img/avatar.png',
-        status: 1,
-        status_text: '已点名',
-        statusClass: 'status-present',
-      },
-      {
-        id: 3,
-        name: '王五',
-        avatar: '/static/icon-img/avatar.png',
-        status: 2,
-        status_text: '请假',
-        statusClass: 'status-leave',
-      },
-    ]
-
-    // 课程安排模拟数据
-    const mockScheduleInfo = {
-      id: parseInt(data.schedule_id),
-      course_name: '大课7+1类型',
-      course_date: '2025-07-25',
-      time_slot: '09:00-10:00',
-      venue_name: '时间范围教室',
-      campus_name: '测试校区',
-      coach_name: '老六',
-      status: 'pending',
-      status_text: '即将开始',
-      class_info: {
-        id: 1,
-        class_name: '少儿形体班',
-      },
-      course_duration: 60,
-      students: defaultStudents,
-      course_info: {
-        total_hours: 20,
-        use_total_hours: 8,
-        gift_hours: 2,
-        use_gift_hours: 1,
-        start_date: '2025-06-01',
-        end_date: '2025-12-31',
-      },
-    }
-
-    return {
-      code: 1,
-      data: mockScheduleInfo,
-      msg: 'SUCCESS',
-    }
+    return await http.get('/courseSchedule/info', data)
   },
   // 创建课程安排
   async createCourseSchedule(data = {}) {
@@ -1127,77 +659,21 @@ export default {
   },
   // 检查教练时间冲突
   async checkCoachConflict(data = {}) {
-    // 未登录或测试模式使用模拟数据
-    if (!uni.getStorageSync('token')) {
-      return this.checkCoachConflictMock(data)
-    }
     return await http.get('/courseSchedule/checkCoachConflict', data)
   },
 
-  // 模拟教练时间冲突检查
-  async checkCoachConflictMock(data = {}) {
-    // 模拟数据加载延迟
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    // 模拟冲突检查逻辑
-    const { coach_id, date, time_slot } = data
-
-    // 日期匹配 2025-07-14 或 2025-07-15
-    const conflictDates = ['2025-07-14', '2025-07-15']
-
-    // 特定教练和时间段的冲突场景
-    const hasConflict = (
-      // 张教练在特定日期的时间冲突
-      (coach_id == 1 && conflictDates.includes(date) && time_slot === '09:00-10:00') ||
-      // 李教练在特定日期的时间冲突
-      (coach_id == 2 && conflictDates.includes(date) && time_slot === '14:00-15:00') ||
-      // 随机生成一些冲突情况进行测试
-      (Math.random() < 0.2 && coach_id && date && time_slot)
-    )
-
-    return {
-      code: 1,
-      data: {
-        has_conflict: hasConflict,
-        conflict_schedules: hasConflict ? [
-          {
-            id: Math.floor(Math.random() * 1000),
-            course_name: hasConflict ? '冲突课程' : '',
-            time_slot: time_slot,
-            venue_name: '测试场地',
-          },
-        ] : [],
-      },
-      msg: 'SUCCESS',
-    }
-  },
   // 获取课程安排统计
   async getCourseScheduleStatistics(data = {}) {
-    try {
-      // 如果有student_id参数，使用学员个人统计接口
-      if (data.student_id) {
-        const response = await http.get('/course-schedule/statistics/' + data.student_id, {
-          start_date: data.start_date,
-          end_date: data.end_date,
-        })
-        return response
-      } else {
-        // 否则使用全局统计接口
-        return await http.get('/course-schedule/courseSchedule/statistics', data)
-      }
-    } catch (error) {
-      console.error('获取课程统计失败:', error)
-      // 返回默认统计数据
-      return {
-        code: 1,
-        data: {
-          total_courses: 0,
-          completed_courses: 0,
-          scheduled_courses: 0,
-          cancelled_courses: 0,
-        },
-        msg: '获取统计数据成功',
-      }
+    // 如果有student_id参数，使用学员个人统计接口
+    if (data.student_id) {
+      const response = await http.get('/course-schedule/statistics/' + data.student_id, {
+        start_date: data.start_date,
+        end_date: data.end_date,
+      })
+      return response
+    } else {
+      // 否则使用全局统计接口
+      return await http.get('/course-schedule/courseSchedule/statistics', data)
     }
   },
   // 获取筛选选项
@@ -1280,378 +756,54 @@ export default {
 
   // 移除学员（统一接口）
   async removeStudent(data = {}) {
-    try {
-      const response = await http.post('/course/removeStudentFromSchedule', data)
-      return response
-    } catch (error) {
-      console.error('移除学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '移除学员成功（模拟）',
-        data: {}
-      }
-    }
+    return await http.post('/course/removeStudentFromSchedule', data)
   },
 
   // 恢复学员（统一接口）
   async restoreStudent(data = {}) {
-    try {
-      const response = await http.post('/course/restoreStudent', data)
-      return response
-    } catch (error) {
-      console.error('恢复学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '恢复学员成功（模拟）',
-        data: {}
-      }
-    }
+    return await http.post('/course/restoreStudent', data)
   },
 
   //↓↓↓↓↓↓↓↓↓↓↓↓-----统一课程安排详情管理接口（与admin端保持一致）-----↓↓↓↓↓↓↓↓↓↓↓↓
 
   // 获取课程安排详情（新统一接口 - 对接admin端）
   async getCourseArrangementDetail(data = {}) {
-    try {
-      const response = await http.get('/course/scheduleDetail', data)
-      return response
-    } catch (error) {
-      console.error('获取课程安排详情失败:', error)
-      // 降级到 Mock 数据
-      return await this.getCourseArrangementDetailMock(data)
-    }
+    return await http.get('/course/scheduleDetail', data)
   },
 
   // 搜索学员（新统一接口 - 对接admin端）
   async searchStudentsForArrangement(data = {}) {
-    try {
-      const response = await http.get('/course/searchStudents', data)
-      return response
-    } catch (error) {
-      console.error('搜索学员失败:', error)
-      // 降级到 Mock 数据
-      return await this.searchStudentsForArrangementMock(data)
-    }
+    return await http.get('/course/searchStudents', data)
   },
 
   // 添加学员到课程安排（新统一接口 - 对接admin端）
   async addStudentToArrangement(data = {}) {
-    try {
-      const response = await http.post('/course/addStudentToSchedule', data)
-      return response
-    } catch (error) {
-      console.error('添加学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '添加学员成功（模拟）',
-        data: { id: Date.now() }
-      }
-    }
+    return await http.post('/course/addStudentToSchedule', data)
   },
 
   // 移除学员（新统一接口 - 对接admin端）
   async removeStudentFromArrangement(data = {}) {
-    try {
-      const response = await http.post('/course/removeStudentFromSchedule', data)
-      return response
-    } catch (error) {
-      console.error('移除学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '移除学员成功（模拟）',
-        data: {}
-      }
-    }
+    return await http.post('/course/removeStudentFromSchedule', data)
   },
 
   // 升级学员（新统一接口 - 对接admin端）
   async upgradeStudentInArrangement(data = {}) {
-    try {
-      const response = await http.post('/course/upgradeStudent', data)
-      return response
-    } catch (error) {
-      console.error('升级学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '升级学员成功（模拟）',
-        data: {}
-      }
-    }
+    return await http.post('/course/upgradeStudent', data)
   },
 
   // 更新学员状态（新统一接口 - 对接admin端）
   async updateStudentStatusInArrangement(data = {}) {
-    try {
-      const response = await http.post('/courseSchedule/updateStudentStatus', data)
-      return response
-    } catch (error) {
-      console.error('更新学员状态失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '更新状态成功（模拟）',
-        data: {}
-      }
-    }
+    return await http.post('/courseSchedule/updateStudentStatus', data)
   },
 
   // 删除学员所有未来课程安排
   async deleteStudentFutureSchedules(data = {}) {
-    try {
-      const response = await http.post('/courseSchedule/deleteStudentFutureSchedules', data)
-      return response
-    } catch (error) {
-      console.error('删除学员未来课程安排失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '删除成功（模拟）',
-        data: { deleted_count: 0 }
-      }
-    }
+    return await http.post('/courseSchedule/deleteStudentFutureSchedules', data)
   },
 
   // 恢复学员（新统一接口 - 对接admin端）
   async restoreStudentInArrangement(data = {}) {
-    try {
-      const response = await http.post('/course/restoreStudent', data)
-      return response
-    } catch (error) {
-      console.error('恢复学员失败:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '恢复学员成功（模拟）',
-        data: {}
-      }
-    }
-  },
-
-  //↓↓↓↓↓↓↓↓↓↓↓↓-----新统一课程安排Mock数据（与admin端保持一致）-----↓↓↓↓↓↓↓↓↓↓↓↓
-
-  // 模拟课程安排详情数据（对应admin端格式）
-  async getCourseArrangementDetailMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    const mockStudents = [
-      {
-        id: 1,
-        person_id: 1,
-        student_id: 1,
-        name: '张小明',
-        phone: '13800138001',
-        age: 8,
-        person_type: 'student',
-        person_type_text: '正式学员',
-        schedule_type: 1,
-        status: 0,
-        course_progress: {
-          used: 5,
-          total: 20,
-          percentage: 25
-        }
-      },
-      {
-        id: 2,
-        person_id: 2,
-        resources_id: 2,
-        name: '李小红',
-        phone: '13800138002',
-        age: 7,
-        person_type: 'customer_resource',
-        person_type_text: '潜在客户',
-        schedule_type: 2,
-        status: 0,
-        course_progress: {
-          used: 0,
-          total: 1,
-          percentage: 0
-        }
-      }
-    ]
-
-    return {
-      code: 1,
-      data: {
-        schedule_info: {
-          id: parseInt(data.schedule_id) || 1,
-          course_name: '少儿体适能课程',
-          course_date: '2025-08-16',
-          time_slot: '09:00-10:00',
-          venue_name: '训练馆A',
-          campus_name: '总部校区',
-          coach_name: '张教练',
-          status: 'upcoming',
-          status_text: '即将开始'
-        },
-        formal_students: mockStudents.filter(s => s.schedule_type === 1),
-        waiting_students: mockStudents.filter(s => s.schedule_type === 2),
-        formal_empty_seats: [2, 3, 4, 5],
-        waiting_empty_seats: [2, 3]
-      },
-      msg: 'SUCCESS'
-    }
-  },
-
-  // 模拟搜索学员数据（对应admin端格式）
-  async searchStudentsForArrangementMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    const mockResults = [
-      {
-        id: 101,
-        person_id: 101,
-        student_id: 101,
-        name: '王小华',
-        phone: '13800138101',
-        age: 9,
-        person_type: 'student',
-        person_type_text: '正式学员'
-      },
-      {
-        id: 102,
-        person_id: 102,
-        resources_id: 102,
-        name: '赵小美',
-        phone: '13800138102',
-        age: 6,
-        person_type: 'customer_resource',
-        person_type_text: '潜在客户'
-      }
-    ]
-
-    // 根据关键词过滤
-    let filteredResults = mockResults
-    if (data.keyword) {
-      filteredResults = mockResults.filter(student =>
-        student.name.includes(data.keyword) || student.phone.includes(data.keyword)
-      )
-    }
-
-    return {
-      code: 1,
-      data: {
-        list: filteredResults,
-        total: filteredResults.length
-      },
-      msg: 'SUCCESS'
-    }
-  },
-
-  //↓↓↓↓↓↓↓↓↓↓↓↓-----统一课程安排Mock数据-----↓↓↓↓↓↓↓↓↓↓↓↓
-
-  // 模拟课程安排详情数据
-  async getScheduleDetailMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    const mockStudents = [
-      {
-        id: 1,
-        person_id: 1,
-        student_id: 1,
-        name: '张小明',
-        phone: '13800138001',
-        age: 8,
-        person_type: 'student',
-        person_type_text: '正式学员',
-        schedule_type: 1,
-        status: 0,
-        course_progress: {
-          used: 5,
-          total: 20,
-          percentage: 25
-        }
-      },
-      {
-        id: 2,
-        person_id: 2,
-        resources_id: 2,
-        name: '李小红',
-        phone: '13800138002',
-        age: 7,
-        person_type: 'customer_resource',
-        person_type_text: '潜在客户',
-        schedule_type: 2,
-        status: 0,
-        course_progress: {
-          used: 0,
-          total: 1,
-          percentage: 0
-        }
-      }
-    ]
-
-    return {
-      code: 1,
-      data: {
-        schedule_info: {
-          id: parseInt(data.schedule_id) || 1,
-          course_name: '少儿体适能课程',
-          course_date: '2025-08-16',
-          time_slot: '09:00-10:00',
-          venue_name: '训练馆A',
-          campus_name: '总部校区',
-          coach_name: '张教练',
-          status: 'upcoming',
-          status_text: '即将开始'
-        },
-        formal_students: mockStudents.filter(s => s.schedule_type === 1),
-        waiting_students: mockStudents.filter(s => s.schedule_type === 2),
-        formal_empty_seats: [2, 3, 4, 5],
-        waiting_empty_seats: [2, 3]
-      },
-      msg: 'SUCCESS'
-    }
-  },
-
-  // 模拟搜索学员数据
-  async searchStudentsMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    const mockResults = [
-      {
-        id: 101,
-        person_id: 101,
-        student_id: 101,
-        name: '王小华',
-        phone: '13800138101',
-        age: 9,
-        person_type: 'student',
-        person_type_text: '正式学员'
-      },
-      {
-        id: 102,
-        person_id: 102,
-        resources_id: 102,
-        name: '赵小美',
-        phone: '13800138102',
-        age: 6,
-        person_type: 'customer_resource',
-        person_type_text: '潜在客户'
-      }
-    ]
-
-    // 根据关键词过滤
-    let filteredResults = mockResults
-    if (data.keyword) {
-      filteredResults = mockResults.filter(student =>
-        student.name.includes(data.keyword) || student.phone.includes(data.keyword)
-      )
-    }
-
-    return {
-      code: 1,
-      data: {
-        list: filteredResults,
-        total: filteredResults.length
-      },
-      msg: 'SUCCESS'
-    }
+    return await http.post('/course/restoreStudent', data)
   },
 
   //↓↓↓↓↓↓↓↓↓↓↓↓-----学员出勤管理相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
@@ -1768,12 +920,9 @@ export default {
     return await http.get('/student/mychild')
   },
 
-  // 获取学员基本信息
+  // 获取学员基本信息(员工端)
   async getStudentBasicInfo(data = {}) {
-    const params = {
-      student_id: data.student_id,
-    }
-    return await http.get('/student/student-info', params)
+    return await http.get(`/student/info/${data.student_id}`)
   },
 
   //↓↓↓↓↓↓↓↓↓↓↓↓-----员工端合同管理相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
@@ -1820,7 +969,7 @@ export default {
   async getContractByOrder(data = {}) {
     return await http.get('/contract/getByOrder', {
       order_id: data.order_id,
-      student_id: data.student_id
+      student_id: data.student_id,
     })
   },
 
@@ -1828,8 +977,7 @@ export default {
 
   // 获取知识文章列表
   async getKnowledgeList(data = {}) {
-    try {
-      const params = {
+    const params = {
         category: data.category,
         page: data.page || 1,
         limit: data.limit || 10,
@@ -1837,110 +985,35 @@ export default {
       }
       const response = await http.get(`/knowledge-test/list/${data.student_id}`, params)
       return response
-    } catch (error) {
-      console.error('获取知识文章列表错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getKnowledgeListMock(data)
-    }
   },
 
   // 获取知识分类列表
   async getKnowledgeCategories(data = {}) {
-    try {
-      const response = await http.get('/knowledge-test/categories')
-      return response
-    } catch (error) {
-      console.error('获取知识分类错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getKnowledgeCategoriesMock()
-    }
-  },
-
-  // 获取推荐文章
-  async getRecommendArticles(data = {}) {
-    try {
-      const params = {
-        limit: data.limit || 5,
-      }
-      const response = await http.get(`/knowledge-test/recommend/${data.student_id}`, params)
+    const response = await http.get('/knowledge-test/categories')
       return response
-    } catch (error) {
-      console.error('获取推荐文章错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getRecommendArticlesMock(data)
-    }
   },
 
   // 获取文章详情
   async getKnowledgeDetail(data = {}) {
-    try {
-      const params = {
+    const params = {
         student_id: data.student_id,
       }
       const response = await http.get(`/knowledge-test/detail/${data.id}`, params)
       return response
-    } catch (error) {
-      console.error('获取文章详情错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getKnowledgeDetailMock(data)
-    }
   },
 
   // 标记文章已读
   async markArticleRead(data = {}) {
-    try {
-      const response = await http.post('/knowledge-test/mark-read', {
+    const response = await http.post('/knowledge-test/mark-read', {
         article_id: data.article_id,
         student_id: data.student_id,
       })
       return response
-    } catch (error) {
-      console.error('标记文章已读错误:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '标记已读成功',
-        data: { message: '标记已读成功' },
-      }
-    }
-  },
-
-  // 收藏/取消收藏文章
-  async toggleArticleFavorite(data = {}) {
-    try {
-      const response = await http.post('/knowledge-test/toggle-favorite', {
-        article_id: data.article_id,
-        student_id: data.student_id,
-        action: data.action,
-      })
-      return response
-    } catch (error) {
-      console.error('收藏操作错误:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: data.action === 'add' ? '收藏成功' : '取消收藏成功',
-        data: { is_favorite: data.action === 'add' },
-      }
-    }
-  },
-
-  // 获取知识库统计
-  async getKnowledgeStats(data = {}) {
-    try {
-      const response = await http.get(`/knowledge-test/stats/${data.student_id}`)
-      return response
-    } catch (error) {
-      console.error('获取知识库统计错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getKnowledgeStatsMock(data)
-    }
   },
 
   // 搜索知识文章
   async searchKnowledgeArticles(data = {}) {
-    try {
-      const params = {
+    const params = {
         keyword: data.keyword,
         category: data.category,
         page: data.page || 1,
@@ -1948,225 +1021,20 @@ export default {
       }
       const response = await http.get(`/knowledge-test/search/${data.student_id}`, params)
       return response
-    } catch (error) {
-      console.error('搜索知识文章错误:', error)
-      // 返回模拟数据作为后备
-      return await this.searchKnowledgeArticlesMock(data)
-    }
   },
 
-  //↓↓↓↓↓↓↓↓↓↓↓↓-----知识库Mock数据-----↓↓↓↓↓↓↓↓↓↓↓↓
-
-  // 模拟知识文章列表数据
-  async getKnowledgeListMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    const mockArticles = [
-      {
-        id: 1,
-        title: '少儿体适能训练基础知识',
-        image: '/static/knowledge/article1.jpg',
-        content: '体适能是指人体所具备的有充足的精力从事日常工作而不易疲劳，同时有余力享受休闲活动的乐趣，能够应付突发状况的身体适应能力。',
-        table_type: '2',
-        category_name: '跳绳教案库',
-        type: 1,
-        url: '',
-        status: 1,
-        create_time: 1627804800,
-        update_time: 1627804800,
-        user_permission: '',
-        is_read: false,
-        is_favorite: false,
-      },
-      {
-        id: 2,
-        title: '儿童运动安全防护指南',
-        image: '/static/knowledge/article2.jpg',
-        content: '儿童参与运动时的安全防护措施是确保运动效果和避免运动伤害的重要保障。本文详细介绍了各种运动项目的安全注意事项。',
-        table_type: '7',
-        category_name: '少儿安防教案库',
-        type: 1,
-        url: '',
-        status: 1,
-        create_time: 1627804700,
-        update_time: 1627804700,
-        user_permission: '',
-        is_read: true,
-        is_favorite: true,
-      },
-      {
-        id: 3,
-        title: '篮球基础技巧训练方法',
-        image: '/static/knowledge/article3.jpg',
-        content: '篮球作为一项受欢迎的运动项目，需要掌握正确的基础技巧。本教案介绍了运球、投篮、传球等基本技能的训练方法。',
-        table_type: '4',
-        category_name: '篮球教案库',
-        type: 1,
-        url: '',
-        status: 1,
-        create_time: 1627804600,
-        update_time: 1627804600,
-        user_permission: '',
-        is_read: false,
-        is_favorite: false,
-      },
-    ]
-
-    // 根据分类筛选
-    let filteredArticles = mockArticles
-    if (data.category) {
-      filteredArticles = mockArticles.filter(article => article.table_type === data.category)
-    }
-
-    // 根据关键词搜索
-    if (data.keyword) {
-      filteredArticles = filteredArticles.filter(article =>
-        article.title.includes(data.keyword) || article.content.includes(data.keyword),
-      )
-    }
 
-    return {
-      code: 1,
-      data: {
-        list: filteredArticles,
-        current_page: data.page || 1,
-        last_page: 1,
-        total: filteredArticles.length,
-        per_page: data.limit || 10,
-      },
-      msg: '获取知识文章列表成功',
-    }
-  },
 
-  // 模拟知识分类数据
-  async getKnowledgeCategoriesMock() {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    return {
-      code: 1,
-      data: [
-        { value: '1', text: '课程教学大纲', icon: '📖', count: 8 },
-        { value: '2', text: '跳绳教案库', icon: '🏃', count: 15 },
-        { value: '3', text: '增高教案库', icon: '📏', count: 6 },
-        { value: '4', text: '篮球教案库', icon: '🏀', count: 12 },
-        { value: '5', text: '强化教案库', icon: '💪', count: 9 },
-        { value: '6', text: '空中忍者教案库', icon: '🥷', count: 7 },
-        { value: '7', text: '少儿安防教案库', icon: '🛡️', count: 5 },
-        { value: '8', text: '体能教案库', icon: '🏋️', count: 11 },
-      ],
-      msg: '获取知识分类成功',
-    }
-  },
 
-  // 模拟推荐文章数据
-  async getRecommendArticlesMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 400))
-
-    const mockRecommendArticles = [
-      {
-        id: 1,
-        title: '少儿体适能训练基础知识',
-        image: '/static/knowledge/article1.jpg',
-        summary: '体适能是指人体所具备的有充足的精力从事日常工作而不易疲劳，同时有余力享受休闲活动的乐趣...',
-        category_name: '跳绳教案库',
-        create_time: 1627804800,
-        read_count: 156,
-      },
-      {
-        id: 2,
-        title: '儿童运动安全防护指南',
-        image: '/static/knowledge/article2.jpg',
-        summary: '儿童参与运动时的安全防护措施是确保运动效果和避免运动伤害的重要保障...',
-        category_name: '少儿安防教案库',
-        create_time: 1627804700,
-        read_count: 89,
-      },
-    ]
-
-    return {
-      code: 1,
-      data: mockRecommendArticles.slice(0, data.limit || 5),
-      msg: '获取推荐文章成功',
-    }
-  },
 
-  // 模拟文章详情数据
-  async getKnowledgeDetailMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 600))
-
-    return {
-      code: 1,
-      data: {
-        id: data.id,
-        title: '少儿体适能训练基础知识',
-        image: '/static/knowledge/article1.jpg',
-        content: `
-                    <h3>什么是体适能？</h3>
-                    <p>体适能是指人体所具备的有充足的精力从事日常工作而不易疲劳，同时有余力享受休闲活动的乐趣，能够应付突发状况的身体适应能力。</p>
-                    
-                    <h3>少儿体适能的重要性</h3>
-                    <p>1. 促进身体发育：通过科学的运动训练，可以促进儿童骨骼、肌肉的健康发育。</p>
-                    <p>2. 提高运动能力：培养儿童的协调性、平衡性、柔韧性等基本运动能力。</p>
-                    <p>3. 增强体质：提高儿童的心肺功能，增强免疫力。</p>
-                    
-                    <h3>训练原则</h3>
-                    <p>• 循序渐进：从简单到复杂，从易到难</p>
-                    <p>• 因材施教：根据儿童的年龄特点和个体差异制定训练计划</p>
-                    <p>• 寓教于乐：将训练内容游戏化，提高儿童参与的积极性</p>
-                `,
-        table_type: '2',
-        category_name: '跳绳教案库',
-        type: 1,
-        url: '',
-        status: 1,
-        create_time: 1627804800,
-        update_time: 1627804800,
-        user_permission: '',
-        exam_papers_id: 0,
-        is_read: false,
-        is_favorite: false,
-      },
-      msg: '获取文章详情成功',
-    }
-  },
 
-  // 模拟知识库统计数据
-  async getKnowledgeStatsMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    return {
-      code: 1,
-      data: {
-        total_articles: 45,
-        favorites: 8,
-        read_articles: 23,
-        categories_count: {
-          '1': 8,
-          '2': 15,
-          '3': 6,
-          '4': 12,
-          '5': 9,
-          '6': 7,
-          '7': 5,
-          '8': 11,
-        },
-      },
-      msg: '获取知识库统计成功',
-    }
-  },
 
-  // 模拟搜索知识文章数据
-  async searchKnowledgeArticlesMock(data = {}) {
-    // 复用知识文章列表的Mock数据，根据关键词进行筛选
-    return await this.getKnowledgeListMock(data)
-  },
 
   //↓↓↓↓↓↓↓↓↓↓↓↓-----学员端消息管理相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
 
   // 获取学员消息列表
   async getStudentMessageList(data = {}) {
-    try {
-      const params = {
+    const params = {
         message_type: data.message_type,
         page: data.page || 1,
         limit: data.limit || 10,
@@ -2175,83 +1043,29 @@ export default {
       }
       const response = await http.get(`/message/list/${data.student_id}`, params)
       return response
-    } catch (error) {
-      console.error('获取学员消息列表错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getStudentMessageListMock(data)
-    }
   },
 
   // 获取消息详情
   async getStudentMessageDetail(data = {}) {
-    try {
-      const params = {
+    const params = {
         student_id: data.student_id,
       }
       const response = await http.get(`/message/detail/${data.message_id}`, params)
       return response
-    } catch (error) {
-      console.error('获取消息详情错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getStudentMessageDetailMock(data)
-    }
   },
 
   // 标记消息已读
   async markStudentMessageRead(data = {}) {
-    try {
-      const response = await http.post('/message/mark-read', {
+    const response = await http.post('/message/mark-read', {
         message_id: data.message_id,
         student_id: data.student_id,
       })
       return response
-    } catch (error) {
-      console.error('标记消息已读错误:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '标记已读成功',
-        data: { message: '标记已读成功' },
-      }
-    }
-  },
-
-  // 批量标记消息已读
-  async markStudentMessageBatchRead(data = {}) {
-    try {
-      const response = await http.post('/message/mark-batch-read', {
-        student_id: data.student_id,
-        message_ids: data.message_ids,
-        message_type: data.message_type,
-      })
-      return response
-    } catch (error) {
-      console.error('批量标记已读错误:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '批量标记成功',
-        data: { message: '批量标记成功', updated_count: data.message_ids?.length || 0 },
-      }
-    }
-  },
-
-  // 获取学员消息统计
-  async getStudentMessageStats(data = {}) {
-    try {
-      const response = await http.get(`/message/stats/${data.student_id}`)
-      return response
-    } catch (error) {
-      console.error('获取消息统计错误:', error)
-      // 返回模拟数据作为后备
-      return await this.getStudentMessageStatsMock(data)
-    }
   },
 
   // 获取对话中的所有消息
   async getConversationMessages(data = {}) {
-    try {
-      const params = {
+    const params = {
         student_id: data.student_id,
         from_type: data.from_type,
         from_id: data.from_id,
@@ -2260,245 +1074,10 @@ export default {
       }
       const response = await http.get('/message/conversation', params)
       return response
-    } catch (error) {
-      console.error('获取对话消息错误:', error)
-      // 返回空对话作为后备
-      return {
-        code: 1,
-        data: {
-          list: [],
-          current_page: 1,
-          last_page: 1,
-          total: 0,
-          per_page: 20,
-          has_more: false,
-        },
-        msg: 'SUCCESS',
-      }
-    }
   },
 
-  // 学员回复消息
-  async replyMessage(data = {}) {
-    try {
-      const response = await http.post('/message/reply', {
-        student_id: data.student_id,
-        to_type: data.to_type,
-        to_id: data.to_id,
-        content: data.content,
-        message_type: data.message_type || 'text',
-        title: data.title || '',
-      })
-      return response
-    } catch (error) {
-      console.error('回复消息错误:', error)
-      // 返回模拟成功响应
-      return {
-        code: 1,
-        msg: '回复发送成功',
-        data: {
-          message: '回复发送成功',
-          data: {
-            id: Date.now(),
-            content: data.content,
-            created_at: new Date().toISOString().replace('T', ' ').slice(0, 19),
-            create_time: Math.floor(Date.now() / 1000),
-            from_name: '我',
-            is_sent_by_student: true,
-          },
-        },
-      }
-    }
-  },
 
-  // 搜索学员消息
-  async searchStudentMessages(data = {}) {
-    try {
-      const params = {
-        keyword: data.keyword,
-        message_type: data.message_type,
-        page: data.page || 1,
-        limit: data.limit || 10,
-      }
-      const response = await http.get(`/message/search/${data.student_id}`, params)
-      return response
-    } catch (error) {
-      console.error('搜索消息错误:', error)
-      // 返回模拟数据作为后备
-      return await this.searchStudentMessagesMock(data)
-    }
-  },
-
-  //↓↓↓↓↓↓↓↓↓↓↓↓-----学员端消息管理Mock数据-----↓↓↓↓↓↓↓↓↓↓↓↓
-
-  // 模拟学员消息列表数据
-  async getStudentMessageListMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 500))
-
-    const mockMessages = [
-      {
-        id: 1,
-        from_type: 'system',
-        from_id: 0,
-        message_type: 'system',
-        title: '欢迎使用学员端',
-        content: '欢迎使用学员端，您可以在这里查看课程安排、作业任务等信息。',
-        business_id: null,
-        business_type: '',
-        is_read: 0,
-        read_time: null,
-        create_time: Math.floor(Date.now() / 1000) - 3600,
-        type_text: '系统消息',
-        from_name: '系统',
-        summary: '欢迎使用学员端，您可以在这里查看课程安排、作业任务等信息。',
-      },
-      {
-        id: 2,
-        from_type: 'personnel',
-        from_id: 1,
-        message_type: 'homework',
-        title: '新作业任务',
-        content: '您有一项新的作业任务：完成本周的体能训练计划，请按时提交。',
-        business_id: 1,
-        business_type: 'homework',
-        is_read: 0,
-        read_time: null,
-        create_time: Math.floor(Date.now() / 1000) - 1800,
-        type_text: '作业任务',
-        from_name: '教务老师',
-        summary: '您有一项新的作业任务：完成本周的体能训练计划，请按时提交。',
-      },
-      {
-        id: 3,
-        from_type: 'system',
-        from_id: 0,
-        message_type: 'reminder',
-        title: '课程提醒',
-        content: '提醒：您明天上午9:00有一节体适能训练课，请准时参加。',
-        business_id: 1,
-        business_type: 'course',
-        is_read: 1,
-        read_time: new Date(Date.now() - 900 * 1000).toISOString(),
-        create_time: Math.floor(Date.now() / 1000) - 7200,
-        type_text: '课程提醒',
-        from_name: '系统',
-        summary: '提醒：您明天上午9:00有一节体适能训练课，请准时参加。',
-      },
-      {
-        id: 4,
-        from_type: 'personnel',
-        from_id: 2,
-        message_type: 'notification',
-        title: '重要通知',
-        content: '本周六将举行家长开放日活动，欢迎家长朋友们前来参观指导。',
-        business_id: null,
-        business_type: '',
-        is_read: 0,
-        read_time: null,
-        create_time: Math.floor(Date.now() / 1000) - 86400,
-        type_text: '通知公告',
-        from_name: '教务老师',
-        summary: '本周六将举行家长开放日活动，欢迎家长朋友们前来参观指导。',
-      },
-      {
-        id: 5,
-        from_type: 'system',
-        from_id: 0,
-        message_type: 'feedback',
-        title: '课程评价邀请',
-        content: '您上次参加的体适能训练课已结束，请对本次课程进行评价。',
-        business_id: 2,
-        business_type: 'course',
-        is_read: 1,
-        read_time: new Date(Date.now() - 3600 * 1000).toISOString(),
-        create_time: Math.floor(Date.now() / 1000) - 172800,
-        type_text: '反馈评价',
-        from_name: '系统',
-        summary: '您上次参加的体适能训练课已结束，请对本次课程进行评价。',
-      },
-    ]
-
-    // 根据消息类型筛选
-    let filteredMessages = mockMessages
-    if (data.message_type && data.message_type !== 'all') {
-      filteredMessages = mockMessages.filter(msg => msg.message_type === data.message_type)
-    }
 
-    // 根据已读状态筛选
-    if (data.is_read !== '' && data.is_read !== undefined) {
-      filteredMessages = filteredMessages.filter(msg => msg.is_read == data.is_read)
-    }
 
-    // 根据关键词搜索
-    if (data.keyword) {
-      filteredMessages = filteredMessages.filter(msg =>
-        msg.title.includes(data.keyword) || msg.content.includes(data.keyword),
-      )
-    }
 
-    return {
-      code: 1,
-      data: {
-        list: filteredMessages,
-        current_page: data.page || 1,
-        last_page: 1,
-        total: filteredMessages.length,
-        per_page: data.limit || 10,
-        has_more: false,
-      },
-      msg: '获取消息列表成功',
-    }
-  },
-
-  // 模拟消息详情数据
-  async getStudentMessageDetailMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    return {
-      code: 1,
-      data: {
-        id: data.message_id,
-        from_type: 'system',
-        from_id: 0,
-        message_type: 'system',
-        title: '欢迎使用学员端',
-        content: '欢迎使用学员端，您可以在这里查看课程安排、作业任务等信息。如有任何问题，请随时联系我们的客服团队。',
-        business_id: null,
-        business_type: '',
-        is_read: 0,
-        read_time: null,
-        create_time: Math.floor(Date.now() / 1000) - 3600,
-        type_text: '系统消息',
-        from_name: '系统',
-      },
-      msg: '获取消息详情成功',
-    }
-  },
-
-  // 模拟消息统计数据
-  async getStudentMessageStatsMock(data = {}) {
-    await new Promise(resolve => setTimeout(resolve, 300))
-
-    return {
-      code: 1,
-      data: {
-        total_messages: 12,
-        unread_messages: 5,
-        read_messages: 7,
-        type_counts: {
-          'system': 3,
-          'notification': 2,
-          'homework': 3,
-          'feedback': 2,
-          'reminder': 2,
-        },
-      },
-      msg: '获取消息统计成功',
-    }
-  },
-  // 模拟搜索消息数据
-  async searchStudentMessagesMock(data = {}) {
-    // 复用消息列表的Mock数据，根据关键词进行筛选
-    return await this.getStudentMessageListMock(data)
-  },
 }
diff --git a/uniapp/components/client-info-card/client-info-card.vue b/uniapp/components/client-info-card/client-info-card.vue
index 5c5fe555..cf0356b1 100755
--- a/uniapp/components/client-info-card/client-info-card.vue
+++ b/uniapp/components/client-info-card/client-info-card.vue
@@ -22,7 +22,7 @@
           </view>
         </view>
       </view>
-      
+
       <!-- 客户详细信息 -->
       <view class="customer-details">
         <view class="detail-row">
@@ -35,19 +35,19 @@
         </view>
         <view class="detail-row">
           <text class="info-label">分配顾问：</text>
-          <text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.consultant_name', '未知顾问') }}</text>
+          <text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.consultant_name', '---') }}</text>
         </view>
         <view class="detail-row">
           <text class="info-label">性别：</text>
           <text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.gender_name', '未知性别') }}</text>
         </view>
       </view>
-      
+
       <!-- 操作按钮区域 -->
       <view class="action-panel" v-if="actionsExpanded && actions && actions.length > 0">
-        <view 
-          class="action-btn" 
-          v-for="action in actions" 
+        <view
+          class="action-btn"
+          v-for="action in actions"
           :key="action.key"
           @click="handleAction(action)"
         >
@@ -82,11 +82,11 @@ export default {
       this.$util.makePhoneCall(phoneNumber)
       this.$emit('call', phoneNumber)
     },
-    
+
     toggleActions() {
       this.actionsExpanded = !this.actionsExpanded
     },
-    
+
     handleAction(action) {
       this.$emit('action', { action, client: this.clientInfo })
     },
@@ -114,7 +114,7 @@ export default {
     display: flex;
     align-items: center;
     margin-bottom: 30rpx;
-    
+
     .customer-avatar {
       width: 80rpx;
       height: 80rpx;
@@ -124,24 +124,24 @@ export default {
       align-items: center;
       justify-content: center;
       margin-right: 20rpx;
-      
+
       text {
         color: white;
         font-size: 32rpx;
         font-weight: bold;
       }
     }
-    
+
     .customer-info {
       flex: 1;
-      
+
       .customer-name {
         color: white;
         font-size: 32rpx;
         font-weight: bold;
         margin-bottom: 8rpx;
       }
-      
+
       .customer-meta {
         .customer-phone {
           color: #999;
@@ -149,12 +149,12 @@ export default {
         }
       }
     }
-    
+
     .contact-actions {
       display: flex;
       align-items: center;
       gap: 15rpx;
-      
+
       .contact-btn {
         width: 60rpx;
         height: 60rpx;
@@ -163,15 +163,15 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        
+
         .contact-icon {
           font-size: 28rpx;
         }
       }
-      
+
       .action-toggle {
         padding: 10rpx;
-        
+
         .toggle-icon {
           color: #29d3b4;
           font-size: 24rpx;
@@ -186,13 +186,13 @@ export default {
     display: flex;
     align-items: center;
     margin-bottom: 20rpx;
-    
+
     .info-label {
       color: #999;
       font-size: 24rpx;
       width: 150rpx;
     }
-    
+
     .info-value {
       color: white;
       font-size: 24rpx;
@@ -208,12 +208,12 @@ export default {
   display: flex;
   flex-wrap: wrap;
   gap: 15rpx;
-  
+
   .action-btn {
     padding: 15rpx 25rpx;
     background-color: #29d3b4;
     border-radius: 25rpx;
-    
+
     .action-text {
       color: white;
       font-size: 22rpx;
@@ -221,4 +221,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/uniapp/components/fitness-record-list-popup/index.vue b/uniapp/components/fitness-record-list-popup/index.vue
new file mode 100755
index 00000000..4286fc84
--- /dev/null
+++ b/uniapp/components/fitness-record-list-popup/index.vue
@@ -0,0 +1,225 @@
+<!-- 体测记录列表弹窗组件 -->
+<template>
+	<view class="fitness-record-list-popup" v-if="visible" @click.stop="handleMaskClick">
+		<view class="popup-container" @click.stop>
+			<!-- 标题栏 -->
+			<view class="popup-header">
+				<text class="popup-title">体测记录</text>
+				<view class="close-btn" @click.stop="handleClose">
+					<text>✕</text>
+				</view>
+			</view>
+
+			<!-- 体测记录列表 -->
+			<view class="fitness-records-container">
+				<!-- 空状态提示 -->
+				<view v-if="!records || records.length === 0" class="empty-state">
+					<view class="empty-icon">📊</view>
+					<view class="empty-text">暂无体测记录</view>
+					<view class="empty-tip">点击下方"新增"按钮添加体测记录</view>
+				</view>
+
+				<!-- 体测记录列表 -->
+				<FitnessRecordCard
+					v-for="record in records"
+					:key="record.id"
+					:record="record"
+					@edit="handleEdit"
+				/>
+			</view>
+
+			<!-- 底部操作按钮 -->
+			<view class="popup-footer">
+				<view class="footer-btn cancel-btn" @click.stop="handleClose">关闭</view>
+				<view class="footer-btn confirm-btn" @click.stop="handleAddNew">新增</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import FitnessRecordCard from '@/components/fitness-record-card/fitness-record-card.vue'
+
+export default {
+	name: 'FitnessRecordListPopup',
+	components: {
+		FitnessRecordCard
+	},
+	props: {
+		// 是否显示弹窗
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		// 体测记录列表
+		records: {
+			type: Array,
+			default: () => []
+		}
+	},
+	methods: {
+		// 关闭弹窗
+		handleClose() {
+			this.$emit('close')
+		},
+
+		// 点击遮罩关闭
+		handleMaskClick() {
+			this.handleClose()
+		},
+
+		// 新增体测记录
+		handleAddNew() {
+			this.$emit('add')
+		},
+
+		// 编辑体测记录
+		handleEdit(record) {
+			this.$emit('edit', record)
+		}
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.fitness-record-list-popup {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: flex-end;
+	justify-content: center;
+	z-index: 999; /* 比FitnessRecordPopup的z-index低 */
+}
+
+.popup-container {
+	width: 100%;
+	max-height: 80vh;
+	background: #FFFFFF;
+	border-radius: 32rpx 32rpx 0 0;
+	display: flex;
+	flex-direction: column;
+	animation: slideUp 0.3s ease-out;
+}
+
+@keyframes slideUp {
+	from {
+		transform: translateY(100%);
+	}
+	to {
+		transform: translateY(0);
+	}
+}
+
+.popup-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 32rpx 32rpx 24rpx;
+	border-bottom: 1rpx solid #F0F0F0;
+}
+
+.popup-title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333333;
+}
+
+.close-btn {
+	width: 56rpx;
+	height: 56rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #F5F5F5;
+	border-radius: 50%;
+	
+	text {
+		font-size: 40rpx;
+		color: #999999;
+		line-height: 1;
+	}
+}
+
+.fitness-records-container {
+	flex: 1;
+	overflow-y: auto;
+	padding: 24rpx 32rpx;
+	max-height: 50vh;
+}
+
+/* 滚动条样式 */
+.fitness-records-container::-webkit-scrollbar {
+	width: 6rpx;
+}
+
+.fitness-records-container::-webkit-scrollbar-track {
+	background: transparent;
+}
+
+.fitness-records-container::-webkit-scrollbar-thumb {
+	background: #29D3B4;
+	border-radius: 3rpx;
+}
+
+.fitness-records-container::-webkit-scrollbar-thumb:hover {
+	background: #24B89E;
+}
+
+.empty-state {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80rpx 0;
+}
+
+.empty-icon {
+	font-size: 120rpx;
+	line-height: 1;
+	margin-bottom: 24rpx;
+}
+
+.empty-text {
+	font-size: 28rpx;
+	color: #999999;
+	margin-bottom: 16rpx;
+}
+
+.empty-tip {
+	font-size: 24rpx;
+	color: #CCCCCC;
+}
+
+.popup-footer {
+	display: flex;
+	padding: 24rpx 32rpx;
+	padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+	border-top: 1rpx solid #F0F0F0;
+	gap: 24rpx;
+}
+
+.footer-btn {
+	flex: 1;
+	height: 88rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 16rpx;
+	font-size: 32rpx;
+	font-weight: 500;
+}
+
+.cancel-btn {
+	background: #F5F5F5;
+	color: #666666;
+}
+
+.confirm-btn {
+	background: linear-gradient(135deg, #29D3B4 0%, #24B89E 100%);
+	color: #FFFFFF;
+}
+</style>
diff --git a/uniapp/components/fitness-record-popup/fitness-record-popup.less b/uniapp/components/fitness-record-popup/fitness-record-popup.less
index 8b3e97f7..f2f6100a 100755
--- a/uniapp/components/fitness-record-popup/fitness-record-popup.less
+++ b/uniapp/components/fitness-record-popup/fitness-record-popup.less
@@ -1,4 +1,19 @@
 // 体测记录弹窗样式
+
+// 弹窗容器 - 使用view类型
+.fitness-record-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000; // 高于体测记录列表弹窗(999)
+}
+
 .popup-container {
   width: 90vw;
   max-width: 600rpx;
@@ -6,6 +21,18 @@
   border-radius: 20rpx;
   overflow: hidden;
   box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.2);
+  animation: popupFadeIn 0.3s ease-out;
+}
+
+@keyframes popupFadeIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
 }
 
 .popup-header {
diff --git a/uniapp/components/fitness-record-popup/fitness-record-popup.vue b/uniapp/components/fitness-record-popup/fitness-record-popup.vue
index d76a9db0..c9b2224d 100755
--- a/uniapp/components/fitness-record-popup/fitness-record-popup.vue
+++ b/uniapp/components/fitness-record-popup/fitness-record-popup.vue
@@ -1,6 +1,7 @@
 <template>
-  <uni-popup ref="popup" type="center">
-    <view class="popup-container">
+  <!-- 体测记录编辑弹窗 - 使用view类型 -->
+  <view v-if="isVisible" class="fitness-record-popup" @click.stop="handleMaskClick">
+    <view class="popup-container" @click.stop>
       <view class="popup-header">
         <view class="popup-title">{{ isEditing ? '编辑体测记录' : '新增体测记录' }}</view>
         <view class="popup-close" @click="close">✕</view>
@@ -58,7 +59,7 @@
         <view class="popup-btn confirm-btn" @click="confirm">确认</view>
       </view>
     </view>
-  </uni-popup>
+  </view>
 </template>
 
 <script>
@@ -94,7 +95,6 @@ export default {
       this.resetData()
       this.recordData.test_date = this.getCurrentDate()
       this.isVisible = true
-      this.$refs.popup.open()
     },
 
     // 打开编辑弹窗
@@ -108,16 +108,19 @@ export default {
         pdf_files: [...(record.pdf_files || [])]
       }
       this.isVisible = true
-      this.$refs.popup.open()
     },
 
     // 关闭弹窗
     close() {
       this.isVisible = false
-      this.$refs.popup.close()
       this.resetData()
       this.$emit('close')
     },
+    
+    // 点击遮罩关闭
+    handleMaskClick() {
+      this.close()
+    },
 
     // 重置数据
     resetData() {
@@ -371,27 +374,24 @@ export default {
       return false
     },
 
-    // 上传PDF文件到服务器（使用通用文档上传接口）
+    // 上传PDF文件到服务器（使用体测专用PDF上传接口）
     async uploadPdfFile(file) {
       const { Api_url } = require('@/common/config.js')
       const token = uni.getStorageSync('token') || ''
-      
+
       console.log('开始上传PDF文件:', {
         fileName: file.name,
         fileSize: file.size,
         filePath: file.path,
-        uploadUrl: Api_url + '/memberUploadDocument',
+        uploadUrl: Api_url + '/xy/physicalTest/uploadPdf',
         hasToken: !!token
       })
-      
+
       return new Promise((resolve, reject) => {
         uni.uploadFile({
-          url: Api_url + '/memberUploadDocument', // 使用学生端文档上传接口
+          url: Api_url + '/xy/physicalTest/uploadPdf', // 使用体测专用PDF上传接口
           filePath: file.path,
           name: 'file',
-          formData: {
-            'type': 'document' // 指定为文档类型
-          },
           header: {
             'token': token
             // 不设置 Content-Type，让uni-app自动设置为 multipart/form-data
@@ -415,27 +415,22 @@ export default {
 
             if (response.code === 1) {
               console.log('PDF上传成功:', response.data)
-              // 根据文档上传接口的标准响应格式处理
-              let fileUrl = ''
-              if (response.data) {
-                fileUrl = response.data.url || response.data.file_path || response.data
-              }
-              
+              // 根据体测PDF上传接口的响应格式处理
               resolve({
                 code: 1,
                 msg: response.msg || '上传成功',
                 data: {
-                  url: fileUrl,
-                  name: response.data.name || response.data.original_name || file.name,
-                  ext: response.data.ext || 'pdf',
-                  size: file.size
+                  url: response.data.file_url, // 后端返回的 file_url 字段
+                  name: response.data.file_name || file.name,
+                  ext: 'pdf',
+                  size: response.data.file_size || file.size
                 }
               })
             } else if (response.code === 401) {
               console.error('PDF上传认证失败:', response)
-              uni.showToast({ 
-                title: response.msg || '登录已过期', 
-                icon: 'none' 
+              uni.showToast({
+                title: response.msg || '登录已过期',
+                icon: 'none'
               })
               setTimeout(() => {
                 uni.navigateTo({ url: '/pages/student/login/login' })
@@ -443,14 +438,9 @@ export default {
               reject(response)
             } else {
               console.error('PDF上传失败响应:', response)
-              // 提供更详细的错误信息
-              let errorMsg = response.msg || 'PDF上传失败'
-              if (response.code === 0 && response.msg.includes('路由未定义')) {
-                errorMsg = '文件上传接口暂不可用，请联系技术支持'
-              }
               reject({
                 code: response.code || 0,
-                msg: errorMsg
+                msg: response.msg || 'PDF上传失败'
               })
             }
           },
diff --git a/uniapp/components/order-form-popup/index.vue b/uniapp/components/order-form-popup/index.vue
index a3e24f0f..46224b03 100755
--- a/uniapp/components/order-form-popup/index.vue
+++ b/uniapp/components/order-form-popup/index.vue
@@ -14,7 +14,17 @@
             <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="showCampusPicker">
+            <text class="picker-text" :class="{ 'placeholder': !formData.campus_id }">
+              {{ selectedCampus && selectedCampus.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="showCoursePicker">
@@ -47,7 +57,7 @@
         
         <view class="form-item">
           <text class="label">订单金额 <text class="required">*</text></text>
-          <input 
+          <input
             class="form-input readonly"
             type="digit"
             v-model="formData.order_amount"
@@ -56,7 +66,35 @@
             disabled
           />
         </view>
-        
+
+        <view class="form-item" v-if="needPaymentVoucher">
+          <text class="label">支付凭证 <text class="required">*</text></text>
+          <view class="voucher-upload">
+            <view class="voucher-grid">
+              <!-- 已上传的图片 -->
+              <view
+                class="voucher-item"
+                v-for="(img, index) in voucherImages"
+                :key="index"
+              >
+                <image :src="img" class="voucher-image" mode="aspectFill"></image>
+                <view class="voucher-delete" @click="deleteVoucherImage(index)">×</view>
+              </view>
+
+              <!-- 上传按钮 -->
+              <view
+                class="voucher-item voucher-upload-btn"
+                v-if="voucherImages.length < maxVoucherImages"
+                @click="chooseVoucherImage"
+              >
+                <text class="upload-icon">+</text>
+                <text class="upload-text">上传凭证</text>
+              </view>
+            </view>
+            <text class="voucher-tip">最多上传{{ maxVoucherImages }}张图片</text>
+          </view>
+        </view>
+
         <view class="form-item" v-if="giftList.length > 0">
           <text class="label">选择赠品</text>
           <view class="picker-wrapper" @click="showGiftPicker">
@@ -77,9 +115,19 @@
           </view>
         </view>
         
+        <view class="form-item">
+          <text class="label">班级选择</text>
+          <view class="picker-wrapper" @click="showClassPicker">
+            <text class="picker-text" :class="{ 'placeholder': !formData.class_id }">
+              {{ selectedClass && selectedClass.label || '请选择班级（可选）' }}
+            </text>
+            <text class="picker-arrow">▼</text>
+          </view>
+        </view>
+
         <view class="form-item">
           <text class="label">备注</text>
-          <textarea 
+          <textarea
             class="form-textarea"
             v-model="formData.remark"
             placeholder="请输入备注信息"
@@ -117,6 +165,7 @@
 <script>
 import apiRoute from '@/api/apiRoute.js'
 import dictUtilSimple from '@/common/dictUtilSimple.js'
+import { uploadFile } from '@/common/util.js'
 
 export default {
   name: 'OrderFormPopup',
@@ -138,8 +187,10 @@ export default {
     return {
       formData: {
         student_id: '',
+        campus_id: '',   // 校区ID,必填字段
         course_id: '',
         payment_type: '',
+        payment_voucher: '',  // 支付凭证,多张图片URL用逗号分隔
         order_type: '',
         order_amount: '',
         total_hours: '',
@@ -147,7 +198,7 @@ export default {
         gift_id: '',     // 赠品ID
         gift_type: '',   // 赠品核销类型：1-减现, 2-赠课
         remark: '',
-        class_id: '1' // 临时设置默认班级ID，后续需要添加班级选择功能
+        class_id: '' // 班级ID，可选字段
       },
       
       // 选择器相关
@@ -158,24 +209,35 @@ export default {
       selectedIndex: 0,
       
       // 为每个选择器维护独立的索引状态
+      campusSelectedIndex: -1,
       courseSelectedIndex: -1,
       paymentSelectedIndex: -1,
       orderTypeSelectedIndex: -1,
       giftSelectedIndex: -1,
       giftTypeSelectedIndex: -1,
-      
+      classSelectedIndex: -1,
+
       // 数据选项
+      campusList: [],   // 校区列表
       courseList: [],
       paymentTypes: [], // 从字典接口获取
       orderTypes: [],   // 从字典接口获取
       giftList: [],     // 可用赠品列表
+      classList: [],    // 班级列表
       giftTypes: [      // 赠品核销类型
         { value: '1', label: '减现' },
         { value: '2', label: '赠课' }
-      ]
+      ],
+
+      // 支付凭证相关
+      voucherImages: [], // 支付凭证图片数组,最多9张
+      maxVoucherImages: 9 // 最多上传9张图片
     }
   },
   computed: {
+    selectedCampus() {
+      return this.campusList.find(item => item.value == this.formData.campus_id)
+    },
     selectedCourse() {
       return this.courseList.find(item => item.id == this.formData.course_id)
     },
@@ -190,6 +252,15 @@ export default {
     },
     selectedGiftType() {
       return this.giftTypes.find(item => item.value === this.formData.gift_type)
+    },
+    selectedClass() {
+      return this.classList.find(item => item.value == this.formData.class_id)
+    },
+    // 是否需要上传支付凭证
+    needPaymentVoucher() {
+      // 扫码支付、订阅支付、微信在线代付不需要上传凭证
+      const noVoucherTypes = ['scan_code', 'subscription', 'wxpay_online']
+      return this.formData.payment_type && !noVoucherTypes.includes(this.formData.payment_type)
     }
   },
   watch: {
@@ -198,15 +269,23 @@ export default {
       if (newVal) {
         console.log('开始初始化表单和加载数据')
         this.initForm()
+        this.loadCampusList() // 加载校区列表
         this.loadCourseList()
         this.loadDictionaries() // 加载字典数据
         this.loadGiftList() // 加载可用赠品列表
+        this.loadClassList() // 加载班级列表
       }
     },
     studentInfo: {
       handler(newVal) {
         if (newVal && newVal.id) {
           this.formData.student_id = newVal.id
+          // 同步校区ID
+          if (newVal.campus_id) {
+            this.formData.campus_id = newVal.campus_id
+            // 当学生信息变化时，重新加载班级列表
+            this.loadClassList()
+          }
         }
       },
       immediate: true,
@@ -218,17 +297,21 @@ export default {
     // 如果组件挂载时 visible 为 true，主动加载数据
     if (this.visible) {
       console.log('组件挂载时 visible 为 true，开始加载数据')
+      this.loadCampusList()
       this.loadCourseList()
       this.loadDictionaries()
       this.loadGiftList()
+      this.loadClassList()
     }
   },
   methods: {
     initForm() {
       this.formData = {
         student_id: this.studentInfo && this.studentInfo.id || '',
+        campus_id: this.studentInfo && this.studentInfo.campus_id || '',   // 校区ID,必填字段,从studentInfo回显
         course_id: '',
         payment_type: '',
+        payment_voucher: '',  // 支付凭证,多张图片URL用逗号分隔
         order_type: '',
         order_amount: '',
         total_hours: '',
@@ -236,17 +319,51 @@ export default {
         gift_id: '',
         gift_type: '',
         remark: '',
-        class_id: '1' // 临时设置默认班级ID
+        class_id: '' // 班级ID，可选字段
       }
-      
+
       // 重置选择器索引状态
+      this.campusSelectedIndex = -1
       this.courseSelectedIndex = -1
       this.paymentSelectedIndex = -1
       this.orderTypeSelectedIndex = -1
       this.giftSelectedIndex = -1
       this.giftTypeSelectedIndex = -1
+      this.classSelectedIndex = -1
+
+      // 重置支付凭证
+      this.voucherImages = []
     },
-    
+
+    /**
+     * 加载校区列表
+     */
+    async loadCampusList() {
+      console.log('开始加载校区列表')
+      try {
+        const res = await apiRoute.common_getCampusesList({})
+        console.log('校区列表API响应:', res)
+
+        if (res.code === 1) {
+          // 过滤状态为1的校区,并格式化数据结构
+          this.campusList = (res.data || [])
+            .filter(campus => campus.campus_status === 1)
+            .map(campus => ({
+              value: campus.id,
+              label: campus.campus_name,
+              ...campus
+            }))
+          console.log('校区列表加载成功:', this.campusList)
+        } else {
+          console.error('获取校区列表失败:', res.msg)
+          this.campusList = []
+        }
+      } catch (error) {
+        console.error('获取校区列表异常:', error)
+        this.campusList = []
+      }
+    },
+
     async loadCourseList() {
       console.log('loadCourseList 方法被调用')
       try {
@@ -300,7 +417,9 @@ export default {
             { value: 'cash', label: '现金支付' },
             { value: 'scan_code', label: '扫码支付' },
             { value: 'subscription', label: '订阅支付' },
-            { value: 'wxpay_online', label: '微信在线代付' }
+            { value: 'wxpay_online', label: '微信在线代付' },
+            { value: 'client_wxpay', label: '客户自行付款' },
+            { value: 'deposit', label: '定金' }
           ]
         }
         
@@ -317,25 +436,31 @@ export default {
           this.orderTypes = [
             { value: '1', label: '新订单' },
             { value: '2', label: '续费订单' },
-            { value: '3', label: '内部员工订单' }
+            { value: '3', label: '内部员工订单' },
+            { value: '4', label: '转校' },
+            { value: '5', label: '客户内转课订单' }
           ]
         }
         
       } catch (error) {
         console.error('加载字典数据失败:', error)
-        
+
         // 使用备用数据
         this.paymentTypes = [
           { value: 'cash', label: '现金支付' },
           { value: 'scan_code', label: '扫码支付' },
           { value: 'subscription', label: '订阅支付' },
-          { value: 'wxpay_online', label: '微信在线代付' }
+          { value: 'wxpay_online', label: '微信在线代付' },
+          { value: 'client_wxpay', label: '客户自行付款' },
+          { value: 'deposit', label: '定金' }
         ]
         
         this.orderTypes = [
           { value: '1', label: '新订单' },
           { value: '2', label: '续费订单' },
-          { value: '3', label: '内部员工订单' }
+          { value: '3', label: '内部员工订单' },
+          { value: '4', label: '转校' },
+          { value: '5', label: '客户内转课订单' }
         ]
       }
     },
@@ -380,7 +505,62 @@ export default {
         this.giftList = []
       }
     },
-    
+
+    /**
+     * 加载班级列表
+     * @param {Number} campusId - 校区ID，如果不传则使用formData.campus_id
+     */
+    async loadClassList(campusId) {
+      const targetCampusId = campusId || this.formData.campus_id
+      console.log('开始加载班级列表，校区ID:', targetCampusId)
+      try {
+        if (!targetCampusId) {
+          console.warn('缺少校区ID，无法加载班级列表')
+          this.classList = []
+          return
+        }
+
+        const res = await apiRoute.getClassListForSchedule({
+          campus_id: targetCampusId
+        })
+        console.log('班级列表API响应:', res)
+
+        if (res.code === 1) {
+          // 格式化班级数据结构，使用 id 和 class_name
+          this.classList = (res.data || []).map(cls => ({
+            value: cls.id,
+            label: cls.class_name || `班级${cls.id}`,
+            ...cls
+          }))
+          console.log('班级列表加载成功:', this.classList)
+        } else {
+          console.error('获取班级列表失败:', res.msg)
+          this.classList = []
+        }
+      } catch (error) {
+        console.error('获取班级列表异常:', error)
+        this.classList = []
+      }
+    },
+
+    showCampusPicker() {
+      this.currentPicker = 'campus'
+      this.pickerTitle = '选择校区'
+      this.pickerOptions = this.campusList
+
+      // 根据当前选中的校区设置初始索引
+      if (this.formData.campus_id) {
+        const currentIndex = this.campusList.findIndex(item => item.value == this.formData.campus_id)
+        this.campusSelectedIndex = currentIndex >= 0 ? currentIndex : 0
+      } else {
+        this.campusSelectedIndex = 0
+      }
+
+      this.pickerValue = [this.campusSelectedIndex]
+      this.selectedIndex = this.campusSelectedIndex
+      this.$refs.pickerPopup.open()
+    },
+
     showCoursePicker() {
       this.currentPicker = 'course'
       this.pickerTitle = '选择课程'
@@ -462,7 +642,7 @@ export default {
       this.currentPicker = 'giftType'
       this.pickerTitle = '选择核销类型'
       this.pickerOptions = this.giftTypes
-      
+
       // 根据当前选中的核销类型设置初始索引
       if (this.formData.gift_type) {
         const currentIndex = this.giftTypes.findIndex(item => item.value === this.formData.gift_type)
@@ -470,11 +650,34 @@ export default {
       } else {
         this.giftTypeSelectedIndex = 0
       }
-      
+
       this.pickerValue = [this.giftTypeSelectedIndex]
       this.selectedIndex = this.giftTypeSelectedIndex
       this.$refs.pickerPopup.open()
     },
+
+    showClassPicker() {
+      this.currentPicker = 'class'
+      this.pickerTitle = '选择班级'
+
+      // 添加一个"不选择"的选项
+      this.pickerOptions = [
+        { value: '', label: '不选择班级' },
+        ...this.classList
+      ]
+
+      // 根据当前选中的班级设置初始索引
+      if (this.formData.class_id) {
+        const currentIndex = this.pickerOptions.findIndex(item => item.value == this.formData.class_id)
+        this.classSelectedIndex = currentIndex >= 0 ? currentIndex : 0
+      } else {
+        this.classSelectedIndex = 0
+      }
+
+      this.pickerValue = [this.classSelectedIndex]
+      this.selectedIndex = this.classSelectedIndex
+      this.$refs.pickerPopup.open()
+    },
     
     onPickerChange(e) {
       this.selectedIndex = e.detail.value[0]
@@ -483,8 +686,18 @@ export default {
     confirmPicker() {
       const selectedOption = this.pickerOptions[this.selectedIndex]
       if (!selectedOption) return
-      
+
       switch (this.currentPicker) {
+        case 'campus':
+          this.campusSelectedIndex = this.selectedIndex
+          this.formData.campus_id = selectedOption.value
+          // 清空已选择的班级
+          this.formData.class_id = ''
+          this.classSelectedIndex = -1
+          // 重新加载该校区的班级列表
+          this.loadClassList(selectedOption.value)
+          console.log('校区选择后更新表单数据，已清空班级选择:', this.formData)
+          break
         case 'course':
           this.courseSelectedIndex = this.selectedIndex
           this.formData.course_id = selectedOption.id
@@ -503,6 +716,10 @@ export default {
         case 'payment':
           this.paymentSelectedIndex = this.selectedIndex
           this.formData.payment_type = selectedOption.value
+          // 切换支付方式时,清空支付凭证
+          this.voucherImages = []
+          this.formData.payment_voucher = ''
+          console.log('支付方式选择后更新表单数据:', this.formData)
           break
         case 'orderType':
           this.orderTypeSelectedIndex = this.selectedIndex
@@ -523,6 +740,11 @@ export default {
           this.formData.gift_type = selectedOption.value
           console.log('赠品类型选择后更新表单数据:', this.formData)
           break
+        case 'class':
+          this.classSelectedIndex = this.selectedIndex
+          this.formData.class_id = selectedOption.value
+          console.log('班级选择后更新表单数据:', this.formData)
+          break
       }
       
       this.closePicker()
@@ -532,12 +754,85 @@ export default {
       this.$refs.pickerPopup.close()
       this.currentPicker = ''
     },
-    
+
+    /**
+     * 选择支付凭证图片
+     */
+    chooseVoucherImage() {
+      const remainCount = this.maxVoucherImages - this.voucherImages.length
+      if (remainCount <= 0) {
+        uni.showToast({ title: '最多上传9张图片', icon: 'none' })
+        return
+      }
+
+      uni.chooseImage({
+        count: remainCount,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          console.log('选择的图片:', res.tempFilePaths)
+          // 逐个上传图片
+          res.tempFilePaths.forEach(filePath => {
+            this.uploadVoucherImage(filePath)
+          })
+        }
+      })
+    },
+
+    /**
+     * 上传单张支付凭证图片
+     */
+    uploadVoucherImage(filePath) {
+      uni.showLoading({ title: '上传中...' })
+
+      uploadFile(
+        filePath,
+        (fileData) => {
+          // 上传成功
+          console.log('图片上传成功:', fileData)
+          this.voucherImages.push(fileData.url)
+          // 更新formData中的payment_voucher字段
+          this.formData.payment_voucher = this.voucherImages.join(',')
+          console.log('支付凭证已更新:', this.formData.payment_voucher)
+          uni.hideLoading()
+          uni.showToast({ title: '上传成功', icon: 'success' })
+        },
+        (error) => {
+          // 上传失败
+          console.error('图片上传失败:', error)
+          uni.hideLoading()
+        }
+      )
+    },
+
+    /**
+     * 删除支付凭证图片
+     */
+    deleteVoucherImage(index) {
+      uni.showModal({
+        title: '提示',
+        content: '确定删除这张图片吗?',
+        success: (res) => {
+          if (res.confirm) {
+            this.voucherImages.splice(index, 1)
+            // 更新formData中的payment_voucher字段
+            this.formData.payment_voucher = this.voucherImages.join(',')
+            console.log('支付凭证已更新:', this.formData.payment_voucher)
+            uni.showToast({ title: '删除成功', icon: 'success' })
+          }
+        }
+      })
+    },
+
     validateForm() {
       if (!this.formData.student_id) {
         uni.showToast({ title: '请选择学生', icon: 'none' })
         return false
       }
+      if (!this.formData.campus_id) {
+        uni.showToast({ title: '请选择校区', icon: 'none' })
+        return false
+      }
       if (!this.formData.course_id) {
         uni.showToast({ title: '请选择课程', icon: 'none' })
         return false
@@ -734,6 +1029,73 @@ export default {
       height: 120rpx;
       resize: none;
     }
+
+    // 支付凭证上传样式
+    .voucher-upload {
+      .voucher-grid {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 20rpx;
+
+        .voucher-item {
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 12rpx;
+          overflow: hidden;
+          position: relative;
+          background: #2a2a2a;
+          border: 1px solid #444;
+
+          .voucher-image {
+            width: 100%;
+            height: 100%;
+          }
+
+          .voucher-delete {
+            position: absolute;
+            top: 0;
+            right: 0;
+            width: 50rpx;
+            height: 50rpx;
+            background: rgba(255, 71, 87, 0.8);
+            color: #ffffff;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 40rpx;
+            border-radius: 0 12rpx 0 12rpx;
+            font-weight: bold;
+          }
+
+          &.voucher-upload-btn {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            border: 2px dashed #666;
+            background: transparent;
+
+            .upload-icon {
+              font-size: 60rpx;
+              color: #888;
+              margin-bottom: 10rpx;
+            }
+
+            .upload-text {
+              font-size: 24rpx;
+              color: #888;
+            }
+          }
+        }
+      }
+
+      .voucher-tip {
+        display: block;
+        margin-top: 20rpx;
+        font-size: 24rpx;
+        color: #888;
+      }
+    }
   }
 }
 
diff --git a/uniapp/components/order-list-card/index.vue b/uniapp/components/order-list-card/index.vue
index b3f4dda1..00acb74e 100755
--- a/uniapp/components/order-list-card/index.vue
+++ b/uniapp/components/order-list-card/index.vue
@@ -1,150 +1,834 @@
-<!--订单列表内容组件-->
+<!--订单列表组件 - 独立业务组件-->
 <template>
   <view class="order-list-card">
-    <!-- 操作按钮区域 -->
-    <view class="action-header" v-if="orderList && orderList.length > 0">
-      <view class="add-order-btn" @click.stop="handleAddOrder">
-        <text class="add-icon">+</text>
-        <text class="add-text">新增订单</text>
-      </view>
+    <!-- 加载状态 -->
+    <view v-if="loading" class="loading-state">
+      <text class="loading-icon">⏳</text>
+      <text class="loading-text">加载中...</text>
     </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 && order.id ? order.id : `order-${index}`"
-        :class="{ 'pending-payment': order && order.status === 'pending' }"
-        @click.stop="order ? handleOrderClick(order) : null"
-        v-if="order"
+
+    <!-- 订单内容 -->
+    <view v-else>
+      <!-- 操作按钮区域 -->
+      <view class="action-header" v-if="showAddButton && orderList.length > 0">
+        <view class="add-order-btn" @click.stop="openAddOrder">
+          <text class="add-icon">+</text>
+          <text class="add-text">新增订单</text>
+        </view>
+      </view>
+
+      <!-- 订单列表 -->
+      <scroll-view
+        class="order-list"
+        v-if="orderList.length > 0"
+        scroll-y="true"
+        :enhanced="true"
+        :style="{height: maxHeight}"
       >
-        <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
+          class="order-item"
+          v-for="order in orderList"
+          :key="order.id"
+          :class="{ 'pending-payment': order.status === 'pending' }"
+          @click.stop="handleOrderClick(order)"
+        >
+          <view class="order-header">
+            <view class="order-info">
+              <view class="order-no">订单号：{{ order.order_no }}</view>
+              <view class="order-time" v-if="order.create_time">
+                {{ formatTime(order.create_time) }}
+              </view>
             </view>
-          </view>
-          <view :class="['order-status',getStatusClass(order && order.status)]">
-            {{ getStatusText(order && 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 :class="['order-status', getStatusClass(order.status)]">
+              {{ getStatusText(order.status) }}
             </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 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="detail-row" v-if="order.salesperson_name">
-              <text class="detail-label">销售顾问：</text>
-              <text class="detail-value">{{ order.salesperson_name }}</text>
+
+            <view class="order-details">
+              <!-- 价格信息 -->
+              <view class="detail-row">
+                <text class="detail-label">订单金额：</text>
+                <text class="detail-value price">¥{{ order.total_amount }}</text>
+              </view>
+
+              <view class="detail-row">
+                <text class="detail-label">已付金额：</text>
+                <text class="detail-value paid">¥{{ order.paid_amount }}</text>
+              </view>
+
+              <view class="detail-row">
+                <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>
-            
-            <view class="detail-row" v-if="order.course_count">
-              <text class="detail-label">课时数量：</text>
-              <text class="detail-value">{{ order.course_count }}节</text>
+
+            <!-- 备注信息 -->
+            <view class="order-remark" v-if="order.remark">
+              <view class="remark-label">备注：</view>
+              <view class="remark-content">{{ order.remark }}</view>
             </view>
           </view>
-          
-          <!-- 备注信息 -->
-          <view class="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.stop="handleAddOrder">
-        <text>新增订单</text>
+      </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" v-if="showAddButton" @click.stop="openAddOrder">
+          <text>新增订单</text>
+        </view>
       </view>
     </view>
+
+    <!-- 新增订单弹窗 -->
+    <uni-popup ref="orderFormPopup" type="bottom">
+      <OrderFormPopup
+        :visible="showOrderForm"
+        :student-info="studentInfo"
+        :resource-id="resourceId"
+        @cancel="closeOrderForm"
+        @confirm="handleOrderCreated"
+      />
+    </uni-popup>
+
+    <!-- 二维码支付弹窗 -->
+    <uni-popup ref="qrCodePopup" type="center" @close="closeQRCodeModal">
+      <QRCodePaymentDialog
+        v-if="qrCodePaymentData"
+        :payment-data="qrCodePaymentData"
+        @close="closeQRCodeModal"
+        @confirm="confirmQRCodePayment"
+      />
+    </uni-popup>
+
+    <!-- 支付凭证上传弹窗 -->
+    <uni-popup ref="paymentVoucherPopup" type="bottom" :safe-area="true" :z-index="9998">
+      <PaymentVoucherPopup
+        v-if="showPaymentVoucherPopup"
+        :order-info="currentOrder"
+        @cancel="closePaymentVoucherPopup"
+        @confirm="confirmPaymentVoucher"
+      />
+    </uni-popup>
   </view>
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js'
+import dictUtilSimple from '@/common/dictUtilSimple.js'
+import OrderFormPopup from '@/components/order-form-popup/index.vue'
+import QRCodePaymentDialog from './qrcode-payment-dialog.vue'
+
 export default {
   name: 'OrderListCard',
+  components: {
+    OrderFormPopup,
+    QRCodePaymentDialog,
+    PaymentVoucherPopup: () => import('./payment-voucher-popup.vue')
+  },
+
   props: {
-    // 订单列表数据
-    orderList: {
-      type: Array,
-      default: () => []
+    // 学员ID
+    studentId: {
+      type: [Number, String],
+      default: null
+    },
+    // 资源ID
+    resourceId: {
+      type: [Number, String],
+      default: null
+    },
+    // 是否自动加载数据
+    autoLoad: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示新增按钮
+    showAddButton: {
+      type: Boolean,
+      default: true
+    },
+    // 列表最大高度
+    maxHeight: {
+      type: String,
+      default: '70vh'
+    }
+  },
+
+  data() {
+    return {
+      // 订单数据
+      orderList: [],
+      loading: false,
+
+      // 弹窗状态
+      showOrderForm: false,
+      showQRCodeModal: false,
+      showPaymentVoucherPopup: false,
+
+      // 当前操作的订单
+      currentOrder: null,
+
+      // 二维码支付轮询定时器
+      paymentPollingTimer: null,
+
+      // 二维码支付数据
+      qrCodePaymentData: null,
+
+      // 字典数据
+      paymentTypeDict: [],
+
+      // 学生信息对象(用于传递给订单表单组件)
+      studentInfo: {}
     }
   },
-  
+
+  mounted() {
+    // 加载字典数据
+    this.loadDictData()
+
+    // 构建学生信息对象
+    if (this.studentId) {
+      this.buildStudentInfo()
+    }
+
+    // 自动加载订单列表
+    if (this.autoLoad && (this.studentId || this.resourceId)) {
+      this.loadOrderList()
+    }
+  },
+
+  watch: {
+    // 监听学员ID变化,自动刷新
+    studentId(newVal) {
+      if (newVal && this.autoLoad) {
+        this.loadOrderList()
+        this.buildStudentInfo()
+      }
+    }
+  },
+
   methods: {
-    // 查看订单详情
-    viewOrderDetail(order) {
-      this.$emit('view-detail', order)
+    /**
+     * 构建学生信息对象
+     * 通过员工端API获取学生详情包含 campus_id
+     */
+    async buildStudentInfo() {
+      if (!this.studentId) {
+        this.studentInfo = {}
+        return
+      }
+
+      try {
+        // 使用员工端学生信息接口
+        const res = await apiRoute.getStudentBasicInfo({ student_id: this.studentId })
+
+        if (res.code === 1 && res.data) {
+          this.studentInfo = {
+            id: res.data.id,
+            name: res.data.name,
+            campus_id: res.data.campus_id,
+            gender: res.data.gender,
+            gender_text: res.data.gender_text,
+            birthday: res.data.birthday,
+            headimg: res.data.headimg,
+            emergency_contact: res.data.emergency_contact,
+            contact_phone: res.data.contact_phone
+          }
+          console.log('学生信息加载成功:', this.studentInfo)
+        } else {
+          console.error('获取学生信息失败:', res.msg)
+          // 降级方案: 使用基本信息
+          this.studentInfo = {
+            id: this.studentId,
+            name: '学员',
+            campus_id: null
+          }
+        }
+      } catch (error) {
+        console.error('获取学生信息异常:', error)
+        // 降级方案
+        this.studentInfo = {
+          id: this.studentId,
+          name: '学员',
+          campus_id: null
+        }
+      }
     },
-    
-    // 新增订单
-    handleAddOrder() {
-      this.$emit('add-order')
+
+    /**
+     * 加载字典数据
+     */
+    async loadDictData() {
+      try {
+        const dictResult = await dictUtilSimple.getBatchDict(['payment_type'])
+
+        if (dictResult.payment_type && Array.isArray(dictResult.payment_type)) {
+          this.paymentTypeDict = dictResult.payment_type
+        } else {
+          // 使用备用数据
+          this.paymentTypeDict = [
+            { name: '现金支付', value: 'cash' },
+            { name: '扫码支付', value: 'scan_code' },
+            { name: '订阅支付', value: 'subscription' },
+            { name: '微信在线代付', value: 'wxpay_online' },
+            { name: '客户自行付款', value: 'client_wxpay' },
+            { name: '定金', value: 'deposit' }
+          ]
+        }
+      } catch (error) {
+        console.error('加载支付方式字典失败:', error)
+        // 使用备用数据
+        this.paymentTypeDict = [
+          { name: '现金支付', value: 'cash' },
+          { name: '扫码支付', value: 'scan_code' },
+          { name: '订阅支付', value: 'subscription' },
+          { name: '微信在线代付', value: 'wxpay_online' },
+          { name: '客户自行付款', value: 'client_wxpay' },
+          { name: '定金', value: 'deposit' }
+        ]
+      }
     },
-    
-    // 订单点击处理（根据状态决定是查看详情还是支付）
-    handleOrderClick(order) {
-      console.log('点击订单:', order)
-      // 防护检查：确保order对象存在
-      if (!order) {
-        console.warn('订单数据不存在，无法处理点击事件')
+
+    /**
+     * 加载订单列表
+     */
+    async loadOrderList() {
+      if (!this.studentId && !this.resourceId) {
+        console.warn('OrderListCard: 缺少必要参数 studentId 或 resourceId')
         return
       }
 
+      this.loading = true
+      try {
+        const params = {}
+        if (this.studentId) {
+          params.student_id = this.studentId
+        } else if (this.resourceId) {
+          params.resource_id = this.resourceId
+        }
+
+        const res = await apiRoute.xs_orderTableList(params)
+
+        if (res.code === 1) {
+          this.orderList = this.processOrderData(res.data?.data || [])
+          this.$emit('loaded', this.orderList)
+        } else {
+          console.error('获取订单列表失败:', res.msg)
+          this.orderList = []
+          this.$emit('error', { type: 'load', message: res.msg })
+        }
+      } catch (error) {
+        console.error('获取订单列表异常:', error)
+        uni.showToast({ title: '加载失败', icon: 'none' })
+        this.$emit('error', { type: 'load', error })
+      } finally {
+        this.loading = false
+      }
+    },
+
+    /**
+     * 处理订单数据格式
+     */
+    processOrderData(orders) {
+      if (!Array.isArray(orders)) return []
+
+      return orders.map(order => ({
+        id: order.id,
+        student_id: order.student_id,
+        order_no: order.payment_id || `ORD${order.id}`,
+        product_name: order.course_id_name || '课程',
+        total_amount: order.order_amount || '0.00',
+        paid_amount: order.order_status === 'paid' ? order.order_amount : '0.00',
+        unpaid_amount: order.order_status === 'paid' ? '0.00' : order.order_amount,
+        payment_method: this.formatPaymentType(order.payment_type),
+        salesperson_name: order.staff_id_name || '未指定',
+        course_count: order.total_hours || 0,
+        status: this.mapOrderStatus(order.order_status),
+        create_time: order.created_at,
+        contract_id: order.contract_id,
+        contract_sign_id: order.contract_sign_id,
+        remark: order.remark || '',
+        _raw: order
+      }))
+    },
+
+    /**
+     * 格式化支付类型
+     */
+    formatPaymentType(paymentType) {
+      if (!paymentType) return '未知'
+
+      const paymentItem = this.paymentTypeDict.find(item => item.value === paymentType)
+      if (paymentItem) return paymentItem.name
+
+      const fallbackMap = {
+        'cash': '现金支付',
+        'scan_code': '扫码支付',
+        'subscription': '订阅支付',
+        'wxpay_online': '微信在线代付',
+        'client_wxpay': '客户自行付款',
+        'deposit': '定金'
+      }
+      return fallbackMap[paymentType] || paymentType || '未知'
+    },
+
+    /**
+     * 映射订单状态
+     */
+    mapOrderStatus(orderStatus) {
+      const statusMap = {
+        'pending': 'pending',
+        'paid': 'paid',
+        'signed': 'completed',
+        'completed': 'completed',
+        'transfer': 'partial'
+      }
+      return statusMap[orderStatus] || 'pending'
+    },
+
+    /**
+     * 订单点击处理
+     */
+    handleOrderClick(order) {
+      this.currentOrder = order
+
       if (order.status === 'pending') {
-        // 未支付订单，触发支付
-        this.$emit('pay-order', order)
+        // 待支付订单,触发支付
+        this.handleOrderPay(order)
       } else {
-        // 已支付订单，查看详情
-        this.$emit('view-detail', order)
+        // 已支付订单,查看详情
+        this.viewOrderDetail(order)
+      }
+    },
+
+    /**
+     * 处理订单支付
+     */
+    handleOrderPay(order) {
+      const paymentType = order._raw?.payment_type
+
+      switch(paymentType) {
+        case 'cash':
+        case 'client_wxpay':
+        case 'deposit':
+          this.processVoucherPayment(order)
+          break
+        case 'scan_code':
+          this.processQRCodePayment(order)
+          break
+        case 'subscription':
+          this.processSubscriptionPayment(order)
+          break
+        case 'wxpay_online':
+          this.processWechatOnlinePayment(order)
+          break
+        default:
+          uni.showToast({ title: '不支持的支付方式', icon: 'none' })
+      }
+    },
+
+    /**
+     * 上传支付凭证的支付方式处理(cash, client_wxpay, deposit)
+     */
+    processVoucherPayment(order) {
+      this.currentOrder = order
+      this.showPaymentVoucherPopup = true
+      this.$refs.paymentVoucherPopup.open()
+    },
+
+    /**
+     * 二维码支付处理
+     */
+    async processQRCodePayment(order) {
+      uni.showLoading({ title: '生成支付二维码...' })
+
+      try {
+        const res = await apiRoute.getOrderPayQrcode({
+          order_id: order._raw?.id || order.id
+        })
+
+        uni.hideLoading()
+
+        if (res.code === 1 && res.data) {
+          this.qrCodePaymentData = {
+            order: order,
+            qrcode: res.data.code_url,
+            qrcodeImage: res.data.qrcode_base64 || res.data.qrcode_url
+          }
+          this.showQRCodeModal = true
+          this.$refs.qrCodePopup.open()
+
+          // 开始轮询支付状态
+          this.startPaymentPolling(order.order_no)
+        } else {
+          uni.showToast({ title: res.msg || '获取支付二维码失败', icon: 'none' })
+        }
+      } catch (error) {
+        uni.hideLoading()
+        console.error('获取支付二维码失败:', error)
+        uni.showToast({ title: '获取支付二维码失败', icon: 'none' })
       }
     },
-    
-    // 获取状态样式类
+
+    /**
+     * 开始轮询支付状态
+     */
+    startPaymentPolling(order_no) {
+      // 清除之前的定时器
+      this.stopPaymentPolling()
+
+      // 每3秒轮询一次
+      this.paymentPollingTimer = setInterval(async () => {
+        try {
+          const res = await apiRoute.checkOrderPaymentStatus({ order_no })
+
+          if (res.code === 1 && res.data) {
+            // 如果订单状态为已支付,停止轮询并关闭弹窗
+            if (res.data.order_status === 'paid') {
+              this.stopPaymentPolling()
+              this.closeQRCodeModal()
+              uni.showToast({ title: '支付成功', icon: 'success' })
+
+              // 刷新订单列表
+              await this.refresh()
+
+              // 触发支付成功事件
+              this.$emit('payment-success', this.currentOrder)
+            }
+          }
+        } catch (error) {
+          console.error('查询支付状态失败:', error)
+        }
+      }, 3000)
+    },
+
+    /**
+     * 停止轮询支付状态
+     */
+    stopPaymentPolling() {
+      if (this.paymentPollingTimer) {
+        clearInterval(this.paymentPollingTimer)
+        this.paymentPollingTimer = null
+      }
+    },
+
+    /**
+     * 订阅支付处理
+     */
+    processSubscriptionPayment(order) {
+      uni.showModal({
+        title: '订阅服务说明',
+        content: '每日支付超过3000笔后解锁订阅服务',
+        showCancel: false,
+        confirmText: '知道了'
+      })
+    },
+
+    /**
+     * 微信在线代付处理(本阶段只定义函数)
+     */
+    processWechatOnlinePayment(order) {
+      // TODO: 后续实现微信在线代付功能
+      uni.showToast({
+        title: '微信在线代付功能开发中',
+        icon: 'none'
+      })
+    },
+
+    /**
+     * 更新订单支付状态
+     */
+    async updateOrderPaymentStatus(order, status, paymentId = '') {
+      try {
+        const updateData = {
+          order_id: order._raw?.id || order.id,
+          order_status: status,
+          payment_id: paymentId
+        }
+
+        const result = await apiRoute.xs_orderTableUpdatePaymentStatus(updateData)
+
+        if (result.code === 1) {
+          const statusText = {
+            'paid': '支付成功',
+            'partial': '分期支付确认成功',
+            'cancelled': '支付已取消'
+          }
+          uni.showToast({
+            title: statusText[status] || '状态更新成功',
+            icon: 'success'
+          })
+
+          // 刷新订单列表
+          await this.refresh()
+
+          // 触发支付成功事件
+          this.$emit('payment-success', order)
+        } else {
+          uni.showToast({ title: result.msg || '状态更新失败', icon: 'none' })
+        }
+      } catch (error) {
+        console.error('更新订单状态失败:', error)
+        uni.showToast({ title: '状态更新失败', icon: 'none' })
+        this.$emit('error', { type: 'payment', error })
+      }
+    },
+
+    /**
+     * 关闭二维码支付弹窗
+     */
+    closeQRCodeModal() {
+      // 停止轮询
+      this.stopPaymentPolling()
+
+      this.showQRCodeModal = false
+      this.qrCodePaymentData = null
+      this.$refs.qrCodePopup.close()
+    },
+
+    /**
+     * 确认二维码支付完成
+     */
+    async confirmQRCodePayment() {
+      if (!this.qrCodePaymentData?.order) return
+
+      const order = this.qrCodePaymentData.order
+
+      uni.showModal({
+        title: '支付确认',
+        content: '请确认是否已完成扫码支付？',
+        success: async (res) => {
+          if (res.confirm) {
+            try {
+              await this.updateOrderPaymentStatus(order, 'paid', `QR${Date.now()}`)
+              this.closeQRCodeModal()
+            } catch (error) {
+              console.error('支付确认失败:', error)
+            }
+          }
+        }
+      })
+    },
+
+    /**
+     * 关闭支付凭证弹窗
+     */
+    closePaymentVoucherPopup() {
+      this.showPaymentVoucherPopup = false
+      this.$refs.paymentVoucherPopup?.close()
+      this.$refs.paymentVoucherPopup?.reset()
+    },
+
+    /**
+     * 确认提交支付凭证
+     */
+    async confirmPaymentVoucher(data) {
+      try {
+        uni.showLoading({ title: '提交中...' })
+
+        const res = await apiRoute.updateOrderPaymentVoucher({
+          order_id: data.order_id,
+          payment_voucher: data.payment_voucher
+        })
+
+        uni.hideLoading()
+
+        if (res.code === 1) {
+          uni.showToast({ title: '提交成功', icon: 'success' })
+
+          // 关闭弹窗
+          this.closePaymentVoucherPopup()
+
+          // 刷新订单列表
+          await this.refresh()
+
+          // 触发支付成功事件
+          this.$emit('payment-success', this.currentOrder)
+        } else {
+          uni.showToast({ title: res.msg || '提交失败', icon: 'none' })
+        }
+      } catch (error) {
+        uni.hideLoading()
+        console.error('提交支付凭证失败:', error)
+        uni.showToast({ title: '提交失败', icon: 'none' })
+        this.$emit('error', { type: 'payment-voucher', error })
+      }
+    },
+
+    /**
+     * 查看订单详情
+     */
+    viewOrderDetail(order) {
+      const orderInfo = order._raw || order
+      const isOrderPaid = order.status === 'paid'
+
+      const detailText = `
+订单号：${order.order_no}
+课程：${order.product_name}
+金额：¥${order.total_amount}
+已付：¥${order.paid_amount}
+未付：¥${order.unpaid_amount}
+支付方式：${order.payment_method}
+销售顾问：${order.salesperson_name}
+课时数：${order.course_count}节
+状态：${this.getStatusText(order.status)}
+创建时间：${this.formatTime(order.create_time)}
+${orderInfo.paid_at ? '支付时间：' + this.formatTime(orderInfo.paid_at) : ''}
+      `.trim()
+
+      uni.showModal({
+        title: '订单详情',
+        content: detailText,
+        showCancel: isOrderPaid,
+        cancelText: isOrderPaid ? '知道了' : '',
+        confirmText: isOrderPaid ? '合同签署' : '知道了',
+        success: (res) => {
+          if (res.confirm && isOrderPaid) {
+            this.goToContractSign(order)
+          }
+        }
+      })
+    },
+
+    /**
+     * 跳转到合同签署页面
+     */
+    goToContractSign(order) {
+      const studentId = order.student_id || this.studentId
+      const contractId = order.contract_id || order._raw?.contract_id
+      const contractSignId = order.contract_sign_id || order._raw?.contract_sign_id
+
+      if (!studentId) {
+        uni.showToast({ title: '缺少学生信息', icon: 'none' })
+        return
+      }
+
+      if (!contractId) {
+        this.getContractByOrder(order, studentId)
+        return
+      }
+
+      let url = `/pages-student/contracts/sign?contract_id=${contractId}&student_id=${studentId}&contract_name=${encodeURIComponent(order.product_name + '合同')}&user_role=staff`
+
+      if (contractSignId) {
+        url += `&contract_sign_id=${contractSignId}`
+      }
+
+      uni.navigateTo({ url })
+    },
+
+    /**
+     * 根据订单获取合同信息
+     */
+    async getContractByOrder(order, studentId) {
+      try {
+        uni.showLoading({ title: '获取合同信息...' })
+
+        const res = await apiRoute.getContractByOrder({
+          order_id: order._raw?.id || order.id,
+          student_id: studentId
+        })
+
+        uni.hideLoading()
+
+        if (res.code === 1 && res.data) {
+          const contractInfo = res.data
+          uni.navigateTo({
+            url: `/pages-student/contracts/sign?contract_id=${contractInfo.contract_id}&student_id=${studentId}&contract_name=${encodeURIComponent(contractInfo.contract_name || order.product_name + '合同')}&user_role=staff`
+          })
+        } else {
+          uni.showToast({ title: res.msg || '未找到相关合同', icon: 'none' })
+        }
+      } catch (error) {
+        uni.hideLoading()
+        console.error('获取合同信息失败:', error)
+        uni.showToast({ title: '获取合同信息失败', icon: 'none' })
+      }
+    },
+
+    /**
+     * 新增订单
+     */
+    openAddOrder() {
+      if (!this.studentId) {
+        uni.showToast({ title: '缺少学员信息', icon: 'none' })
+        return
+      }
+
+      this.showOrderForm = true
+      this.$refs.orderFormPopup.open()
+    },
+
+    /**
+     * 关闭新增订单弹窗
+     */
+    closeOrderForm() {
+      this.showOrderForm = false
+      this.$refs.orderFormPopup.close()
+    },
+
+    /**
+     * 订单创建成功回调
+     */
+    async handleOrderCreated() {
+      this.closeOrderForm()
+
+      uni.showToast({ title: '订单创建成功', icon: 'success' })
+
+      // 刷新订单列表
+      await this.refresh()
+
+      // 触发订单创建事件
+      this.$emit('order-created')
+    },
+
+    /**
+     * 刷新订单列表(对外暴露方法)
+     */
+    async refresh() {
+      await this.loadOrderList()
+      this.$emit('refreshed')
+    },
+
+    /**
+     * 获取当前订单列表(对外暴露方法)
+     */
+    getOrderList() {
+      return this.orderList
+    },
+
+    /**
+     * 获取状态样式类
+     */
     getStatusClass(status) {
-      if (!status) return 'status-default'
-      
       const statusMap = {
         'pending': 'status-pending',
         'paid': 'status-paid',
@@ -155,11 +839,11 @@ export default {
       }
       return statusMap[status] || 'status-default'
     },
-    
-    // 获取状态文本
+
+    /**
+     * 获取状态文本
+     */
     getStatusText(status) {
-      if (!status) return '未知状态'
-      
       const statusMap = {
         'pending': '待支付',
         'paid': '已支付',
@@ -170,8 +854,10 @@ export default {
       }
       return statusMap[status] || '未知状态'
     },
-    
-    // 格式化时间
+
+    /**
+     * 格式化时间
+     */
     formatTime(timeStr) {
       if (!timeStr) return ''
       try {
@@ -190,6 +876,24 @@ export default {
   padding: 0;
 }
 
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 80rpx 40rpx;
+}
+
+.loading-icon {
+  font-size: 60rpx;
+  margin-bottom: 20rpx;
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #999999;
+}
+
 .order-list {
   display: flex;
   flex-direction: column;
@@ -203,27 +907,14 @@ export default {
   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 {
-      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;
-    }
   }
 }
 
@@ -257,37 +948,37 @@ export default {
   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;
@@ -342,18 +1033,18 @@ export default {
   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;
@@ -415,7 +1106,7 @@ export default {
   font-size: 28rpx;
   font-weight: 500;
   transition: all 0.3s ease;
-  
+
   &:active {
     background: #1fb396;
   }
@@ -437,7 +1128,7 @@ export default {
   font-size: 26rpx;
   font-weight: 500;
   transition: all 0.3s ease;
-  
+
   &:active {
     background: #1fb396;
   }
@@ -453,4 +1144,4 @@ export default {
 .add-text {
   font-size: 26rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/uniapp/components/order-list-card/payment-voucher-popup.vue b/uniapp/components/order-list-card/payment-voucher-popup.vue
new file mode 100755
index 00000000..4a4094a0
--- /dev/null
+++ b/uniapp/components/order-list-card/payment-voucher-popup.vue
@@ -0,0 +1,505 @@
+<!--支付凭证上传弹窗组件-->
+<template>
+  <view class="payment-voucher-wrapper">
+    <!-- 遮罩层 -->
+    <view class="popup-mask" @click="handleCancel"></view>
+
+    <!-- 弹窗内容 -->
+    <view class="payment-voucher-popup">
+      <view class="popup-content">
+        <view class="popup-header">
+          <text class="popup-title">上传支付凭证</text>
+          <view class="close-btn" @click="handleCancel">
+            <text class="close-icon">✕</text>
+          </view>
+        </view>
+
+      <view class="popup-body">
+        <!-- 订单信息展示 -->
+        <view class="order-info-section">
+          <view class="info-row">
+            <text class="info-label">订单号:</text>
+            <text class="info-value">{{ orderInfo.order_no }}</text>
+          </view>
+          <view class="info-row">
+            <text class="info-label">课程类型:</text>
+            <text class="info-value">{{ orderInfo.product_name }}</text>
+          </view>
+          <view class="info-row">
+            <text class="info-label">支付金额:</text>
+            <text class="info-value amount">¥{{ orderInfo.total_amount }}</text>
+          </view>
+        </view>
+
+        <!-- 图片上传区域 -->
+        <view class="upload-section">
+          <view class="section-title">支付凭证</view>
+          <view class="upload-tip">最多上传9张图片</view>
+
+          <view class="image-list">
+            <view
+              v-for="(image, index) in imageList"
+              :key="index"
+              class="image-item"
+            >
+              <image :src="image" class="preview-image" mode="aspectFill"></image>
+              <view class="delete-btn" @click="deleteImage(index)">
+                <text class="delete-icon">×</text>
+              </view>
+            </view>
+
+            <view
+              v-if="imageList.length < 9"
+              class="upload-btn"
+              @click="chooseImage"
+            >
+              <text class="upload-icon">+</text>
+              <text class="upload-text">上传图片</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="popup-footer">
+        <view class="footer-btn cancel-btn" @click="handleCancel">
+          <text>取消</text>
+        </view>
+        <view
+          class="footer-btn confirm-btn"
+          :class="{ disabled: !canSubmit }"
+          @click="handleConfirm"
+        >
+          <text>提交</text>
+        </view>
+      </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { uploadFile } from '@/common/util.js'
+
+export default {
+  name: 'PaymentVoucherPopup',
+
+  props: {
+    // 订单信息
+    orderInfo: {
+      type: Object,
+      default: () => ({
+        order_no: '',
+        product_name: '',
+        total_amount: '0.00'
+      })
+    }
+  },
+
+  data() {
+    return {
+      imageList: [], // 图片列表
+      uploading: false
+    }
+  },
+
+  computed: {
+    // 是否可以提交
+    canSubmit() {
+      return this.imageList.length > 0 && !this.uploading
+    }
+  },
+
+  methods: {
+    /**
+     * 选择图片
+     */
+    chooseImage() {
+      const remainCount = 9 - this.imageList.length
+
+      uni.chooseImage({
+        count: remainCount,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          const tempFilePaths = res.tempFilePaths
+
+          // 上传图片
+          this.uploadImages(tempFilePaths)
+        },
+        fail: (err) => {
+          console.error('选择图片失败:', err)
+          uni.showToast({ title: '选择图片失败', icon: 'none' })
+        }
+      })
+    },
+
+    /**
+     * 上传图片
+     */
+    async uploadImages(filePaths) {
+      this.uploading = true
+      uni.showLoading({ title: '上传中...' })
+
+      try {
+        const uploadPromises = filePaths.map(filePath => this.uploadSingleImage(filePath))
+        const results = await Promise.all(uploadPromises)
+
+        // 将上传成功的图片URL添加到列表
+        results.forEach(url => {
+          if (url) {
+            this.imageList.push(url)
+          }
+        })
+
+        uni.hideLoading()
+
+        if (results.some(url => url)) {
+          uni.showToast({ title: '上传成功', icon: 'success' })
+        }
+      } catch (error) {
+        uni.hideLoading()
+        console.error('上传图片异常:', error)
+        uni.showToast({ title: '上传失败', icon: 'none' })
+      } finally {
+        this.uploading = false
+      }
+    },
+
+    /**
+     * 上传单张图片
+     */
+    uploadSingleImage(filePath) {
+      return new Promise((resolve, reject) => {
+        uploadFile(
+          filePath,
+          (fileData) => {
+            // 成功回调: fileData = { url, extname, name }
+            if (fileData && fileData.url) {
+              resolve(fileData.url)
+            } else {
+              console.error('上传成功但未返回URL')
+              resolve(null)
+            }
+          },
+          (error) => {
+            // 失败回调
+            console.error('上传请求失败:', error)
+            resolve(null)
+          }
+        )
+      })
+    },
+
+    /**
+     * 删除图片
+     */
+    deleteImage(index) {
+      uni.showModal({
+        title: '确认删除',
+        content: '确定要删除这张图片吗?',
+        success: (res) => {
+          if (res.confirm) {
+            this.imageList.splice(index, 1)
+          }
+        }
+      })
+    },
+
+    /**
+     * 取消
+     */
+    handleCancel() {
+      this.$emit('cancel')
+    },
+
+    /**
+     * 确认提交
+     */
+    handleConfirm() {
+      if (!this.canSubmit) {
+        uni.showToast({ title: '请先上传支付凭证', icon: 'none' })
+        return
+      }
+
+      // 将图片数组转为逗号分隔的字符串
+      const payment_voucher = this.imageList.join(',')
+
+      this.$emit('confirm', {
+        payment_voucher: payment_voucher,
+        order_id: this.orderInfo.id || this.orderInfo._raw?.id
+      })
+    },
+
+    /**
+     * 重置数据
+     */
+    reset() {
+      this.imageList = []
+      this.uploading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payment-voucher-wrapper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9998;
+  display: flex;
+  align-items: flex-end;
+}
+
+.popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1;
+}
+
+.payment-voucher-popup {
+  position: relative;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  background: #2A2A2A;
+  border-radius: 24rpx 24rpx 0 0;
+  overflow: hidden;
+  z-index: 2;
+  box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.3);
+  animation: slideUp 0.3s ease;
+}
+
+@keyframes slideUp {
+  from {
+    transform: translateY(100%);
+  }
+  to {
+    transform: translateY(0);
+  }
+}
+
+.popup-content {
+  display: flex;
+  flex-direction: column;
+  max-height: 90vh;
+}
+
+.popup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 40rpx;
+  border-bottom: 1px solid #404040;
+}
+
+.popup-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #ffffff;
+}
+
+.close-btn {
+  width: 56rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 50%;
+  transition: all 0.3s ease;
+
+  &:active {
+    background: rgba(255, 255, 255, 0.15);
+  }
+}
+
+.close-icon {
+  font-size: 40rpx;
+  color: #ffffff;
+  line-height: 1;
+}
+
+.popup-body {
+  flex: 1;
+  padding: 32rpx 40rpx;
+  overflow-y: auto;
+}
+
+.order-info-section {
+  background: rgba(41, 211, 180, 0.05);
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin-bottom: 32rpx;
+  border-left: 4rpx solid #29D3B4;
+}
+
+.info-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.info-label {
+  font-size: 28rpx;
+  color: #999999;
+  min-width: 140rpx;
+}
+
+.info-value {
+  font-size: 28rpx;
+  color: #ffffff;
+  flex: 1;
+  text-align: right;
+
+  &.amount {
+    color: #FFC107;
+    font-weight: 600;
+    font-size: 32rpx;
+  }
+}
+
+.upload-section {
+  margin-bottom: 32rpx;
+}
+
+.section-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #ffffff;
+  margin-bottom: 12rpx;
+}
+
+.upload-tip {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 24rpx;
+}
+
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+}
+
+.image-item {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+}
+
+.preview-image {
+  width: 100%;
+  height: 100%;
+}
+
+.delete-btn {
+  position: absolute;
+  top: 8rpx;
+  right: 8rpx;
+  width: 44rpx;
+  height: 44rpx;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &:active {
+    background: rgba(0, 0, 0, 0.8);
+  }
+}
+
+.delete-icon {
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 1;
+}
+
+.upload-btn {
+  width: 200rpx;
+  height: 200rpx;
+  border: 2px dashed #404040;
+  border-radius: 12rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.02);
+  transition: all 0.3s ease;
+
+  &:active {
+    background: rgba(255, 255, 255, 0.05);
+    border-color: #29D3B4;
+  }
+}
+
+.upload-icon {
+  font-size: 48rpx;
+  color: #666666;
+  line-height: 1;
+  margin-bottom: 8rpx;
+}
+
+.upload-text {
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.popup-footer {
+  display: flex;
+  gap: 24rpx;
+  padding: 24rpx 40rpx;
+  border-top: 1px solid #404040;
+  background: #2A2A2A;
+}
+
+.footer-btn {
+  flex: 1;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 16rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.cancel-btn {
+  background: rgba(255, 255, 255, 0.1);
+  color: #ffffff;
+
+  &:active {
+    background: rgba(255, 255, 255, 0.15);
+  }
+}
+
+.confirm-btn {
+  background: #29D3B4;
+  color: #ffffff;
+
+  &:active {
+    background: #1fb396;
+  }
+
+  &.disabled {
+    background: #404040;
+    color: #666666;
+  }
+}
+</style>
diff --git a/uniapp/components/order-list-card/qrcode-payment-dialog.vue b/uniapp/components/order-list-card/qrcode-payment-dialog.vue
new file mode 100755
index 00000000..089a49e3
--- /dev/null
+++ b/uniapp/components/order-list-card/qrcode-payment-dialog.vue
@@ -0,0 +1,207 @@
+<!--二维码支付弹窗组件-->
+<template>
+  <view class="qrcode-payment-modal">
+    <!-- 弹窗头部 -->
+    <view class="modal-header">
+      <text class="modal-title">扫码支付</text>
+      <view class="close-btn" @click="handleClose">
+        <text>✕</text>
+      </view>
+    </view>
+
+    <!-- 订单信息 -->
+    <view class="order-info">
+      <view class="info-row">
+        <text class="label">订单号：</text>
+        <text class="value">{{ paymentData.order.order_no }}</text>
+      </view>
+      <view class="info-row">
+        <text class="label">支付金额：</text>
+        <text class="amount">¥{{ paymentData.order.total_amount }}</text>
+      </view>
+    </view>
+
+    <!-- 二维码区域 -->
+    <view class="qrcode-container">
+      <image
+        v-if="paymentData.qrcodeImage"
+        :src="paymentData.qrcodeImage"
+        class="qrcode-image"
+        mode="aspectFit"
+      />
+      <text v-else class="qrcode-placeholder">二维码加载中...</text>
+      <text class="qrcode-tip">请使用微信扫码完成支付</text>
+    </view>
+
+    <!-- 操作按钮 -->
+    <view class="modal-buttons">
+      <view class="btn secondary" @click="handleClose">取消支付</view>
+      <view class="btn primary" @click="handleConfirm">确认已支付</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'QRCodePaymentDialog',
+  props: {
+    paymentData: {
+      type: Object,
+      required: true
+    }
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit('close')
+    },
+
+    handleConfirm() {
+      this.$emit('confirm')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.qrcode-payment-modal {
+  background: #2A2A2A;
+  border-radius: 24rpx;
+  padding: 48rpx;
+  width: 600rpx;
+  max-width: 90vw;
+}
+
+.modal-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+
+.modal-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #ffffff;
+}
+
+.close-btn {
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 50%;
+  font-size: 32rpx;
+  color: #ffffff;
+  transition: all 0.3s ease;
+
+  &:active {
+    background: rgba(255, 255, 255, 0.2);
+  }
+}
+
+.order-info {
+  background: rgba(255, 255, 255, 0.05);
+  border-radius: 16rpx;
+  padding: 32rpx;
+  margin-bottom: 40rpx;
+}
+
+.info-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.label {
+  font-size: 28rpx;
+  color: #999999;
+}
+
+.value {
+  font-size: 28rpx;
+  color: #ffffff;
+}
+
+.amount {
+  font-size: 40rpx;
+  font-weight: 600;
+  color: #FFC107;
+}
+
+.qrcode-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
+  margin-bottom: 40rpx;
+}
+
+.qrcode-image {
+  width: 400rpx;
+  height: 400rpx;
+  margin-bottom: 24rpx;
+}
+
+.qrcode-placeholder {
+  width: 400rpx;
+  height: 400rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: #999999;
+  margin-bottom: 24rpx;
+}
+
+.qrcode-tip {
+  font-size: 26rpx;
+  color: #666666;
+  text-align: center;
+}
+
+.modal-buttons {
+  display: flex;
+  gap: 24rpx;
+}
+
+.btn {
+  flex: 1;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 44rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  transition: all 0.3s ease;
+
+  &.secondary {
+    background: rgba(255, 255, 255, 0.1);
+    color: #ffffff;
+
+    &:active {
+      background: rgba(255, 255, 255, 0.15);
+    }
+  }
+
+  &.primary {
+    background: #29D3B4;
+    color: #ffffff;
+
+    &:active {
+      background: #1fb396;
+    }
+  }
+}
+</style>
diff --git a/uniapp/components/schedule/ScheduleDetail.vue b/uniapp/components/schedule/ScheduleDetail.vue
index 40e492cd..5271bf7f 100755
--- a/uniapp/components/schedule/ScheduleDetail.vue
+++ b/uniapp/components/schedule/ScheduleDetail.vue
@@ -1,15 +1,20 @@
 <template>
-	<fui-modal :show="visible" width="700" @cancel="closePopup" :buttons="[{text: '关闭', type: 'default'}]" :showClose="true" @close="closePopup" @click="handleModalClick">
-		<!-- 自定义关闭按钮 -->
-		<template #header>
+	<!-- 组件根容器 - Vue2要求只有一个根元素 -->
+	<view>
+		<!-- 自定义弹窗遮罩 -->
+		<view class="modal-mask" v-if="visible" @click="closePopup">
+		<!-- 弹窗内容 -->
+		<view class="modal-container" @click.stop>
+			<!-- 自定义头部 -->
 			<view class="custom-header">
 				<text class="modal-title">课程安排详情</text>
 				<view class="close-btn" @click="closePopup">
 					<text class="close-icon">✕</text>
 				</view>
 			</view>
-		</template>
-		<view class="schedule-detail" v-if="scheduleInfo">
+
+			<!-- 弹窗主体内容 -->
+			<view class="schedule-detail" v-if="scheduleInfo">
 			<!-- 课程基本信息 -->
 			<view class="section basic-info">
 				<view class="section-title">基本信息</view>
@@ -77,6 +82,10 @@
 						<view class="student-info">
 							<view class="student-name">{{ student.name }}</view>
 							<view class="student-age">年龄：{{ student.age }}岁</view>
+							<view class="attendance-status">
+								<text class="status-label">签到状态：</text>
+								<text :class="['status-text', getStatusClass(student.status)]">{{ getStatusText(student.status) }}</text>
+							</view>
 							<view class="course-status">课程状态：{{ student.courseStatus }}</view>
 							<view class="course-arrangement">课程安排：{{ student.courseType === 'fixed' ? '固定课' : '临时课' }}</view>
 
@@ -136,6 +145,10 @@
 						<view class="student-info">
 							<view class="student-name">{{ student.name }}</view>
 							<view class="student-age">年龄：{{ student.age }}岁</view>
+							<view class="attendance-status">
+								<text class="status-label">签到状态：</text>
+								<text :class="['status-text', getStatusClass(student.status)]">{{ getStatusText(student.status) }}</text>
+							</view>
 							<view class="course-status">课程状态：{{ student.courseStatus }}</view>
 							<view class="course-arrangement">课程安排：等待位</view>
 
@@ -178,22 +191,33 @@
 				</view>
 			</view>
 
-		</view>
+			</view>
 
-		<view class="loading" v-if="loading && !scheduleInfo">
-			<fui-loading></fui-loading>
-			<text class="loading-text">加载中...</text>
-		</view>
+			<!-- 加载状态 -->
+			<view class="loading" v-if="loading && !scheduleInfo">
+				<fui-loading></fui-loading>
+				<text class="loading-text">加载中...</text>
+			</view>
 
-		<view class="error-message" v-if="error && !scheduleInfo">
-			<text>{{ errorMessage }}</text>
-			<view class="retry-btn" @click="fetchScheduleDetail">
-				<text>重试</text>
+			<!-- 错误信息 -->
+			<view class="error-message" v-if="error && !scheduleInfo">
+				<text>{{ errorMessage }}</text>
+				<view class="retry-btn" @click="fetchScheduleDetail">
+					<text>重试</text>
+				</view>
+			</view>
+
+			<!-- 底部关闭按钮 -->
+			<view class="modal-footer">
+				<view class="footer-btn close-footer-btn" @click="closePopup">
+					<text class="btn-text">关闭</text>
+				</view>
 			</view>
 		</view>
+		</view>
 
 		<!-- 学员点名底部弹窗 -->
-		<fui-modal :show="showAttendanceModal" title="学员点名" @cancel="closeAttendanceModal" :buttons="[]">
+		<fui-modal :show="showAttendanceModal" title="学员点名" @cancel="closeAttendanceModal" :buttons="[]" :zIndex="10001">
 			<view class="attendance-modal" v-if="selectedStudent">
 				<view class="student-info">
 					<view class="student-avatar-large">
@@ -218,7 +242,7 @@
 		</fui-modal>
 
 		<!-- 升级确认弹窗 -->
-		<fui-modal :show="showUpgradeConfirm" title="升级确认" @cancel="cancelUpgrade" :buttons="[]" :zIndex="10000">
+		<fui-modal :show="showUpgradeConfirm" title="升级确认" @cancel="cancelUpgrade" :buttons="[]" :zIndex="10002">
 			<view class="upgrade-confirm-modal" v-if="upgradeStudent">
 				<view class="confirm-content">
 					<view class="upgrade-icon">⚡</view>
@@ -242,7 +266,7 @@
 		</fui-modal>
 
 		<!-- 删除课程安排确认弹窗 -->
-		<fui-modal :show="showDeleteSchedulesModal" title="删除确认" @cancel="closeDeleteSchedulesModal" :buttons="[]" :zIndex="10001">
+		<fui-modal :show="showDeleteSchedulesModal" title="删除确认" @cancel="closeDeleteSchedulesModal" :buttons="[]" :zIndex="10003">
 			<view class="delete-confirm-modal" v-if="studentToDelete">
 				<view class="confirm-content">
 					<view class="error-icon">⚠️</view>
@@ -267,7 +291,7 @@
 				</view>
 			</view>
 		</fui-modal>
-	</fui-modal>
+	</view>
 </template>
 
 <script>
@@ -288,12 +312,20 @@
 		computed: {
 			// 分离正式学员和等待位学员
 			formalStudents() {
-				if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
-				return this.scheduleInfo.students.filter(student => student.schedule_type === 1 || student.schedule_type === null);
+				if (!this.scheduleInfo) return [];
+				const students = this.scheduleInfo.formal_students;
+				if (!students || !Array.isArray(students)) {
+					return [];
+				}
+				return students;
 			},
 			waitingStudents() {
-				if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
-				return this.scheduleInfo.students.filter(student => student.schedule_type === 2);
+				if (!this.scheduleInfo) return [];
+				const students = this.scheduleInfo.waiting_students;
+				if (!students || !Array.isArray(students)) {
+					return [];
+				}
+				return students;
 			},
 			statusClass() {
 				const statusMap = {
@@ -361,24 +393,12 @@
 				if (newVal && this.scheduleId) {
 					this.fetchScheduleDetail();
 				}
-			},
-			scheduleId(newVal, oldVal) {
-				// 只有在弹窗可见且scheduleId真正发生变化时才重新获取数据
-				if (newVal && this.visible && newVal !== oldVal) {
-					this.fetchScheduleDetail();
-				}
 			}
+			// 注意: 已移除scheduleId的watch监听，避免与visible的watch重复触发
+			// 父组件总是先设置scheduleId再设置visible=true，所以只需监听visible即可
 		},
 		methods: {
-			// 处理弹窗按钮点击
-			handleModalClick(e) {
-				// 如果点击的是关闭按钮，关闭弹窗
-				if (e.index === 0) {
-					this.closePopup();
-				}
-			},
-
-			// 获取课程安排详情（使用统一API - 对接admin端）
+			// 获取课程安排详情(使用统一API - 对接admin端)
 			async fetchScheduleDetail() {
 				if (!this.scheduleId) {
 					this.error = true;
@@ -402,8 +422,33 @@
 
 						// 使用新的统一API数据结构，与admin端保持一致
 						if (data.schedule_info) {
-							// 处理新的统一数据结构（包含schedule_info、formal_students、waiting_students）
-							const allStudents = [...(data.formal_students || []), ...(data.waiting_students || [])];
+							// 处理正式学员数据
+							const processStudents = (students) => {
+								return (students || []).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 || student.person_type !== 'student',
+									// 确保包含课程状态和类型
+									courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
+									courseType: student.schedule_type === 2 ? 'waiting' : 'formal',
+									// 确保包含年龄信息
+									age: student.age || 0,
+									// 确保包含体验课时信息
+									trialClassCount: student.trialClassCount || 0,
+									// 确保包含剩余课时和到期时间
+									remainingHours: student.remainingHours || student.course_progress?.remaining || 0,
+									expiryDate: student.expiryDate || ''
+								}));
+							};
 
 							this.scheduleInfo = {
 								// 基本课程信息从schedule_info获取
@@ -425,8 +470,20 @@
 								time_info: data.schedule_info.time_info || null,
 								// 课程时长
 								course_duration: data.schedule_info.time_info?.duration || data.schedule_info.course_duration || 60,
-								// 合并正式学员和等待位学员数据
-								students: allStudents.map(student => ({
+								// 分别存储正式学员和等待位学员
+								formal_students: processStudents(data.formal_students),
+								waiting_students: processStudents(data.waiting_students),
+								// 其他信息
+								available_capacity: data.schedule_info.available_capacity || 0,
+								enrolled_count: (data.formal_students?.length || 0) + (data.waiting_students?.length || 0),
+								remaining_capacity: data.schedule_info.remaining_capacity || 0
+							};
+
+							console.log('课程安排详情加载成功:', this.scheduleInfo);
+						} else {
+							// 兼容旧的数据结构
+							const processStudents = (students) => {
+								return (students || []).map(student => ({
 									...student,
 									status_text: this.getStatusText(student.status || 0),
 									// 确保包含课程进度数据
@@ -438,7 +495,7 @@
 									},
 									// 确保包含续费和体验课标识
 									needsRenewal: student.needsRenewal || false,
-									isTrialStudent: student.isTrialStudent || student.person_type !== 'student',
+									isTrialStudent: student.isTrialStudent || false,
 									// 确保包含课程状态和类型
 									courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
 									courseType: student.schedule_type === 2 ? 'waiting' : 'formal',
@@ -447,16 +504,16 @@
 									// 确保包含体验课时信息
 									trialClassCount: student.trialClassCount || 0,
 									// 确保包含剩余课时和到期时间
-									remainingHours: student.remainingHours || student.course_progress?.remaining || 0,
+									remainingHours: student.remainingHours || 0,
 									expiryDate: student.expiryDate || ''
-								})),
-								// 其他信息
-								available_capacity: data.available_capacity || 0,
-								enrolled_count: allStudents.length,
-								remaining_capacity: data.remaining_capacity || 0
+								}));
 							};
-						} else {
-							// 兼容旧的数据结构
+
+							// 如果是旧结构但有students数组，需要分离正式学员和等待位学员
+							const allStudents = data.students || [];
+							const formalStudents = allStudents.filter(s => s.schedule_type === 1 || s.schedule_type === null);
+							const waitingStudents = allStudents.filter(s => s.schedule_type === 2);
+
 							this.scheduleInfo = {
 								// 基本课程信息
 								id: data.id,
@@ -477,34 +534,12 @@
 								time_info: data.time_info || null,
 								// 课程时长
 								course_duration: data.time_info?.duration || data.course_duration || 60,
-								// 学员数据
-								students: (data.students || []).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 ? 'waiting' : 'formal',
-									// 确保包含年龄信息
-									age: student.age || 0,
-									// 确保包含体验课时信息
-									trialClassCount: student.trialClassCount || 0,
-									// 确保包含剩余课时和到期时间
-									remainingHours: student.remainingHours || 0,
-									expiryDate: student.expiryDate || ''
-								})),
+								// 分别存储正式学员和等待位学员
+								formal_students: processStudents(formalStudents),
+								waiting_students: processStudents(waitingStudents),
 								// 其他信息
 								available_capacity: data.available_capacity || 0,
-								enrolled_count: data.enrolled_count || 0,
+								enrolled_count: allStudents.length,
 								remaining_capacity: data.remaining_capacity || 0
 							};
 						}
@@ -554,16 +589,35 @@
 
 			// 学员点击处理
 			handleStudentClick(student, index) {
-        console.log('点击了学员:', student)
+				console.log('=== 学员点击事件触发 ===');
+				console.log('学员信息:', student);
+				console.log('学员索引:', index);
+				console.log('学员状态:', student.status);
+
+				// 检查学员签到状态，只有状态为0（待上课）才能进行签到操作
+				if (student.status !== 0) {
+					uni.showToast({
+						title: `该学员已${this.getStatusText(student.status)}，无法重复操作`,
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+
 				// 检查是否是等待位学员
 				if (student.schedule_type === 2) {
+					console.log('等待位学员,弹出升级确认');
 					// 等待位学员 - 询问是否转为正式课
 					this.handleWaitingStudentClick(student, index);
 				} else {
+					console.log('正式学员,弹出签到弹窗');
+					console.log('设置 selectedStudent:', student);
+					console.log('设置 selectedStudentIndex:', index);
 					// 正式学员 - 进行签到/请假操作
 					this.selectedStudent = student;
 					this.selectedStudentIndex = index;
 					this.showAttendanceModal = true;
+					console.log('showAttendanceModal 已设置为:', this.showAttendanceModal);
 				}
 			},
 
@@ -778,8 +832,14 @@
 							this.selectedStudent.statusClass = this.getStudentStatusClass(actionMap[action].status);
 
 							// 更新scheduleInfo中的学员信息
-							if (this.scheduleInfo && this.scheduleInfo.students && this.selectedStudentIndex >= 0) {
-								this.$set(this.scheduleInfo.students, this.selectedStudentIndex, this.selectedStudent);
+							if (this.scheduleInfo) {
+								// 判断是正式学员还是等待位学员
+								const isFormal = this.selectedStudent.schedule_type === 1 || this.selectedStudent.schedule_type === null;
+								const targetArray = isFormal ? this.scheduleInfo.formal_students : this.scheduleInfo.waiting_students;
+
+								if (targetArray && this.selectedStudentIndex >= 0) {
+									this.$set(targetArray, this.selectedStudentIndex, this.selectedStudent);
+								}
 							}
 
 							// 发射事件给父组件
@@ -854,6 +914,16 @@
 				return statusTextMap[status] || '未知状态';
 			},
 
+			// 获取签到状态样式类
+			getStatusClass(status) {
+				const statusClassMap = {
+					0: 'status-pending', // 待上课
+					1: 'status-completed', // 已上课
+					2: 'status-leave' // 请假
+				};
+				return statusClassMap[status] || '';
+			},
+
 			// 根据课程状态代码获取状态文本
 			getStatusTextFromCode(statusCode) {
 				const statusTextMap = {
@@ -921,6 +991,38 @@
 </script>
 
 <style lang="scss" scoped>
+	/* 自定义弹窗样式 */
+	.modal-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.7);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 9999;
+		padding: 20rpx;
+	}
+
+	.modal-container {
+		width: 100%;
+		max-width: 700rpx;
+		max-height: 90vh;
+		background-color: #1a1a1a;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.5);
+	}
+
+	/* 移除 fui-modal 的默认 padding */
+	::v-deep .fui-modal__body {
+		padding: 0 !important;
+	}
+
 	/* 自定义头部样式 */
 	.custom-header {
 		display: flex;
@@ -929,6 +1031,7 @@
 		padding: 20rpx 30rpx;
 		background: #2a2a2a;
 		border-bottom: 1px solid #3a3a3a;
+		flex-shrink: 0;
 	}
 
 	.modal-title {
@@ -966,7 +1069,7 @@
 
 	.schedule-detail {
 		padding: 20rpx;
-		max-height: 80vh;
+		flex: 1;
 		overflow-y: auto;
 		position: relative;
 	}
@@ -1137,6 +1240,44 @@
 		color: #ff3b30;
 	}
 
+	/* 签到状态相关样式 */
+	.attendance-status {
+		display: flex;
+		align-items: center;
+		margin: 8rpx 0;
+		font-size: 24rpx;
+	}
+
+	.status-label {
+		color: #666;
+		margin-right: 8rpx;
+	}
+
+	.status-text {
+		font-weight: 600;
+		padding: 4rpx 12rpx;
+		border-radius: 12rpx;
+		font-size: 22rpx;
+	}
+
+	.status-text.status-pending {
+		background: rgba(255, 149, 0, 0.1);
+		color: #ff9500;
+		border: 1rpx solid rgba(255, 149, 0, 0.2);
+	}
+
+	.status-text.status-completed {
+		background: rgba(41, 211, 180, 0.1);
+		color: #29d3b4;
+		border: 1rpx solid rgba(41, 211, 180, 0.2);
+	}
+
+	.status-text.status-leave {
+		background: rgba(255, 59, 48, 0.1);
+		color: #ff3b30;
+		border: 1rpx solid rgba(255, 59, 48, 0.2);
+	}
+
 	.status-absent {
 		color: #8e8e93;
 	}
@@ -1658,4 +1799,43 @@
 			box-shadow: 0 2rpx 8rpx rgba(239, 68, 68, 0.4);
 		}
 	}
+
+	/* 弹窗底部样式 */
+	.modal-footer {
+		padding: 20rpx 30rpx;
+		background: #2a2a2a;
+		border-top: 1px solid #3a3a3a;
+		flex-shrink: 0;
+		display: flex;
+		justify-content: center;
+	}
+
+	.footer-btn {
+		padding: 16rpx 60rpx;
+		border-radius: 8rpx;
+		cursor: pointer;
+		transition: all 0.3s ease;
+
+		.btn-text {
+			font-size: 28rpx;
+			font-weight: 600;
+		}
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.close-footer-btn {
+		background: #4a4a4a;
+		border: 1px solid #666;
+
+		.btn-text {
+			color: #ccc;
+		}
+
+		&:hover {
+			background: #5a5a5a;
+		}
+	}
 </style>
diff --git a/uniapp/components/student-edit-popup/student-edit-popup.less b/uniapp/components/student-edit-popup/student-edit-popup.less
index 19816d9e..5415f755 100755
--- a/uniapp/components/student-edit-popup/student-edit-popup.less
+++ b/uniapp/components/student-edit-popup/student-edit-popup.less
@@ -81,7 +81,54 @@
           
           .form-input {
             flex: 1;
-            
+
+            // 头像上传样式
+            .avatar-upload {
+              width: 160rpx;
+              height: 160rpx;
+              border-radius: 50%;
+              overflow: hidden;
+              border: 2rpx solid #e9ecef;
+              background: #f8f9fa;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              cursor: pointer;
+              transition: all 0.3s ease;
+
+              &:active {
+                background: #e9ecef;
+                transform: scale(0.95);
+              }
+
+              .avatar-preview {
+                width: 100%;
+                height: 100%;
+                border-radius: 50%;
+              }
+
+              .avatar-placeholder {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+
+                .avatar-icon {
+                  font-size: 48rpx;
+                  color: #29d3b4;
+                  margin-bottom: 8rpx;
+                  font-weight: 300;
+                }
+
+                .avatar-text {
+                  font-size: 22rpx;
+                  color: #999;
+                }
+              }
+            }
+
             input {
               width: 100%;
               height: 80rpx;
diff --git a/uniapp/components/student-edit-popup/student-edit-popup.vue b/uniapp/components/student-edit-popup/student-edit-popup.vue
index 5de1a87b..6ef9377b 100755
--- a/uniapp/components/student-edit-popup/student-edit-popup.vue
+++ b/uniapp/components/student-edit-popup/student-edit-popup.vue
@@ -13,7 +13,20 @@
             <!-- 基本信息 -->
             <view class="form-group">
               <view class="form-group-title">基本信息</view>
-              
+
+              <view class="form-item">
+                <view class="form-label">头像</view>
+                <view class="form-input">
+                  <view class="avatar-upload" @click="chooseAvatar">
+                    <image v-if="studentData.headimg" :src="studentData.headimg" class="avatar-preview" mode="aspectFill"></image>
+                    <view v-else class="avatar-placeholder">
+                      <text class="avatar-icon">+</text>
+                      <text class="avatar-text">上传头像</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
               <view class="form-item">
                 <view class="form-label required">姓名</view>
                 <view class="form-input">
@@ -151,6 +164,7 @@
 
 <script>
 import apiRoute from '@/api/apiRoute.js'
+import { uploadFile } from '@/common/util.js'
 
 export default {
   name: 'StudentEditPopup',
@@ -183,7 +197,8 @@ export default {
         consultant_id: null,
         coach_id: null,
         trial_class_count: 2, // 体验课次数|默认2（新增学员赠送）
-        actionsExpanded: false // 操作面板展开状态
+        actionsExpanded: false, // 操作面板展开状态
+        headimg: '' // 学生头像URL
       },
       
       // 选项数据
@@ -258,7 +273,8 @@ export default {
         consultant_id: student.consultant_id,
         coach_id: student.coach_id,
         trial_class_count: student.trial_class_count,
-        actionsExpanded: student.actionsExpanded || false
+        actionsExpanded: student.actionsExpanded || false,
+        headimg: student.headimg || '' // 头像URL
       }
       // 解析已有的标签数据
       this.parseExistingTags()
@@ -291,7 +307,8 @@ export default {
         consultant_id: null,
         coach_id: null,
         trial_class_count: 2,
-        actionsExpanded: false
+        actionsExpanded: false,
+        headimg: '' // 头像URL
       }
       // 重置标签选择状态
       this.selectedTagIds = []
@@ -378,7 +395,8 @@ export default {
         member_label: this.studentData.member_label,
         consultant_id: this.studentData.consultant_id,
         coach_id: this.studentData.coach_id,
-        trial_class_count: this.studentData.trial_class_count
+        trial_class_count: this.studentData.trial_class_count,
+        headimg: this.studentData.headimg // 头像URL
       }
 
       if (this.isEditing) {
@@ -466,7 +484,7 @@ export default {
         this.selectedTagIds = this.studentData.member_label.split(',')
           .map(id => parseInt(id.trim()))
           .filter(id => !isNaN(id))
-        
+
         // 更新选中的标签名称数组
         this.selectedTagNames = this.selectedTagIds.map(tagId => {
           const tag = this.studentTagOptions.find(t => t.label_id === tagId)
@@ -476,6 +494,46 @@ export default {
         this.selectedTagIds = []
         this.selectedTagNames = []
       }
+    },
+
+    // 选择头像
+    chooseAvatar() {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          const tempFilePath = res.tempFilePaths[0]
+
+          // 显示上传中提示
+          uni.showLoading({
+            title: '上传中...',
+            mask: true
+          })
+
+          // 调用uploadFile方法上传图片
+          uploadFile(
+            tempFilePath,
+            (fileData) => {
+              // 上传成功,fileData包含url、extname、name等信息
+              this.studentData.headimg = fileData.url
+              uni.hideLoading()
+              uni.showToast({
+                title: '头像上传成功',
+                icon: 'success'
+              })
+            },
+            (error) => {
+              // 上传失败
+              uni.hideLoading()
+              console.error('头像上传失败:', error)
+            }
+          )
+        },
+        fail: (err) => {
+          console.error('选择图片失败:', err)
+        }
+      })
     }
   }
 }
diff --git a/uniapp/components/student-info-card/student-info-card.vue b/uniapp/components/student-info-card/student-info-card.vue
index 39b5f574..ab34c5c1 100755
--- a/uniapp/components/student-info-card/student-info-card.vue
+++ b/uniapp/components/student-info-card/student-info-card.vue
@@ -93,18 +93,18 @@ export default {
     // 计算年龄（x岁x月）
     calculateAge(birthday) {
       if (!birthday) return ''
-      
+
       const birthDate = new Date(birthday)
       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--
@@ -113,7 +113,7 @@ export default {
           months += 12
         }
       }
-      
+
       if (years > 0 && months > 0) {
         return `${years}岁${months}月`
       } else if (years > 0) {
@@ -242,19 +242,19 @@ export default {
   margin-top: 20rpx;
   padding-top: 20rpx;
   border-top: 1rpx solid #333;
-  
+
   .info-row {
     display: flex;
     align-items: flex-start;
     margin-bottom: 15rpx;
-    
+
     .info-label {
       color: #999;
       font-size: 22rpx;
-      width: 150rpx;
+      width: 165rpx;
       flex-shrink: 0;
     }
-    
+
     .info-value {
       color: white;
       font-size: 22rpx;
@@ -271,12 +271,12 @@ export default {
   display: flex;
   flex-wrap: wrap;
   gap: 15rpx;
-  
+
   .action-btn {
     padding: 15rpx 25rpx;
     background-color: #29d3b4;
     border-radius: 25rpx;
-    
+
     .action-text {
       color: white;
       font-size: 22rpx;
@@ -284,4 +284,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/uniapp/components/study-plan-popup/study-plan-popup.vue b/uniapp/components/study-plan-popup/study-plan-popup.vue
index 37278209..2ca2d498 100755
--- a/uniapp/components/study-plan-popup/study-plan-popup.vue
+++ b/uniapp/components/study-plan-popup/study-plan-popup.vue
@@ -1,6 +1,7 @@
 <template>
-  <uni-popup ref="popup" type="center">
-    <view class="popup-container">
+  <view v-if="isVisible" class="popup-wrapper" @click="handleMaskClick">
+    <view class="popup-mask"></view>
+    <view class="popup-container" @click.stop>
       <view class="popup-header">
         <view class="popup-title">{{ isEditing ? '编辑学习计划' : '新增学习计划' }}</view>
         <view class="popup-close" @click="close">✕</view>
@@ -24,7 +25,7 @@
               </picker>
             </view>
           </view>
-          
+
           <view class="form-item">
             <view class="form-label">结束日期</view>
             <view class="form-input">
@@ -35,19 +36,19 @@
               </picker>
             </view>
           </view>
-          
+
           <view class="form-item">
             <view class="form-label">计划内容</view>
             <view class="form-input">
-              <textarea 
-                v-model="planData.plan_content" 
+              <textarea
+                v-model="planData.plan_content"
                 placeholder="请输入计划详细内容"
                 maxlength="500"
                 :show-confirm-bar="false"
               ></textarea>
             </view>
           </view>
-          
+
 <!--          <view class="form-item">-->
 <!--            <view class="form-label">状态</view>-->
 <!--            <view class="form-input">-->
@@ -65,7 +66,7 @@
         <view class="popup-btn confirm-btn" @click="confirm">确认</view>
       </view>
     </view>
-  </uni-popup>
+  </view>
 </template>
 
 <script>
@@ -99,7 +100,6 @@ export default {
       this.isEditing = false
       this.resetData()
       this.isVisible = true
-      this.$refs.popup.open()
     },
 
     // 打开编辑弹窗
@@ -113,22 +113,25 @@ export default {
         plan_content: plan.plan_content || '',
         status: plan.status || 'pending'
       }
-      
+
       // 设置选择器索引
       this.statusIndex = this.statusOptions.indexOf(this.planData.status)
-      
+
       this.isVisible = true
-      this.$refs.popup.open()
     },
 
     // 关闭弹窗
     close() {
       this.isVisible = false
-      this.$refs.popup.close()
       this.resetData()
       this.$emit('close')
     },
 
+    // 点击遮罩层关闭
+    handleMaskClick() {
+      this.close()
+    },
+
     // 重置数据
     resetData() {
       this.planData = {
@@ -253,13 +256,59 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.popup-wrapper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  animation: fadeIn 0.3s ease;
+}
+
+.popup-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 1;
+}
+
 .popup-container {
+  position: relative;
+  z-index: 2;
   width: 90vw;
   max-width: 500rpx;
   background-color: #1a1a1a;
   border-radius: 20rpx;
   border: 1px solid #333;
   overflow: hidden;
+  animation: slideUp 0.3s ease;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes slideUp {
+  from {
+    transform: translateY(100rpx);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }
 
 .popup-header {
@@ -286,7 +335,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  
+
   &:hover {
     color: #ffffff;
   }
@@ -321,7 +370,7 @@ export default {
   border-radius: 12rpx;
   border: 1px solid #404040;
   overflow: hidden;
-  
+
   input, textarea {
     width: 100%;
     padding: 20rpx;
@@ -330,12 +379,12 @@ export default {
     font-size: 28rpx;
     border: none;
     outline: none;
-    
+
     &::placeholder {
       color: #999999;
     }
   }
-  
+
   textarea {
     min-height: 120rpx;
     resize: none;
@@ -376,7 +425,7 @@ export default {
   background-color: #333333;
   color: #ffffff;
   border: 1px solid #404040;
-  
+
   &:active {
     background-color: #404040;
   }
@@ -385,7 +434,7 @@ export default {
 .confirm-btn {
   background-color: #29D3B4;
   color: #ffffff;
-  
+
   &:active {
     background-color: #24B89E;
   }
diff --git a/uniapp/pages-coach/coach/schedule/schedule_table.vue b/uniapp/pages-coach/coach/schedule/schedule_table.vue
index 5aaac5a6..81d42e8a 100755
--- a/uniapp/pages-coach/coach/schedule/schedule_table.vue
+++ b/uniapp/pages-coach/coach/schedule/schedule_table.vue
@@ -1431,61 +1431,19 @@ export default {
     },
 
     // 查看课程安排详情（使用统一API）
-    async viewScheduleDetail(scheduleId) {
-      try {
-        if (!scheduleId) {
-          uni.showToast({
-            title: '课程ID不能为空',
-            icon: 'none'
-          });
-          return;
-        }
-        
-        // 显示课程详情弹窗
-        this.selectedScheduleId = scheduleId;
-        this.showScheduleDetail = true;
-        
-        // 使用新的统一API获取课程安排详情，对接admin端功能
-        console.log('调用统一API获取课程安排详情:', scheduleId);
-        
-        // 注意：具体的API调用逻辑在ScheduleDetail组件的fetchScheduleDetail方法中实现
-        // ScheduleDetail组件会调用api.getCourseArrangementDetail()方法，与admin端保持一致
-        // 这确保了移动端和管理端使用相同的数据结构和业务逻辑
-        
-        // 预先验证API是否可用（可选的预检查）
-        try {
-          const testResponse = await api.getCourseArrangementDetail({
-            schedule_id: scheduleId
-          });
-          if (testResponse.code !== 1) {
-            console.warn('API预检查警告:', testResponse.msg);
-          }
-        } catch (preCheckError) {
-          console.warn('API预检查失败，将在ScheduleDetail组件中处理:', preCheckError);
-        }
-        
-      } catch (error) {
-        console.error('获取课程安排详情失败:', error);
-        
-        let errorMessage = '获取课程详情失败';
-        if (error.message) {
-          if (error.message.includes('timeout')) {
-            errorMessage = '请求超时，请重试';
-          } else if (error.message.includes('Network')) {
-            errorMessage = '网络连接失败';
-          }
-        }
-        
+    viewScheduleDetail(scheduleId) {
+      if (!scheduleId) {
         uni.showToast({
-          title: errorMessage,
-          icon: 'none',
-          duration: 3000
+          title: '课程ID不能为空',
+          icon: 'none'
         });
-        
-        // 即使出错也要显示弹窗，让ScheduleDetail组件处理错误
-        this.selectedScheduleId = scheduleId;
-        this.showScheduleDetail = true;
+        return;
       }
+
+      // 直接设置props，让子组件ScheduleDetail负责获取数据
+      // ScheduleDetail组件会在watch中调用api.getCourseArrangementDetail()
+      this.selectedScheduleId = scheduleId;
+      this.showScheduleDetail = true;
     },
     
     // 处理编辑课程事件
diff --git a/uniapp/pages-market/clue/class_arrangement_detail.vue b/uniapp/pages-market/clue/class_arrangement_detail.vue
index a81b99c3..7f92fcd5 100755
--- a/uniapp/pages-market/clue/class_arrangement_detail.vue
+++ b/uniapp/pages-market/clue/class_arrangement_detail.vue
@@ -29,6 +29,7 @@
           <view class="student-info">
             <view class="student-name">{{ stu.name }}</view>
             <view class="student-age">年龄：{{ stu.age || '未知' }}岁</view>
+            <view class="course-status">课程类型：{{ stu.person_type == 'customer_resource' ? '体验课' : '正式课'}}</view>
             <view class="course-status">课程状态：{{ stu.courseStatus }}</view>
             <view class="course-status">上课情况：{{ stu.course_progress.used }}/{{ stu.course_progress.total }}节</view>
             <view class="expiry-date" v-if="stu.student_course_info">到期时间：{{ stu.student_course_info.end_date || '未设置' }}</view>
diff --git a/uniapp/pages-market/clue/clue_info.vue b/uniapp/pages-market/clue/clue_info.vue
index f5803b24..f0d7964c 100755
--- a/uniapp/pages-market/clue/clue_info.vue
+++ b/uniapp/pages-market/clue/clue_info.vue
@@ -120,26 +120,16 @@
 			<CourseInfoCard v-if="currentPopup === 'course_info'" :course-list="courseInfo"
 				@view-detail="viewCourseDetail" />
 
-			<!-- 体测记录弹窗 -->
-			<view class="fitness-records-container" v-if="currentPopup === 'fitness_record'">
-				<!-- 空状态提示 -->
-				<view v-if="currentStudentFitnessRecords.length === 0" class="empty-state">
-					<view class="empty-icon">📊</view>
-					<view class="empty-text">暂无体测记录</view>
-					<view class="empty-tip">点击下方"新增"按钮添加体测记录</view>
-				</view>
-
-				<!-- 体测记录列表 -->
-				<FitnessRecordCard v-for="record in currentStudentFitnessRecords" :key="record.id" :record="record"
-					@edit="openEditFitnessRecord" />
-			</view>
-
 			<!-- 学习计划弹窗 -->
 			<StudyPlanCard v-if="currentPopup === 'study_plan'" :plan-list="studyPlanList" @edit="openEditStudyPlan" />
 
 			<!-- 订单列表弹窗 -->
-			<OrderListCard v-if="currentPopup === 'order_list'" :order-list="orderList" @add-order="openAddOrderDialog"
-				@pay-order="handlePayOrder" @view-detail="viewOrderDetail" />
+			<OrderListCard
+				v-if="currentPopup === 'order_list'"
+				:student-id="currentStudent && currentStudent.id"
+				:resource-id="clientInfo.resource_id"
+				@payment-success="handlePaymentSuccess"
+			/>
 
 			<!-- 服务列表弹窗 -->
 			<ServiceListCard v-if="currentPopup === 'service_list'" :service-list="serviceList" />
@@ -164,57 +154,22 @@
 			</view>
 		</uni-popup>
 
+		<!-- 体测记录列表弹窗 (z-index: 999) -->
+		<FitnessRecordListPopup
+			:visible="showFitnessListPopup"
+			:records="currentStudentFitnessRecords"
+			@close="closeFitnessListPopup"
+			@add="openAddFitnessRecord"
+			@edit="openEditFitnessRecord"
+		/>
+		
+		<!-- 体测记录编辑弹窗 (z-index: 1000, 使用view类型,高于列表弹窗) -->
 		<FitnessRecordPopup ref="fitnessRecordPopup" :resource-id="String(clientInfo.resource_id)"
 			:student-id="currentStudent && currentStudent.id" @confirm="handleFitnessRecordConfirm" />
 		<StudentEditPopup ref="studentEditPopup" :resource-id="clientInfo.resource_id"
 			@confirm="handleStudentEditConfirm" />
 		<StudyPlanPopup ref="studyPlanPopup" :student-id="currentStudent && currentStudent.id"
 			@confirm="handleStudyPlanConfirm" />
-
-		<!-- 新增订单弹窗 -->
-		<uni-popup ref="orderFormPopup" type="bottom">
-			<OrderFormPopup :visible="showOrderForm" :student-info="currentStudent"
-				:resource-id="clientInfo.resource_id" @cancel="closeOrderForm" @confirm="handleOrderFormConfirm" />
-		</uni-popup>
-
-		<!-- 二维码支付弹窗 -->
-		<uni-popup ref="qrCodePopup" type="center" @close="closeQRCodeModal">
-			<view class="qrcode-payment-modal" v-if="qrCodePaymentData">
-				<!-- 弹窗头部 -->
-				<view class="modal-header">
-					<text class="modal-title">扫码支付</text>
-					<view class="close-btn" @click="closeQRCodeModal">
-						<text>✕</text>
-					</view>
-				</view>
-
-				<!-- 订单信息 -->
-				<view class="order-info">
-					<view class="info-row">
-						<text class="label">订单号：</text>
-						<text class="value">{{ qrCodePaymentData.order.order_no }}</text>
-					</view>
-					<view class="info-row">
-						<text class="label">支付金额：</text>
-						<text class="amount">¥{{ qrCodePaymentData.order.total_amount }}</text>
-					</view>
-				</view>
-
-				<!-- 二维码区域 -->
-				<view class="qrcode-container">
-					<image v-if="qrCodePaymentData.qrcodeImage" :src="qrCodePaymentData.qrcodeImage"
-						class="qrcode-image" mode="aspectFit" />
-					<text v-else class="qrcode-placeholder">二维码加载中...</text>
-					<text class="qrcode-tip">请使用微信扫码完成支付</text>
-				</view>
-
-				<!-- 操作按钮 -->
-				<view class="modal-buttons">
-					<view class="btn secondary" @click="closeQRCodeModal">取消支付</view>
-					<view class="btn primary" @click="confirmQRCodePayment">发送二维码给客户</view>
-				</view>
-			</view>
-		</uni-popup>
 	</view>
 </template>
 
@@ -233,11 +188,12 @@
 	import CourseInfoCard from '@/components/course-info-card/index.vue'
 	import OrderListCard from '@/components/order-list-card/index.vue'
 	import ServiceListCard from '@/components/service-list-card/index.vue'
-	import OrderFormPopup from '@/components/order-form-popup/index.vue'
 	// 编辑弹窗
 	import StudentEditPopup from '@/components/student-edit-popup/student-edit-popup.vue'
 	import FitnessRecordPopup from '@/components/fitness-record-popup/fitness-record-popup.vue'
 	import StudyPlanPopup from '@/components/study-plan-popup/study-plan-popup.vue'
+	// 体测记录列表弹窗
+	import FitnessRecordListPopup from '@/components/fitness-record-list-popup/index.vue'
 
 	export default {
 		components: {
@@ -252,10 +208,10 @@
 			CourseInfoCard,
 			OrderListCard,
 			ServiceListCard,
-			OrderFormPopup,
 			StudentEditPopup,
 			FitnessRecordPopup,
-			StudyPlanPopup
+			StudyPlanPopup,
+			FitnessRecordListPopup
 		},
 		data() {
 			return {
@@ -280,15 +236,10 @@
 				// 底部弹窗相关
 				currentPopup: null,
 				studyPlanList: [],
-				orderList: [],
 				serviceList: [],
-
-				// 订单表单弹窗
-				showOrderForm: false,
-
-				// 二维码支付弹窗
-				showQRCodeModal: false,
-				qrCodePaymentData: null,
+				
+				// 体测记录列表弹窗
+				showFitnessListPopup: false,
 
 				// 编辑相关
 				remark_content: '',
@@ -386,8 +337,8 @@
 			},
 
 			showAddButton() {
-				// 只有体测记录和学习计划弹窗显示新增按钮
-				return ['fitness_record', 'study_plan'].includes(this.currentPopup)
+				// 只有学习计划弹窗显示新增按钮
+				return ['study_plan'].includes(this.currentPopup)
 			},
 
 		},
@@ -587,15 +538,16 @@
 						this.currentPopup = 'course_info'
 						break
 					case 'fitness_record':
-						await this.getFitnessRecords(student.id)
-						this.currentPopup = 'fitness_record'
-						break
+					await this.getFitnessRecords(student.id)
+					// 使用新的体测记录列表弹窗组件
+					this.showFitnessListPopup = true
+					break
 					case 'study_plan':
 						await this.getStudyPlanList(student.id)
 						this.currentPopup = 'study_plan'
 						break
 					case 'order_list':
-						await this.getOrderList(student.id)
+						// 订单列表由组件内部自动加载,只需打开弹窗
 						this.currentPopup = 'order_list'
 						break
 					case 'service_list':
@@ -610,16 +562,17 @@
 				this.currentPopup = null
 				// 重置相关数据
 				this.studyPlanList = []
-				this.orderList = []
 				this.serviceList = []
 				this.courseInfo = []
-				this.fitnessRecords = []
+				// 不重置体测记录,由专门的组件管理
+			},
+			
+			closeFitnessListPopup() {
+				this.showFitnessListPopup = false
 			},
 
 			handleAddAction() {
-				if (this.currentPopup === 'fitness_record') {
-					this.openAddFitnessRecord()
-				} else if (this.currentPopup === 'study_plan') {
+				if (this.currentPopup === 'study_plan') {
 					this.openAddStudyPlan()
 				}
 			},
@@ -1217,563 +1170,12 @@
 				}
 			},
 
-			// 获取订单列表
-			async getOrderList(studentId = null) {
-				if (!this.clientInfo?.resource_id) return
-
-				try {
-					const targetStudentId = studentId || this.currentStudent?.id
-
-					// 构建查询参数，优先使用student_id
-					const params = {}
-					if (targetStudentId) {
-						params.student_id = targetStudentId
-					} else if (this.clientInfo.resource_id) {
-						params.resource_id = this.clientInfo.resource_id
-					} else {
-						console.warn('缺少查询参数')
-						this.orderList = []
-						return
-					}
-
-					const res = await apiRoute.xs_orderTableList(params)
-
-					if (res.code === 1) {
-						// 处理API返回的数据格式
-						this.orderList = this.processOrderData(res.data?.data || [])
-					} else {
-						console.error('获取订单列表失败:', res.msg)
-						this.orderList = []
-					}
-				} catch (error) {
-					console.error('获取订单列表异常:', error)
-					this.orderList = []
-				}
-			},
-
-			// 处理订单数据格式，适配前端组件
-			processOrderData(orders) {
-				if (!Array.isArray(orders)) return []
-
-				return orders.map(order => ({
-					id: order.id,
-					student_id: order.student_id,
-					order_no: order.payment_id || `ORD${order.id}`, // 使用payment_id作为订单号
-					product_name: order.course_id_name || '课程',
-					total_amount: order.order_amount || '0.00',
-					paid_amount: order.order_status === 'paid' ? order.order_amount : '0.00',
-					unpaid_amount: order.order_status === 'paid' ? '0.00' : order.order_amount,
-					payment_method: this.formatPaymentType(order.payment_type),
-					salesperson_name: order.staff_id_name || '未指定',
-					course_count: order.total_hours || 0, // 使用课时数
-					status: this.mapOrderStatus(order.order_status),
-					create_time: order.created_at,
-					// 新增合同相关字段
-					contract_id: order.contract_id,
-					contract_sign_id: order.contract_sign_id,
-					// 保留原始数据
-					_raw: order
-				}))
-			},
-
-			// 格式化支付类型
-			formatPaymentType(paymentType) {
-				const typeMap = {
-					'cash': '现金支付',
-					'scan_code': '扫码支付',
-					'subscription': '订阅支付',
-					'wxpay_online': '微信在线代付'
-				}
-				return typeMap[paymentType] || paymentType || '未知'
-			},
-
-			// 映射订单状态
-			mapOrderStatus(orderStatus) {
-				const statusMap = {
-					'pending': 'pending',
-					'paid': 'paid',
-					'signed': 'completed',
-					'completed': 'completed',
-					'transfer': 'partial'
-				}
-				return statusMap[orderStatus] || 'pending'
-			},
-
-			// 获取服务列表
-			async getServiceList(studentId = null) {
-				if (!this.clientInfo?.resource_id) return
-				const targetStudentId = studentId || this.currentStudent?.id
-
-				if (!targetStudentId) {
-					uni.showToast({
-						title: '请先选择学生',
-						icon: 'none'
-					})
-					return
-				}
-
-				try {
-					const response = await apiRoute.getStudentServiceList({
-						student_id: targetStudentId
-					})
-
-					if (response.code === 1) {
-						this.serviceList = response.data || []
-					} else {
-						console.error('获取服务记录失败:', response.msg)
-						uni.showToast({
-							title: response.msg || '获取服务记录失败',
-							icon: 'none'
-						})
-						this.serviceList = []
-					}
-				} catch (error) {
-					console.error('获取服务记录异常:', error)
-					uni.showToast({
-						title: '网络请求失败',
-						icon: 'none'
-					})
-					this.serviceList = []
-				}
-			},
-
-			// 打开新增订单弹窗
-			openAddOrderDialog() {
-				if (!this.currentStudent) {
-					uni.showToast({
-						title: '请先选择学生',
-						icon: 'none'
-					})
-					return
-				}
-
-				// 先关闭订单列表弹窗，避免遮挡新增订单弹窗
-				this.closePopup()
-
-				this.showOrderForm = true
-				this.$refs.orderFormPopup.open()
-			},
-
-			// 关闭新增订单弹窗
-			closeOrderForm() {
-				this.showOrderForm = false
-				this.$refs.orderFormPopup.close()
-			},
-
-			// 订单表单确认处理
-			async handleOrderFormConfirm() {
-				try {
-					// 关闽弹窗
-					this.closeOrderForm()
-
-					// 刷新订单列表
-					await this.getOrderList()
-
-					uni.showToast({
-						title: '订单创建成功',
-						icon: 'success'
-					})
-				} catch (error) {
-					console.error('处理订单确认失败:', error)
-				}
-			},
-
-			// 处理订单支付
-			handlePayOrder(order) {
-				// 关闭当前弹窗
-				this.closePopup()
-
-				// 根据支付类型处理不同的支付流程
-				this.processPayment(order)
-			},
-
-			// 处理支付流程
-			async processPayment(order) {
-				const paymentType = order._raw?.payment_type || order.payment_type
-				console.log('paymentType', paymentType)
-				try {
-					switch (paymentType) {
-						case 'cash':
-							// 现金支付 - 直接标记为已支付
-							await this.confirmCashPayment(order)
-							break
-						case 'scan_code':
-							// 扫码支付 - 显示二维码
-							this.showQRCodePayment(order)
-							break
-						case 'subscription':
-							// 订阅支付 - 分期支付流程
-							this.showSubscriptionPayment(order)
-							break
-						case 'wxpay_online':
-							// 微信在线代付 - 调用微信支付
-							this.showWechatPayment(order)
-							break
-						default:
-							uni.showToast({
-								title: '不支持的支付方式',
-								icon: 'none'
-							})
-					}
-				} catch (error) {
-					console.error('支付处理失败:', error)
-					uni.showToast({
-						title: '支付处理失败',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 现金支付确认
-			async confirmCashPayment(order) {
-				uni.showModal({
-					title: '现金支付确认',
-					content: `确认已收到现金支付 ¥${order.total_amount}？`,
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								// 调用API更新订单状态为已支付
-								const updateData = {
-									order_id: order._raw?.id || order.id,
-									order_status: 'paid',
-									payment_id: `CASH${Date.now()}` // 生成现金支付单号
-								}
-
-								const result = await apiRoute.xs_orderTableUpdatePaymentStatus(updateData)
-
-								if (result.code === 1) {
-									uni.showToast({
-										title: '支付确认成功',
-										icon: 'success'
-									})
-									// 刷新订单列表
-									await this.getOrderList()
-								} else {
-									uni.showToast({
-										title: result.msg || '支付确认失败',
-										icon: 'none'
-									})
-								}
-							} catch (error) {
-								console.error('现金支付确认失败:', error)
-								uni.showToast({
-									title: '支付确认失败',
-									icon: 'none'
-								})
-							}
-						}
-					}
-				})
-			},
-
-			// 扫码支付
-			async showQRCodePayment(order) {
-				console.log('扫码支付:', order)
-
-				try {
-					uni.showLoading({
-						title: '生成支付二维码...'
-					})
-
-					// 调用接口获取支付二维码
-					const res = await apiRoute.getOrderPayQrcode({
-						order_id: order._raw?.id || order.id
-					})
-
-					uni.hideLoading()
-
-					if (res.code === 1 && res.data) {
-						// 显示二维码支付弹窗
-						this.openQRCodeModal({
-							order: order,
-							qrcode: res.data.code_url,
-							// 优先使用base64编码的二维码（解决微信小程序无法访问localhost的问题）
-							qrcodeImage: res.data.qrcode_base64 || res.data.qrcode_url
-						})
-					} else {
-						uni.showToast({
-							title: res.msg || '获取支付二维码失败',
-							icon: 'none'
-						})
-					}
-				} catch (error) {
-					uni.hideLoading()
-					console.error('获取支付二维码失败:', error)
-					uni.showToast({
-						title: '获取支付二维码失败',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 打开二维码支付弹窗
-			openQRCodeModal(paymentData) {
-				this.qrCodePaymentData = paymentData
-				this.showQRCodeModal = true
-				this.$refs.qrCodePopup.open()
-			},
-
-			// 关闭二维码支付弹窗
-			closeQRCodeModal() {
-				this.showQRCodeModal = false
-				this.qrCodePaymentData = null
-				this.$refs.qrCodePopup.close()
-			},
-
-			// 确认二维码支付完成
-			async confirmQRCodePayment() {
-				if (!this.qrCodePaymentData?.order) return
-
-				const order = this.qrCodePaymentData.order
-
-				uni.showModal({
-					title: '支付确认',
-					content: '请确认是否已完成扫码支付？',
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								// 更新订单状态为已支付
-								await this.updateOrderStatus(order, 'paid', `QR${Date.now()}`)
-								this.closeQRCodeModal()
-							} catch (error) {
-								console.error('支付确认失败:', error)
-								uni.showToast({
-									title: '支付确认失败',
-									icon: 'none'
-								})
-							}
-						}
-					}
-				})
-			},
-
-			// 订阅支付
-			showSubscriptionPayment(order) {
-				uni.showActionSheet({
-					itemList: ['确认分期支付方案', '取消支付'],
-					success: async (res) => {
-						if (res.tapIndex === 0) {
-							uni.showModal({
-								title: '分期支付确认',
-								content: `确认使用分期支付方式支付 ¥${order.total_amount}？`,
-								success: async (modalRes) => {
-									if (modalRes.confirm) {
-										// 这里可以设置为部分支付状态
-										await this.updateOrderStatus(order, 'partial',
-											`SUB${Date.now()}`)
-									}
-								}
-							})
-						}
-					}
-				})
-			},
-
-			// 微信支付
-			showWechatPayment(order) {
-				uni.showModal({
-					title: '微信支付',
-					content: `将调用微信支付 ¥${order.total_amount}`,
-					confirmText: '确认支付',
-					cancelText: '取消',
-					success: async (res) => {
-						if (res.confirm) {
-							// 模拟微信支付流程
-							uni.showLoading({
-								title: '正在调用微信支付...'
-							})
-
-							// 模拟支付延时
-							setTimeout(async () => {
-								uni.hideLoading()
-
-								// 模拟支付结果（实际应该调用微信支付API）
-								uni.showModal({
-									title: '支付结果',
-									content: '微信支付完成，请确认是否已收到款项？',
-									success: async (confirmRes) => {
-										if (confirmRes.confirm) {
-											await this.updateOrderStatus(order, 'paid',
-												`WX${Date.now()}`)
-										}
-									}
-								})
-							}, 1500)
-						}
-					}
-				})
-			},
-
-			// 统一的订单状态更新方法
-			async updateOrderStatus(order, status, paymentId = '') {
-				try {
-					const updateData = {
-						order_id: order._raw?.id || order.id,
-						order_status: status,
-						payment_id: paymentId
-					}
-
-					const result = await apiRoute.xs_orderTableUpdatePaymentStatus(updateData)
-
-					if (result.code === 1) {
-						const statusText = {
-							'paid': '支付成功',
-							'partial': '分期支付确认成功',
-							'cancelled': '支付已取消'
-						}
-						uni.showToast({
-							title: statusText[status] || '状态更新成功',
-							icon: 'success'
-						})
-						// 刷新订单列表
-						await this.getOrderList()
-					} else {
-						uni.showToast({
-							title: result.msg || '状态更新失败',
-							icon: 'none'
-						})
-					}
-				} catch (error) {
-					console.error('更新订单状态失败:', error)
-					uni.showToast({
-						title: '状态更新失败',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 查看订单详情
-			viewOrderDetail(order) {
-				const orderInfo = order._raw || order
-				const detailText = `
-订单号：${order.order_no}
-课程：${order.product_name}
-金额：¥${order.total_amount}
-已付：¥${order.paid_amount}
-未付：¥${order.unpaid_amount}
-支付方式：${order.payment_method}
-销售顾问：${order.salesperson_name}
-课时数：${order.course_count}节
-状态：${this.getOrderStatusText(order.status)}
-创建时间：${this.formatOrderTime(order.create_time)}
-${orderInfo.paid_at ? '支付时间：' + this.formatOrderTime(orderInfo.paid_at) : ''}
-      `.trim()
-
-				// 检查是否为已支付订单，显示不同的按钮
-				const isOrderPaid = order.status === 'paid'
-
-				const buttons = isOrderPaid ? ['知道了', '合同签署'] : ['知道了']
-				console.log('订单数据', order)
-				uni.showModal({
-					title: '订单详情',
-					content: detailText,
-					showCancel: isOrderPaid,
-					cancelText: isOrderPaid ? '知道了' : '',
-					confirmText: isOrderPaid ? '合同签署' : '知道了',
-					success: (res) => {
-						if (res.confirm && isOrderPaid) {
-							// 点击了合同签署按钮
-							this.goToContractSign(order)
-						}
-					}
-				})
-			},
-
-			// 跳转到合同签署页面
-			goToContractSign(order) {
-				// 检查必要参数
-				const studentId = order.student_id || this.currentStudent?.id
-				const contractId = order.contract_id || order._raw?.contract_id
-				const contractSignId = order.contract_sign_id || order._raw?.contract_sign_id
-
-				if (!studentId) {
-					uni.showToast({
-						title: '缺少学生信息',
-						icon: 'none'
-					})
-					return
-				}
-
-				if (!contractId) {
-					// 如果订单中没有合同模板ID，尝试从课程信息获取
-					this.getContractByOrder(order, studentId)
-					return
-				}
-
-				// 构建跳转参数
-				let url =
-					`/pages-student/contracts/sign?contract_id=${contractId}&student_id=${studentId}&contract_name=${encodeURIComponent(order.product_name + '合同')}&user_role=staff`
-
-				// 如果有合同签署记录ID，也传递过去（用于已存在的签署记录）
-				if (contractSignId) {
-					url += `&contract_sign_id=${contractSignId}`
-				}
-
-				// 跳转到学员端合同签署页面
-				uni.navigateTo({
-					url: url
-				})
-			},
-
-			// 根据订单获取合同信息
-			async getContractByOrder(order, studentId) {
-				try {
-					uni.showLoading({
-						title: '获取合同信息...'
-					})
-
-					// 调用API获取订单对应的合同
-					const res = await apiRoute.getContractByOrder({
-						order_id: order._raw?.id || order.id,
-						student_id: studentId
-					})
-
-					uni.hideLoading()
-
-					if (res.code === 1 && res.data) {
-						const contractInfo = res.data
-						// 跳转到合同签署页面
-						uni.navigateTo({
-							url: `/pages-student/contracts/sign?contract_id=${contractInfo.contract_id}&student_id=${studentId}&contract_name=${encodeURIComponent(contractInfo.contract_name || order.product_name + '合同')}&user_role=staff`
-						})
-					} else {
-						uni.showToast({
-							title: res.msg || '未找到相关合同',
-							icon: 'none'
-						})
-					}
-				} catch (error) {
-					uni.hideLoading()
-					console.error('获取合同信息失败:', error)
-					uni.showToast({
-						title: '获取合同信息失败',
-						icon: 'none'
-					})
-				}
-			},
-
-			// 获取订单状态文本
-			getOrderStatusText(status) {
-				const statusMap = {
-					'pending': '待支付',
-					'paid': '已支付',
-					'partial': '部分支付',
-					'cancelled': '已取消',
-					'completed': '已完成',
-					'refunded': '已退款'
-				}
-				return statusMap[status] || '未知状态'
-			},
-
-			// 格式化订单时间
-			formatOrderTime(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
-				}
+			/**
+			 * 订单支付成功回调
+			 */
+			handlePaymentSuccess(order) {
+				console.log('订单支付成功:', order)
+				// 可以在这里添加支付成功后的业务逻辑,例如刷新其他相关数据
 			},
 
 			// 获取赠品记录列表
@@ -1801,28 +1203,5 @@ ${orderInfo.paid_at ? '支付时间：' + this.formatOrderTime(orderInfo.paid_at
 </script>
 
 <style lang="less" scoped>
-	.fitness-records-container {
-		max-height: 60vh;
-		overflow-y: auto;
-	}
-
-	/* 滚动条样式 */
-	.fitness-records-container::-webkit-scrollbar {
-		width: 6rpx;
-	}
-
-	.fitness-records-container::-webkit-scrollbar-track {
-		background: transparent;
-	}
-
-	.fitness-records-container::-webkit-scrollbar-thumb {
-		background: #29D3B4;
-		border-radius: 3rpx;
-	}
-
-	.fitness-records-container::-webkit-scrollbar-thumb:hover {
-		background: #24B89E;
-	}
-
 	@import './clue_info.less';
 </style>
diff --git a/uniapp/pages-market/clue/edit_clues.vue b/uniapp/pages-market/clue/edit_clues.vue
index d8ac24f7..ff389036 100755
--- a/uniapp/pages-market/clue/edit_clues.vue
+++ b/uniapp/pages-market/clue/edit_clues.vue
@@ -45,13 +45,13 @@
 							</view>
 						</fui-form-item>
 						<!-- 来源渠道 -->
-						<fui-form-item 
+						<fui-form-item
 							v-if="formData.source == 1"
-							label="来源渠道" 
-							labelSize='26' 
-							prop="source_channel" 
-							background='#434544' 
-							labelColor='#fff' 
+							label="来源渠道"
+							labelSize='26'
+							prop="source_channel"
+							background='#434544'
+							labelColor='#fff'
 							:bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
 								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('source_channel')">
@@ -172,7 +172,7 @@
 								</view>
 							</view>
 						</fui-form-item> -->
-						
+
 						<fui-form-item labelWidth="240" label="2、承诺到访时间" labelSize='26' prop="promised_visit_time" background='#434544' labelColor='#fff' :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
 								<fui-input :borderBottom="false" :padding="[0]" placeholder="填写承诺到访时间" v-model="formData.promised_visit_time" backgroundColor="#434544" size="26" color="#fff" ></fui-input>
@@ -223,7 +223,7 @@
 								</fui-radio-group>
 							</view>
 						</fui-form-item>
-						
+
 						<!-- 沟通备注 -->
 						<fui-form-item label="沟通备注" labelSize='26' prop="communication" background='#434544' labelColor='#fff' :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
@@ -255,7 +255,7 @@
 								<fui-textarea v-model="formData.first_visit_status" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
 							</view>
 						</fui-form-item>
-						
+
 						<!-- 二访时间 -->
 						<fui-form-item label="二访时间" labelSize='26' prop="second_visit_time" background='#434544' labelColor='#fff'  :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;" @click="openDate('second_visit_time')">
@@ -268,13 +268,13 @@
 								<fui-textarea v-model="formData.second_visit_status" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
 							</view>
 						</fui-form-item>
-						
+
 						<fui-form-item label="追单标注" labelSize='26' prop="chasing_orders" background='#434544' labelColor='#fff'  :bottomBorder='false'>
 							<view class="textarea-container">
 								<fui-textarea v-model="formData.chasing_orders" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
 							</view>
 						</fui-form-item>
-						
+
 						<fui-form-item label="是否报名" labelSize='26' prop="is_bm" background='#434544' labelColor='#fff'  :bottomBorder='false'>
 							<view class="input-title" style="margin-right:14rpx;">
 								<fui-radio-group name="radio" v-model="formData.is_bm" :disabled="true">
@@ -295,7 +295,7 @@
 								</fui-radio-group>
 							</view>
 						</fui-form-item>
-						
+
 						<!-- 面咨备注 -->
 						<fui-form-item label="面咨备注" labelSize='26' prop="consultation_remark" background='#434544' labelColor='#fff'  :bottomBorder='false'>
 							<view class="textarea-container">
@@ -313,10 +313,10 @@
 
 		<!-- 选择器、日期选择等控件保留原有 -->
 		<fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date" :value="default_date_value"></fui-date-picker>
-		
+
 		<!-- 日期时间选择器 -->
 		<fui-date-picker :show="datetime_picker_show" type="5" @change="change_datetime" @cancel="cancel_datetime" :value="default_datetime_value"></fui-date-picker>
-		
+
 		<fui-picker :linkage='picker_linkage' :options="picker_options" :layer="1" :show="picker_show" @change="changeCicker" @cancel="cancelCicker"></fui-picker>
 
 		<!-- 快速填写弹窗 -->
@@ -333,8 +333,8 @@
 						<text>请粘贴包含客户信息的文本，支持格式：</text>
 						<text>姓名：张三，电话：13800138000，校区：测试校区</text>
 					</view>
-					<textarea 
-						class="quick-fill-textarea" 
+					<textarea
+						class="quick-fill-textarea"
 						placeholder="请粘贴客户信息文本..."
 						v-model="quickFillText"
 						:maxlength="1000"
@@ -362,11 +362,11 @@
 				is_submit: true, //是否提交(防止重复提交)|true=可提交,false=不可提交
 
 				resource_sharing_id: '', //resource_sharing_id(资源共享表id)
-				
+
 				// 快速填写相关
 				showQuickFill: false, // 是否显示快速填写弹窗
 				quickFillText: '', // 快速填写文本内容
-				
+
 				//表单
 				formData: {
 					// 客户基础信息
@@ -489,7 +489,7 @@
 				data_picker_input_name: '', //时间组件的input_name
 				date_picker_show: false, //时间选择器是否展示
 				default_date_value: '', // 添加默认日期值
-				
+
 				// 日期时间选择组件
 				datetime_picker_input_name: '', //日期时间组件的input_name
 				datetime_picker_show: false, //日期时间选择器是否展示
@@ -497,7 +497,7 @@
 
 
 
-				// 查重相关  
+				// 查重相关
 				clientUserList: [], //查重用户列表
 				showDuplicateCheck: false, //是否显示查重弹出层
 
@@ -520,14 +520,14 @@
 		},
 		onLoad(options) {
 			console.log('onLoad - 接收到参数:', options);
-			
+
 			// 检查参数是否存在
 			if (!options) {
 				console.error('onLoad - 未接收到任何参数');
 				this.showParameterError();
 				return;
 			}
-			
+
 			// 检查 resource_sharing_id 参数，支持多种参数名称
 			const resourceSharingId = options.resource_sharing_id || options.id || options.resourceSharingId;
 			if (!resourceSharingId) {
@@ -536,7 +536,7 @@
 				this.showParameterError();
 				return;
 			}
-			
+
 			this.resource_sharing_id = String(resourceSharingId);
 			console.log('onLoad - 成功设置 resource_sharing_id:', this.resource_sharing_id);
 		},
@@ -556,39 +556,39 @@
 					uni.navigateBack();
 				}, 2000);
 			},
-			
+
 			//初始化
 			async init() {
 				try {
 					console.log('init - 开始初始化流程');
-					
+
 					if (!this.resource_sharing_id) {
 						console.error('init - resource_sharing_id 为空，无法初始化');
 						this.showParameterError();
 						return;
 					}
-					
+
 					uni.showLoading({
 						title: '加载中...',
 						mask: true
 					});
-					
+
 					console.log('init - 开始加载字典数据');
-					
+
 					// 批量加载所有字典数据
 					await this.getBatchDictData();
 					console.log('init - 字典数据加载完成');
-					
+
 					// 加载校区列表
 					console.log('init - 开始加载校区列表');
 					await this.get_campus_list();
 					console.log('init - 校区列表加载完成');
-					
+
 					// 获取资源共享详情并回显数据
 					console.log('init - 开始获取客户详情');
 					await this.getInfo();
 					console.log('init - 客户详情获取完成');
-					
+
 				} catch (error) {
 					console.error('初始化失败:', error);
 					uni.showToast({
@@ -599,7 +599,7 @@
 					uni.hideLoading();
 				}
 			},
-			
+
 			// 批量获取字典数据
 			async getBatchDictData() {
 				const dictMapping = {
@@ -613,7 +613,7 @@
 					'distance': 'distance',
 					'emotional_stickiness_score': 'emotional_stickiness_score'
 				};
-				
+
 				try {
 					const batchResult = await apiRoute.common_getBatchDict(Object.keys(dictMapping));
 					if (batchResult?.code === 1 && batchResult.data) {
@@ -627,11 +627,11 @@
 				} catch (error) {
 					console.error('批量字典接口失败:', error);
 				}
-				
+
 				// 回退到单个获取
 				const priorityKeys = ['source_channel', 'source'];
 				const otherKeys = ['purchasing_power', 'initial_intent', 'cognitive_idea', 'status', 'decision_maker', 'distance', 'emotional_stickiness_score'];
-				
+
 				try {
 					await Promise.all(priorityKeys.map(key => this.getDict(key)));
 					setTimeout(() => {
@@ -645,18 +645,18 @@
 			// 处理字典数据
 			processDictData(localKey, dictData) {
 				if (!Array.isArray(dictData) || !dictData.length) return;
-				
+
 				let options = dictData.map(item => ({ text: item.name || '', value: item.value || '' }));
 				if (localKey === 'source_channel') {
 					options.unshift({ text: '线下', value: '0' });
 				}
-				
+
 				this.picker_config[localKey] = this.picker_config[localKey] || { text: '点击选择' };
 				this.picker_config[localKey].options = options;
 			},
-			
+
 			async get_campus_list(){
-			
+
 				let res = await apiRoute.common_getCampusesList({})
 				if (res.code != 1) {
 				  uni.showToast({
@@ -665,10 +665,10 @@
 				  })
 				  return
 				}
-				
+
 				this.campus_list = res.data
-				
-				
+
+
 				let arr = []
 				this.campus_list.forEach((v,k)=>{
 				  arr.push({
@@ -676,29 +676,25 @@
 				    value: v.id,
 				  })
 				})
-				
+
 				this.picker_config['campus'].options = arr
-				
+
 			},
 
 			//获取资源共享-详情(客户资源详情)
 			async getInfo() {
 				try {
-					console.log('getInfo - 开始获取客户详情, resource_sharing_id:', this.resource_sharing_id);
-					
 					if (!this.resource_sharing_id) {
 						console.error('getInfo - resource_sharing_id 为空，无法获取客户详情');
 						return;
 					}
-					
+
 					let params = {
 						resource_sharing_id: this.resource_sharing_id
 					};
 
-					console.log('getInfo - 发起请求:', params);
 					let res = await apiRoute.xs_resourceSharingInfo(params); //资源共享-详情(客户资源详情)
-					console.log('getInfo - 请求响应:', res);
-					
+
 					if (res.code != 1) {
 						console.error('getInfo - 请求失败:', res.msg);
 						uni.showToast({
@@ -710,8 +706,6 @@
 
 					let customerResource = res.data.customerResource || {}; //客户资源详情
 					let sixSpeed = res.data.customerResource.sixSpeed || {}; //六要素详情
-					console.log('getInfo - 客户资源详情:', customerResource);
-					console.log('getInfo - 六要素详情:', sixSpeed);
 
 					// 存储原始数据，用于后续回显
 					this._resourceDetail = res.data;
@@ -754,39 +748,40 @@
 						call_intent: sixSpeed.call_intent || '2', // 是否加微信
 						emotional_stickiness_score: sixSpeed.emotional_stickiness_score || '', // 情感粘度
 					};
-					
-					console.log('getInfo - 表单数据设置完成:', this.formData);
+
+					console.log('getInfo - 表单数据设置完成:',sixSpeed.promised_visit_time);
 
 					// 格式化日期时间
-					if (sixSpeed.promised_visit_time) {
+					// if (sixSpeed.promised_visit_time) {
+          //   console.log('getInfo - 开始格式化日期时间',sixSpeed.promised_visit_time.includes(' '));
 						// 如果包含时间部分，保持原格式；否则只格式化日期部分
-						if (sixSpeed.promised_visit_time.includes(' ')) {
-							this.formData.promised_visit_time = sixSpeed.promised_visit_time;
-						} else {
-							this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');
-						}
-					}
-					
+					// 	if (sixSpeed.promised_visit_time.includes(' ')) {
+					// 		this.formData.promised_visit_time = sixSpeed.promised_visit_time;
+					// 	} else {
+					// 		this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');
+					// 	}
+					// }
+
 					// 可选上课时间保持原始文本格式，不做日期格式化
 					if (sixSpeed.preferred_class_time) {
 						this.formData.optional_class_time = sixSpeed.preferred_class_time;
 					}
-					
+
 					if (sixSpeed.first_visit_time) {
 						this.formData.first_visit_time = this.$util.formatToDateTime(sixSpeed.first_visit_time, 'Y-m-d');
 					}
-					
+
 					if (sixSpeed.second_visit_time) {
 						this.formData.second_visit_time = this.$util.formatToDateTime(sixSpeed.second_visit_time, 'Y-m-d');
 					}
-					
+
 					console.log('getInfo - 日期格式化完成');
-					
+
 					// 设置选择器文本回显
 					console.log('getInfo - 开始设置选择器文本回显');
 					await this.setPickerText();
 					console.log('getInfo - 选择器文本回显完成');
-					
+
 				} catch (error) {
 					console.error('获取客户详情失败:', error);
 					uni.showToast({
@@ -800,7 +795,7 @@
 			async setPickerText() {
 				try {
 					const { customerResource = {}, sixSpeed = {} } = await this.getResourceDetail() || {};
-					
+
 					// 设置选择器文本回显
 					this.setPickerTextByValue('source_channel', this.formData.source_channel, customerResource.source_channel_name);
 					this.setPickerTextByValue('source', this.formData.source, customerResource.source_name);
@@ -810,14 +805,14 @@
 					this.setPickerTextByValue('decision_maker', this.formData.decision_maker, customerResource.decision_maker_name);
 					this.setPickerTextByValue('campus', this.formData.campus, customerResource.campus_name);
 					this.setPickerTextByValue('customer_type', this.formData.customer_type, customerResource.customer_type_name);
-					
+
 					// 六要素相关
 					this.setPickerTextByValue('purchasing_power', this.formData.purchasing_power, sixSpeed.purchase_power_name);
 					this.setPickerTextByValue('cognitive_idea', this.formData.cognitive_idea, sixSpeed.concept_awareness_name);
 					this.setPickerTextByValue('distance', this.formData.distance, sixSpeed.distance_name);
 					this.setPickerTextByValue('emotional_stickiness_score', this.formData.emotional_stickiness_score, sixSpeed.emotional_stickiness_score_name);
 					// 不再需要设置call_intent的选择器文本，因为已改为单选组件
-					
+
 					console.log('选择器文本回显完成');
 				} catch (error) {
 					console.error('设置选择器文本回显失败:', error);
@@ -832,12 +827,12 @@
 					this.picker_config[pickerName].text = '点击选择';
 					return;
 				}
-				
+
 				// 创建映射缓存，避免重复查找
 				if (!this._valueTextMapping) {
 					this._valueTextMapping = {};
 				}
-				
+
 				// 检查缓存
 				const cacheKey = `${pickerName}_${value}`;
 				if (this._valueTextMapping[cacheKey]) {
@@ -845,16 +840,16 @@
 					this.picker_config[pickerName].text = this._valueTextMapping[cacheKey];
 					return;
 				}
-				
+
 				// 确保 picker_config[pickerName] 存在
 				if (!this.picker_config[pickerName]) {
 					this.picker_config[pickerName] = { options: [] };
 				}
-				
+
 				// 先尝试从选项中找到匹配的文本
 				const options = this.picker_config[pickerName].options || [];
 				const option = options.find(opt => String(opt.value) === String(value));
-				
+
 				let textValue;
 				if (option) {
 					textValue = option.text;
@@ -864,7 +859,7 @@
 				} else {
 					textValue = '点击选择';
 				}
-				
+
 				// 保存到缓存
 				this._valueTextMapping[cacheKey] = textValue;
 				this.picker_config[pickerName].text = textValue;
@@ -875,11 +870,11 @@
 				if (this._resourceDetail) {
 					return this._resourceDetail
 				}
-				
+
 				let params = {
 					resource_sharing_id: this.resource_sharing_id
 				}
-				
+
 				let res = await apiRoute.xs_resourceSharingInfo(params)
 				if (res.code == 1) {
 					this._resourceDetail = res.data
@@ -902,14 +897,14 @@
 					customer_type: 'customer_type',
 					emotional_stickiness_score: 'emotional_stickiness_score'
 				};
-				
+
 				const key = keyMap[inputName];
 				if (!key) return;
-				
+
 				try {
 					const dictionary = await this.$util.getDict(key);
 					if (!dictionary?.length) return;
-					
+
 					this.processDictData(inputName, dictionary);
 				} catch (error) {
 					console.error(`获取字典 ${inputName} 失败:`, error);
@@ -1000,7 +995,7 @@
 				this.showQuickFill = true
 				this.quickFillText = ''
 			},
-			
+
 			// 解析快速填写文本
 			parseQuickFillText() {
 				if (!this.quickFillText.trim()) {
@@ -1010,7 +1005,7 @@
 					})
 					return
 				}
-				
+
 				try {
 					// 定义字段映射规则
 					const fieldRules = [
@@ -1020,11 +1015,11 @@
 						{ key: 'age', patterns: ['年龄'] },
 						{ key: 'birthday', patterns: ['生日', '出生日期', '生日日期'] }
 					]
-					
+
 					// 用于存储解析结果
 					const parsedData = {}
 					const text = this.quickFillText.trim()
-					
+
 					// 对每个字段规则进行匹配
 					fieldRules.forEach(rule => {
 						rule.patterns.forEach(pattern => {
@@ -1036,9 +1031,9 @@
 							}
 						})
 					})
-					
+
 					console.log('解析结果:', parsedData)
-					
+
 					// 填写到表单中
 					let fillCount = 0
 					if (parsedData.name) {
@@ -1065,7 +1060,7 @@
 						this.formData.birthday = parsedData.birthday
 						fillCount++
 					}
-					
+
 					if (fillCount > 0) {
 						uni.showToast({
 							title: `成功填写${fillCount}个字段`,
@@ -1078,7 +1073,7 @@
 							icon: 'none'
 						})
 					}
-					
+
 				} catch (error) {
 					console.error('解析失败:', error)
 					uni.showToast({
@@ -1087,14 +1082,14 @@
 					})
 				}
 			},
-			
+
 			// 查找并设置校区
 			findAndSetCampus(campusText) {
 				const campusOptions = this.picker_config.campus?.options || []
-				const matchedCampus = campusOptions.find(option => 
+				const matchedCampus = campusOptions.find(option =>
 					option.text.includes(campusText) || campusText.includes(option.text)
 				)
-				
+
 				if (matchedCampus) {
 					this.formData.campus = matchedCampus.value
 					this.picker_config.campus.text = matchedCampus.text
@@ -1106,7 +1101,7 @@
 			// 打开选择器
 			openCicker(inputName, linkage = true) {
 				const options = this.picker_config[inputName]?.options || [];
-				
+
 				if (!options.length) {
 					uni.showToast({ title: '暂无选项', icon: 'none' });
 					return;
@@ -1115,7 +1110,7 @@
 				this.picker_input_name = inputName;
 				this.picker_options = options;
 				this.picker_linkage = linkage;
-				
+
 				this.$nextTick(() => {
 					this.picker_show = true;
 				});
@@ -1124,7 +1119,7 @@
 			// 处理选择器选择
 			changeCicker(e) {
 				const inputName = this.picker_input_name;
-				
+
 				this.updateFormField(inputName, e.value, e.text);
 				this.handleSpecialSelectionLogic(inputName, e.value, e.text);
 				this.cancelCicker();
@@ -1221,7 +1216,7 @@
 			change_date(e) {
 				const val = e.result || '';
 				const inputName = this.data_picker_input_name;
-				
+
 				this.formData[inputName] = val;
 				this.cancel_date();
 			},
@@ -1234,9 +1229,9 @@
 			// 处理日期时间选择
 			change_datetime(e) {
 				console.log('日期时间选择器返回数据:', e);
-				
+
 				let val = e.result || e.value || '';
-				
+
 				// 确保日期时间格式正确
 				if (val && typeof val === 'string') {
 					// 如果包含时间部分但格式不对，进行格式化
@@ -1251,7 +1246,7 @@
 						}
 					}
 				}
-				
+
 				const inputName = this.datetime_picker_input_name;
 				this.formData[inputName] = val;
 				this.cancel_datetime();
@@ -1313,13 +1308,13 @@
 			//提交
 			async submit() {
 				const data = { ...this.formData };
-				
+
 				// 表单验证
 				if (!await this.validatorForm(data)) return;
-				
+
 				// 防止重复提交
 				if (!this.canSubmit()) return;
-				
+
 				this.is_submit = false;
 				try {
 					const res = await apiRoute.xs_editCustomerResources(data);
@@ -1340,4 +1335,4 @@
 
 <style lang="less" scoped>
 @import './edit_clues.less';
-</style>
\ No newline at end of file
+</style>