From cdc449472bf4cf67fae8efc2094327f3f8751876 Mon Sep 17 00:00:00 2001
From: zeyan <258785420@qq.com>
Date: Tue, 28 Oct 2025 19:33:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/student/StudentController.php  |    2 +
 uniapp/components/order-form-popup/index.vue  |  113 +-
 uniapp/components/schedule/ScheduleDetail.vue |   66 +
 uniapp/pages-market/clue/clue_info.vue        |   95 +-
 uniapp/pages/market/clue/add_clues.vue        | 2123 -----------------
 .../pages/market/clue/class_arrangement.vue   |  623 -----
 .../market/clue/class_arrangement_detail.vue  | 1292 ----------
 uniapp/pages/market/clue/clue_info.less       |  431 ----
 uniapp/pages/market/clue/clue_info.vue        | 1567 ------------
 uniapp/pages/market/clue/clue_table.vue       |  164 --
 uniapp/pages/market/clue/edit_clues.vue       | 1806 --------------
 uniapp/pages/market/clue/edit_clues_log.vue   |  365 ---
 uniapp/pages/market/clue/index.vue            | 1749 --------------
 uniapp/pages/market/data/statistics.vue       |  343 ---
 uniapp/pages/market/index/index.vue           |  427 ----
 uniapp/pages/market/my/campus_data.vue        |  495 ----
 uniapp/pages/market/my/dept_data.vue          |  445 ----
 uniapp/pages/market/my/index.vue              |  523 ----
 uniapp/pages/market/my/info.vue               |  505 ----
 uniapp/pages/market/my/my_data.vue            |  292 ---
 uniapp/pages/market/my/set_up.vue             |  105 -
 uniapp/pages/market/my/signed_client_list.vue |  275 ---
 uniapp/pages/market/my/update_pass.vue        |  225 --
 uniapp/pages/market/reimbursement/add.vue     |  272 ---
 uniapp/pages/market/reimbursement/detail.vue  |  136 --
 uniapp/pages/market/reimbursement/list.vue    |  144 --
 26 files changed, 263 insertions(+), 14320 deletions(-)
 delete mode 100644 uniapp/pages/market/clue/add_clues.vue
 delete mode 100644 uniapp/pages/market/clue/class_arrangement.vue
 delete mode 100644 uniapp/pages/market/clue/class_arrangement_detail.vue
 delete mode 100644 uniapp/pages/market/clue/clue_info.less
 delete mode 100644 uniapp/pages/market/clue/clue_info.vue
 delete mode 100644 uniapp/pages/market/clue/clue_table.vue
 delete mode 100644 uniapp/pages/market/clue/edit_clues.vue
 delete mode 100644 uniapp/pages/market/clue/edit_clues_log.vue
 delete mode 100644 uniapp/pages/market/clue/index.vue
 delete mode 100644 uniapp/pages/market/data/statistics.vue
 delete mode 100644 uniapp/pages/market/index/index.vue
 delete mode 100644 uniapp/pages/market/my/campus_data.vue
 delete mode 100644 uniapp/pages/market/my/dept_data.vue
 delete mode 100644 uniapp/pages/market/my/index.vue
 delete mode 100644 uniapp/pages/market/my/info.vue
 delete mode 100644 uniapp/pages/market/my/my_data.vue
 delete mode 100644 uniapp/pages/market/my/set_up.vue
 delete mode 100644 uniapp/pages/market/my/signed_client_list.vue
 delete mode 100644 uniapp/pages/market/my/update_pass.vue
 delete mode 100644 uniapp/pages/market/reimbursement/add.vue
 delete mode 100644 uniapp/pages/market/reimbursement/detail.vue
 delete mode 100644 uniapp/pages/market/reimbursement/list.vue

diff --git a/niucloud/app/api/controller/student/StudentController.php b/niucloud/app/api/controller/student/StudentController.php
index 09fa6378..593aa62d 100644
--- 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/uniapp/components/order-form-popup/index.vue b/uniapp/components/order-form-popup/index.vue
index a3e24f0f..0c1bfa6f 100644
--- a/uniapp/components/order-form-popup/index.vue
+++ b/uniapp/components/order-form-popup/index.vue
@@ -77,9 +77,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="请输入备注信息"
@@ -147,7 +157,7 @@ export default {
         gift_id: '',     // 赠品ID
         gift_type: '',   // 赠品核销类型：1-减现, 2-赠课
         remark: '',
-        class_id: '1' // 临时设置默认班级ID，后续需要添加班级选择功能
+        class_id: '' // 班级ID，可选字段
       },
       
       // 选择器相关
@@ -163,12 +173,14 @@ export default {
       orderTypeSelectedIndex: -1,
       giftSelectedIndex: -1,
       giftTypeSelectedIndex: -1,
+      classSelectedIndex: -1,
       
       // 数据选项
       courseList: [],
       paymentTypes: [], // 从字典接口获取
       orderTypes: [],   // 从字典接口获取
       giftList: [],     // 可用赠品列表
+      classList: [],    // 班级列表
       giftTypes: [      // 赠品核销类型
         { value: '1', label: '减现' },
         { value: '2', label: '赠课' }
@@ -190,6 +202,9 @@ 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)
     }
   },
   watch: {
@@ -201,12 +216,17 @@ export default {
         this.loadCourseList()
         this.loadDictionaries() // 加载字典数据
         this.loadGiftList() // 加载可用赠品列表
+        this.loadClassList() // 加载班级列表
       }
     },
     studentInfo: {
       handler(newVal) {
         if (newVal && newVal.id) {
           this.formData.student_id = newVal.id
+          // 当学生信息变化时，重新加载班级列表
+          if (newVal.campus_id) {
+            this.loadClassList()
+          }
         }
       },
       immediate: true,
@@ -221,6 +241,7 @@ export default {
       this.loadCourseList()
       this.loadDictionaries()
       this.loadGiftList()
+      this.loadClassList()
     }
   },
   methods: {
@@ -236,7 +257,7 @@ export default {
         gift_id: '',
         gift_type: '',
         remark: '',
-        class_id: '1' // 临时设置默认班级ID
+        class_id: '' // 班级ID，可选字段
       }
       
       // 重置选择器索引状态
@@ -245,6 +266,7 @@ export default {
       this.orderTypeSelectedIndex = -1
       this.giftSelectedIndex = -1
       this.giftTypeSelectedIndex = -1
+      this.classSelectedIndex = -1
     },
     
     async loadCourseList() {
@@ -300,7 +322,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 +341,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,6 +410,41 @@ export default {
         this.giftList = []
       }
     },
+
+    /**
+     * 加载班级列表
+     */
+    async loadClassList() {
+      console.log('开始加载班级列表，校区ID:', this.studentInfo?.campus_id)
+      try {
+        if (!this.studentInfo?.campus_id) {
+          console.warn('缺少校区ID，无法加载班级列表')
+          this.classList = []
+          return
+        }
+
+        const res = await apiRoute.getClassListForSchedule({
+          campus_id: this.studentInfo.campus_id
+        })
+        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 = []
+      }
+    },
     
     showCoursePicker() {
       this.currentPicker = 'course'
@@ -462,7 +527,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 +535,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]
@@ -523,6 +611,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()
diff --git a/uniapp/components/schedule/ScheduleDetail.vue b/uniapp/components/schedule/ScheduleDetail.vue
index 40e492cd..4b2246cd 100644
--- a/uniapp/components/schedule/ScheduleDetail.vue
+++ b/uniapp/components/schedule/ScheduleDetail.vue
@@ -77,6 +77,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 +140,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>
 
@@ -555,6 +563,16 @@
 			// 学员点击处理
 			handleStudentClick(student, index) {
         console.log('点击了学员:', student)
+				// 检查学员签到状态，只有状态为0（待上课）才能进行签到操作
+				if (student.status !== 0) {
+					uni.showToast({
+						title: `该学员已${this.getStatusText(student.status)}，无法重复操作`,
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+
 				// 检查是否是等待位学员
 				if (student.schedule_type === 2) {
 					// 等待位学员 - 询问是否转为正式课
@@ -854,6 +872,16 @@
 				return statusTextMap[status] || '未知状态';
 			},
 
+			// 获取签到状态样式类
+			getStatusClass(status) {
+				const statusClassMap = {
+					0: 'status-pending', // 待上课
+					1: 'status-completed', // 已上课
+					2: 'status-leave' // 请假
+				};
+				return statusClassMap[status] || '';
+			},
+
 			// 根据课程状态代码获取状态文本
 			getStatusTextFromCode(statusCode) {
 				const statusTextMap = {
@@ -1137,6 +1165,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;
 	}
diff --git a/uniapp/pages-market/clue/clue_info.vue b/uniapp/pages-market/clue/clue_info.vue
index f5803b24..6fc434a1 100644
--- a/uniapp/pages-market/clue/clue_info.vue
+++ b/uniapp/pages-market/clue/clue_info.vue
@@ -220,6 +220,7 @@
 
 <script>
 	import apiRoute from '@/api/apiRoute.js'
+	import dictUtilSimple from '@/common/dictUtilSimple.js'
 	// 组件导入
 	import ClientInfoCard from '@/components/client-info-card/client-info-card.vue'
 	import StudentInfoCard from '@/components/student-info-card/student-info-card.vue'
@@ -290,6 +291,9 @@
 				showQRCodeModal: false,
 				qrCodePaymentData: null,
 
+				// 字典数据
+				paymentTypeDict: [], // 支付方式字典
+
 				// 编辑相关
 				remark_content: '',
 				currentRecord: null,
@@ -408,8 +412,82 @@
 		},
 		methods: {
 
+			/**
+			 * 加载字典数据
+			 */
+			async loadDictData() {
+				try {
+					console.log('开始加载支付方式字典数据')
+					const dictResult = await dictUtilSimple.getBatchDict(['payment_type'])
+
+					if (dictResult.payment_type && Array.isArray(dictResult.payment_type)) {
+						this.paymentTypeDict = dictResult.payment_type
+						console.log('支付方式字典加载成功:', this.paymentTypeDict)
+					} else {
+						console.warn('支付方式字典数据格式不正确:', dictResult.payment_type)
+						// 使用备用数据
+						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'
+						}
+					]
+				}
+			},
+
 			async init() {
 				try {
+					// 加载字典数据
+					await this.loadDictData()
+
 					await this.getInfo()
 					await Promise.all([
 						this.getUserInfo(),
@@ -1278,13 +1356,24 @@
 
 			// 格式化支付类型
 			formatPaymentType(paymentType) {
-				const typeMap = {
+				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': '微信在线代付'
+					'wxpay_online': '微信在线代付',
+					'client_wxpay': '客户自行付款',
+					'deposit': '定金'
 				}
-				return typeMap[paymentType] || paymentType || '未知'
+				return fallbackMap[paymentType] || paymentType || '未知'
 			},
 
 			// 映射订单状态
diff --git a/uniapp/pages/market/clue/add_clues.vue b/uniapp/pages/market/clue/add_clues.vue
deleted file mode 100644
index 45f425de..00000000
--- a/uniapp/pages/market/clue/add_clues.vue
+++ /dev/null
@@ -1,2123 +0,0 @@
-<!--添加客户-->
-<template>
-  <view class="assemble">
-    <fui-segmented-control
-        style="padding-top: 30rpx;"
-        :values="optionTable"
-        :current="(Number(optionTableId))"
-        type="text"
-        activeColor="#29d3b4"
-        color="#fff"
-        @click="segmented">
-    </fui-segmented-control>
-
-
-<!--    添加客户-->
-    <view style="margin-top: 20rpx;" v-if="optionTableId == 0">
-        <view class="search_box">
-          <view class="input_box">
-            <input type="text" v-model="student_name" placeholder="请输入客户名称">
-          </view>
-          <view class="btn" @click="clientList()">查重</view>
-        </view>
-
-        <view class="form-style">
-          <fui-form ref="form" top="0" :model="formData" :show="false">
-
-            <view class="title" style="margin-top: 20rpx; display: flex; justify-content: space-between; align-items: center;">
-              <text>基础信息</text>
-              <view class="quick-fill-btn" @click="openQuickFill">
-                <text style="color: #29d3b4; font-size: 24rpx;">快速填写</text>
-              </view>
-            </view>
-            <view class="input-style">
-				<!--姓名-->
-				<fui-form-item
-				    label="姓名"
-				    labelSize='26'
-					asterisk asteriskPosition="right"
-				    prop="title"
-				    background='#434544'
-				    labelColor='#fff'
-				    :bottomBorder='false'>
-				  <view class="input-title" style="margin-right:14rpx;">
-				    <fui-input
-				        :borderBottom="false"
-				        :padding="[0]"
-				        placeholder="点击填写"
-				        v-model="formData.name"
-				        backgroundColor="#434544"
-				        size="26"
-				        color="#fff"
-				    ></fui-input>
-				  </view>
-				</fui-form-item>
-              <!--联系电话-->
-              <fui-form-item
-                  label="联系电话"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.phone_number"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                      @blur="handlePhoneBlur"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-			  
-			  <!--校区-->
-			  <fui-form-item
-			      label="校区"
-			      labelSize='26'
-			      prop="campus"
-				  asterisk asteriskPosition="right"
-			      background='#434544'
-			      labelColor='#fff'
-			      :bottomBorder='false'
-			  >
-			    <view class="input-title" style="margin-right:14rpx;">
-			      <view
-			          class="input-title"
-			          style="margin-right:14rpx;"
-			          @click="openCicker(`campus`)">
-			        {{ (formData.campus) ? picker_config.campus.text : '点击选择' }}
-			      </view>
-			    </view>
-			  </fui-form-item>
-			  
-			  
-              <!--来源-->
-              <fui-form-item
-                  label="来源"
-                  labelSize='26'
-                  prop=""
-                  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`)">
-                    {{ (formData.source) ? picker_config.source.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-			  
-              <!--来源渠道-->
-              <fui-form-item
-                  v-if="formData.source == 1"
-                  label="来源渠道"
-                  labelSize='26'
-                  prop=""
-                  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`)">
-                    {{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-
-              <!--转介绍资源选择-->
-              <fui-form-item
-                  v-if="formData.source == 3"
-                  label="转介绍资源"
-                  asterisk asteriskPosition="right"
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <!-- 搜索输入框 -->
-                  <view class="referral-search-container">
-                    <fui-input
-                        :borderBottom="false"
-                        :padding="[0]"
-                        placeholder="输入姓名或手机号搜索"
-                        v-model="referralSearchQuery"
-                        backgroundColor="#434544"
-                        size="26"
-                        color="#fff"
-                        @input="searchReferralResources"
-                    ></fui-input>
-                    
-                    <!-- 搜索结果列表 -->
-                    <view v-if="referralSearchResults.length > 0" class="referral-search-results">
-                      <view 
-                        v-for="resource in referralSearchResults" 
-                        :key="resource.id" 
-                        class="referral-search-item"
-                        :class="{ 'selected': formData.referral_resource_id === resource.id }"
-                        @click="selectReferralResource(resource)"
-                      >
-                        <view class="resource-info">
-                          <view class="resource-name">{{ resource.name }}</view>
-                          <view class="resource-phone">{{ resource.phone_number }}</view>
-                        </view>
-                        <view v-if="formData.referral_resource_id === resource.id" class="check-icon">✓</view>
-                      </view>
-                    </view>
-                    
-                    <!-- 已选择的资源显示 -->
-                    <view v-if="selectedReferralResource && !referralSearchQuery" class="selected-referral-resource">
-                      <view class="selected-resource-info">
-                        <view class="selected-resource-name">{{ selectedReferralResource.name }}</view>
-                        <view class="selected-resource-phone">{{ selectedReferralResource.phone_number }}</view>
-                      </view>
-                      <view class="clear-selection" @click="clearReferralSelection">✕</view>
-                    </view>
-                  </view>
-                </view>
-              </fui-form-item>
-
-              <fui-form-item
-                  v-show="false"
-                  label="顾问"
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      :disabled="true"
-                      placeholder="点击填写"
-                      v-model="picker_config.consultant.text"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#808080"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-
-              <!--生日-->
-              <fui-form-item
-                  label="生日"
-                  labelSize='26'
-                  prop="birthday"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view 
-                    @click="openBirthdayPicker"
-                    style="color: #fff; cursor: pointer;">
-                    {{ formData.birthday ? formData.birthday : '请选择生日' }}
-                  </view>
-                  <fui-date-picker
-                    :show="picker_show_birthday"
-                    type="3"
-                    :minDate="minDate"
-                    :maxDate="maxDate"
-                    :value="getCurrentBirthdayValue()"
-                    @change="changePickerBirthday"
-                    @cancel="closeBirthdayPicker"
-                  ></fui-date-picker>
-                </view>
-              </fui-form-item>
-
-              <!--需求-->
-              <fui-form-item
-                  label="需求"
-
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <fui-input
-                      :borderBottom="false"
-                      :padding="[0]"
-                      placeholder="点击填写"
-                      v-model="formData.demand"
-                      backgroundColor="#434544"
-                      size="26"
-                      color="#fff"
-                  ></fui-input>
-                </view>
-              </fui-form-item>
-              <!--决策人-->
-              <fui-form-item
-                  label="决策人"
-
-                  labelSize='26'
-                  prop="title"
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'>
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`decision_maker`)">
-                    {{ (formData.decision_maker) ? picker_config.decision_maker.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-              <!--客户初步意向度-->
-              <fui-form-item
-                  label="客户初步意向度"
-
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`initial_intent`)">
-                    {{ (formData.initial_intent) ? picker_config.initial_intent.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-              <!--客户状态-->
-              <fui-form-item
-                  v-show="false"
-                  label="客户状态"
-
-                  labelSize='26'
-                  prop=""
-                  background='#434544'
-                  labelColor='#fff'
-                  :bottomBorder='false'
-              >
-                <view class="input-title" style="margin-right:14rpx;">
-                  <view
-                      class="input-title"
-                      style="margin-right:14rpx;"
-                      @click="openCicker(`status`)">
-                    {{ (formData.status) ? picker_config.status.text : '点击选择' }}
-                  </view>
-                </view>
-              </fui-form-item>
-            </view>
-          </fui-form>
-        </view>
-
-        <view class="fui-btn__box">
-          <fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="nextStep('1')">下一步</fui-button>
-        </view>
-    </view>
-
-<!--    添加六要素-->
-    <view style="margin-top: 20rpx;" v-if="optionTableId == 1">
-      <view class="form-style">
-        <fui-form ref="form" top="0" :model="formData" :show="false">
-
-          <view class="title" style="margin-top: 20rpx;">六要素信息</view>
-          <view class="input-style">
-            <!--购买力-->
-            <fui-form-item
-                label="购买力"
-                labelSize='26'
-                prop=""
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'
-            >
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openCicker(`purchasing_power`)">
-                  {{ (formData.purchasing_power) ? picker_config.purchasing_power.text : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--认知理念-->
-            <fui-form-item
-                label="认知理念"
-                labelSize='26'
-                prop=""
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'
-            >
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openCicker(`cognitive_idea`)">
-                  {{ (formData.cognitive_idea) ? picker_config.cognitive_idea.text : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--可选上课时间-->
-            <fui-form-item
-                label="可选上课时间"
-                labelSize='26'
-                prop=""
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'
-            >
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openDate(`optional_class_time`)">
-                  {{ (formData.optional_class_time) ? formData.optional_class_time : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--承诺到访时间-->
-            <fui-form-item
-                label="承诺到访时间"
-                labelSize='26'
-                prop=""
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'
-            >
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openDate(`promised_visit_time`)">
-                  {{ (formData.promised_visit_time) ? formData.promised_visit_time : '点击选择' }}
-                </view>
-              </view>
-            </fui-form-item>
-            <!--距离-->
-            <fui-form-item
-                label="距离"
-                labelSize='26'
-                prop="title"
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'>
-              <view class="input-title" style="margin-right:14rpx;">
-                <view
-                    class="input-title"
-                    style="margin-right:14rpx;"
-                    @click="openCicker(`distance`)">
-                  {{ (formData.distance) ? picker_config.distance.text : '点击选择' }}
-                </view>
-              </view>
-
-            </fui-form-item>
-            <!--沟通备注-->
-            <fui-form-item
-                label="沟通备注"
-                labelSize='26'
-                prop="title"
-                background='#434544'
-                labelColor='#fff'
-                :bottomBorder='false'>
-              <view class="input-title" style="margin-right:14rpx;">
-                <fui-input
-                    :borderBottom="false"
-                    :padding="[0]"
-                    placeholder="点击填写"
-                    v-model="formData.communication"
-                    backgroundColor="#434544"
-                    size="26"
-                    color="#fff"
-                ></fui-input>
-              </view>
-            </fui-form-item>
-          </view>
-        </fui-form>
-      </view>
-      <view class="fui-btn__box">
-        <fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="submit">保存</fui-button>
-      </view>
-    </view>
-
-
-
-    <!-- 年月日-选择时间 -->
-    <fui-date-picker 
-      :show="date_picker_show" 
-      type="3" 
-      :startYear="2020"
-      :endYear="2030"
-      :value="getCurrentDate()"
-      @change="change_date" 
-      @cancel="cancel_date">
-    </fui-date-picker>
-
-    <!-- 选择器 -->
-    <fui-picker
-        :linkage='picker_linkage'
-        :options="picker_options"
-        :layer="1"
-        :show="picker_show"
-        @change="changeCicker"
-        @cancel="cancelCicker">
-    </fui-picker>
-
-<!--    查重弹出层-->
-    <fui-bottom-popup :show="showDuplicateCheck" @close="closeDuplicateCheck">
-      <view class="fui-scroll__wrap">
-        <view class="title_box">
-          <view></view>
-          <view class="title">查重结果</view>
-          <view class="close" @tap="closeDuplicateCheck">
-            <fui-icon name="close" :size="48"></fui-icon>
-          </view>
-        </view>
-
-        <scroll-view scroll-y class="section_ul">
-          <!--暂无数据时展示-->
-          <view class="not_list" v-if="clientUserList.length == 0">
-            <image :src="$util.img('/uniapp_src/static/images/index/zan_wu.png')" class="img"></image>
-            <view class="title">暂无重复客户</view>
-          </view>
-
-          <!--数据列表-->
-          <view class="ul" v-else>
-            <view class="duplicate-notice">
-              <text style="color: #ff6b35; font-size: 28rpx; margin-bottom: 20rpx;">检测到手机号重复，是否为现有用户添加新学员？</text>
-              <fui-button 
-                background="#29d3b4" 
-                color="#fff" 
-                @click="confirmAddStudent"
-                style="margin: 20rpx 0;">
-                确认添加学员
-              </fui-button>
-            </view>
-            <view class="li" v-for="(v,k) in clientUserList" :key="k" @click="openViewClueInfo(v)">
-              <view class="left_box">
-                <view class="box_1">
-                  <image
-                      class="img"
-                      :src="$util.img('/uniapp_src/static/images/index/myk.png')"></image>
-                  <view class="name">{{v.name}}</view>
-                </view>
-                <view class="box_2">
-                  <view class="left">
-                    <view class="name">首选联系人：{{v.decision_maker}}</view>
-                  </view>
-                </view>
-                <view class="box_2">
-                  <view class="left">
-                    <view class="name">联系电话：{{v.phone_number || ''}}</view>
-                  </view>
-                </view>
-
-                <view class="box_3">
-                  <view class="left">
-                    {{ $util.formatToDateTime((v.updated_at || ''), 'm-d H:i') }} 跟进
-                  </view>
-                  <view class="right">
-
-                    <image
-                        v-if="v.initial_intent == 'high'"
-                        :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-                        class="img"
-                    ></image>
-                    <image
-                        v-else-if="v.initial_intent == 'medium'"
-                        :src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-                        class="img"
-                    ></image>
-                    <image
-                        v-else
-                        :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
-                        class="img"
-                    ></image>
-
-                    <view>意向：{{ v.initial_intent_name || '' }}</view>
-                  </view>
-                </view>
-              </view>
-              <view class="right_box">
-              </view>
-            </view>
-          </view>
-
-        </scroll-view>
-
-      </view>
-    </fui-bottom-popup>
-
-    <!-- 快速填写弹窗 -->
-    <view v-if="showQuickFill" class="quick-fill-mask" @tap="showQuickFill=false">
-      <view class="quick-fill-content" @tap.stop>
-        <view class="quick-fill-header">
-          <view class="quick-fill-title">快速填写</view>
-          <view class="quick-fill-close" @tap="showQuickFill=false">
-            <text class="close-text">✕</text>
-          </view>
-        </view>
-        <view class="quick-fill-body">
-          <view class="quick-fill-tip">
-            <text>请粘贴包含客户信息的文本，支持格式：</text>
-            <text>姓名：张三，电话：13800138000，校区：测试校区</text>
-          </view>
-          <textarea 
-            class="quick-fill-textarea" 
-            placeholder="请粘贴客户信息文本..."
-            v-model="quickFillText"
-            :maxlength="1000"
-          ></textarea>
-        </view>
-        <view class="quick-fill-buttons">
-          <view class="quick-fill-btn cancel-btn" @click="showQuickFill=false">取消</view>
-          <view class="quick-fill-btn confirm-btn" @click="parseQuickFillText">解析并填写</view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-import commonApi from '@/api/common.js';
-import marketApi from '@/api/market.js';
-import memberApi from '@/api/member.js';
-import util from '@/common/util.js';
-import dictUtil from '@/common/dictUtil.js';
-import dictUtilSimple from '@/common/dictUtilSimple.js';
-
-
-export default {
-  data() {
-    return {
-      switchChange_type: 1,
-
-      is_submit: true,//是否提交(防止重复提交)|true=可提交,false=不可提交
-
-      // 快速填写相关
-      showQuickFill: false, // 是否显示快速填写弹窗
-      quickFillText: '', // 快速填写文本内容
-
-      //表单
-      formData: {
-        // 客户基础信息
-        source_channel:'',//来源渠道
-        source:'',//来源
-        consultant:'',//顾问
-        name:'',//姓名
-        age:'',//年龄
-        gender:'male',//性别|male-男性, female-女性, other-其他
-        phone_number:'',//联系电话
-        demand:'',//需求
-        decision_maker:'',//决策人
-        initial_intent:'',//客户初步意向度: high-高, medium-中, low-低
-        status:'pending',//客户状态: active-活跃, inactive-不活跃, pending-待定
-        birthday:'',//生日
-
-        //六要素信息
-        purchasing_power:'',//购买力
-        cognitive_idea:'',//认知理念
-        communication:'',//沟通备注
-        promised_visit_time:'',//承诺到访时间
-        staff_id:'',//人员ID
-        distance:'',//距离
-        optional_class_time:'',//可选上课时间
-		campus:'',
-        referral_resource_id:'',//转介绍资源ID
-      },
-		campus_list:[],
-      //下拉选择器相关
-      picker_input_name:'',//下拉组件的input_name
-      picker_show:false,//下拉组件是否展示
-      picker_linkage:true,//选择器是否为联动选择
-      picker_options:[
-        // {
-        //   text:'张三',
-        //   value:'1'
-        // },
-      ],//选择器可选值列表
-      picker_config:{
-        //来源渠道
-        source_channel:{
-          text:'',//回显中文名字
-          options:[
-            // {
-            //   text:'张三',
-            //   value:'1'
-            // }
-          ],//可选值列表
-        },
-        //来源
-        source:{
-          text:'',
-          options:[],
-        },
-        //顾问
-        consultant:{
-          text:'',
-          options:[],
-        },
-        //购买力
-        purchasing_power:{
-          text:'',
-          options:[],
-        },
-        //认知理念
-        cognitive_idea:{
-          text:'',
-          options:[],
-        },
-        //客户初步意向度
-        initial_intent:{
-          text:'',
-          options:[],
-        },
-        //决策人
-        decision_maker:{
-          text:'',
-          options:[],
-        },
-        //所属校区
-        campus:{
-          text:'',
-          options:[],
-        },
-        //客户状态
-        status:{
-          text:'',
-          options:[],
-        },
-        //距离
-        distance:{
-          text:'',
-          options:[],
-        },
-      },//选择器选项配置
-
-      // 年月日选择组件
-      data_picker_input_name:'',//时间组件的input_name
-      date_picker_show:false,//时间选择器是否展示
-
-      //生日选择器
-      picker_show_birthday: false,
-      minDate: '1900-01-01', // 最小日期 
-      maxDate: new Date().toISOString().split('T')[0], // 最大日期，只取日期部分
-
-
-
-      //登录用户信息
-      userInfo:{},
-
-      // 查重相关
-      student_name:'',//检索关键字
-      clientUserList:[],//查重用户列表
-      showDuplicateCheck:false,//是否显示查重弹出层
-
-
-      //tab切换
-      optionTableId:0,
-      optionTable: [
-        {
-          id: 0,
-          name: '添加客户'
-        },
-        {
-          id: 1,
-          name: '添加六要素'
-        }
-      ],
-
-      // 转介绍资源相关
-      referralSearchQuery: '', // 转介绍资源搜索关键词
-      referralSearchResults: [], // 搜索结果列表
-      selectedReferralResource: null, // 已选择的转介绍资源
-      referralSearchTimer: null, // 搜索防抖定时器
-    }
-  },
-  onLoad() {
-    // 预加载字典数据
-    this.preloadDictData()
-  },
-  onShow() {
-    this.init()
-  },
-  onUnload() {
-    // 清理定时器
-    if (this.referralSearchTimer) {
-      clearTimeout(this.referralSearchTimer)
-      this.referralSearchTimer = null
-    }
-  },
-  methods: {
-    // 预加载字典数据
-    async preloadDictData() {
-      const dictKeys = [
-        'SourceChannel', 'source', 'customer_purchasing_power', 
-        'preliminarycustomerintention', 'cognitive_concept', 
-        'kh_status', 'decision_maker', 'distance'
-      ]
-      
-      // 静默预加载，不阻塞页面显示
-      // 暂时使用简化版本进行测试
-      dictUtilSimple.getBatchDict(dictKeys).catch(error => {
-        console.warn('字典预加载失败:', error)
-      })
-    },
-
-    //初始化
-    async init() {
-      //获取登录用户信息
-      await this.getUserInfo()
-	  
-      // 使用批量获取字典数据，提升性能
-      await this.getBatchDictData()
-      
-      // 设置时间相关默认值
-      this.setDefaultTimes()
-      
-      // this.getStaffList()//获取人员列表
-      // this.getAreaTree()//获取地区树形结构
-    },
-
-    // 设置时间相关默认值
-    setDefaultTimes() {
-      // 移除可选上课时间的默认值设置，让用户手动选择
-      this.formData.optional_class_time = ''
-      
-      // 移除承诺到访时间的默认值设置，让用户手动选择
-      this.formData.promised_visit_time = ''
-      
-      console.log('时间默认值已清空，用户需手动选择')
-    },
-
-    // 快速填写相关方法
-    // 打开快速填写弹窗
-    openQuickFill() {
-      this.showQuickFill = true
-      this.quickFillText = ''
-    },
-    
-    // 解析快速填写文本
-    parseQuickFillText() {
-      if (!this.quickFillText.trim()) {
-        uni.showToast({
-          title: '请输入要解析的文本',
-          icon: 'none'
-        })
-        return
-      }
-      
-      try {
-        // 定义字段映射规则
-        const fieldRules = [
-          { key: 'name', patterns: ['姓名', '客户姓名', '用户姓名', '学员姓名', '学生姓名'] },
-          { key: 'phone_number', patterns: ['电话', '手机', '联系电话', '手机号', '电话号码', '联系方式'] },
-          { key: 'campus', patterns: ['校区', '所属校区', '校区名称'] },
-          { key: 'age', patterns: ['年龄'] },
-          { key: 'birthday', patterns: ['生日', '出生日期', '生日日期'] }
-        ]
-        
-        // 用于存储解析结果
-        const parsedData = {}
-        const text = this.quickFillText.trim()
-        
-        // 对每个字段规则进行匹配
-        fieldRules.forEach(rule => {
-          rule.patterns.forEach(pattern => {
-            // 匹配模式：字段名 + 冒号/等号 + 数据内容
-            const regex = new RegExp(`${pattern}\\s*[：:=]\\s*([^，,\\n\\s]+)`, 'g')
-            const match = regex.exec(text)
-            if (match && match[1]) {
-              parsedData[rule.key] = match[1].trim()
-            }
-          })
-        })
-        
-        console.log('解析结果:', parsedData)
-        
-        // 填写到表单中
-        let fillCount = 0
-        if (parsedData.name) {
-          this.formData.name = parsedData.name
-          fillCount++
-        }
-        if (parsedData.phone_number) {
-          this.formData.phone_number = parsedData.phone_number
-          fillCount++
-        }
-        if (parsedData.campus) {
-          // 需要在校区选项中查找匹配的项
-          this.findAndSetCampus(parsedData.campus)
-          fillCount++
-        }
-        if (parsedData.age) {
-          const age = parseInt(parsedData.age)
-          if (!isNaN(age) && age > 0 && age < 150) {
-            this.formData.age = age
-            fillCount++
-          }
-        }
-        if (parsedData.birthday) {
-          this.formData.birthday = parsedData.birthday
-          fillCount++
-        }
-        
-        if (fillCount > 0) {
-          uni.showToast({
-            title: `成功填写${fillCount}个字段`,
-            icon: 'success'
-          })
-          this.showQuickFill = false
-        } else {
-          uni.showToast({
-            title: '未能识别到有效信息，请检查格式',
-            icon: 'none'
-          })
-        }
-        
-      } catch (error) {
-        console.error('解析失败:', error)
-        uni.showToast({
-          title: '解析失败，请检查格式',
-          icon: 'none'
-        })
-      }
-    },
-    
-    // 查找并设置校区
-    findAndSetCampus(campusText) {
-      const campusOptions = this.picker_config.campus?.options || []
-      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
-      }
-    },
-
-    // 统一的日期格式化方法
-    formatDate(date) {
-      const year = date.getFullYear()
-      const month = String(date.getMonth() + 1).padStart(2, '0')
-      const day = String(date.getDate()).padStart(2, '0')
-      
-      // FirstUI 日期选择器通常支持多种格式
-      // 根据实际测试结果可以调整以下格式：
-      
-      // 格式选项（如果当前格式不工作，可以尝试其他格式）:
-      const formats = {
-        standard: `${year}-${month}-${day}`,      // YYYY-MM-DD
-        chinese: `${year}年${month}月${day}日`,    // YYYY年MM月DD日  
-        slash: `${year}/${month}/${day}`,         // YYYY/MM/DD
-        dot: `${year}.${month}.${day}`,           // YYYY.MM.DD
-        space: `${year} ${month} ${day}`          // YYYY MM DD
-      }
-      
-      // 优先使用标准格式，如果组件显示异常可以在这里切换格式
-      return formats.standard
-      
-      // 如果标准格式不工作，可以尝试:
-      // return formats.chinese  // 中文格式
-      // return formats.slash    // 斜杠格式
-    },
-
-    // 统一日期格式处理方法
-    normalizeDate(dateStr) {
-      if (!dateStr) return ''
-      
-      // 如果已经是标准格式 YYYY-MM-DD，直接返回
-      if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
-        return dateStr
-      }
-      
-      // 处理 YYYY/MM/DD 格式
-      if (/^\d{4}\/\d{1,2}\/\d{1,2}$/.test(dateStr)) {
-        const parts = dateStr.split('/')
-        const year = parts[0]
-        const month = String(parts[1]).padStart(2, '0')
-        const day = String(parts[2]).padStart(2, '0')
-        return `${year}-${month}-${day}`
-      }
-      
-      // 处理 YYYY.MM.DD 格式
-      if (/^\d{4}\.\d{1,2}\.\d{1,2}$/.test(dateStr)) {
-        const parts = dateStr.split('.')
-        const year = parts[0]
-        const month = String(parts[1]).padStart(2, '0')
-        const day = String(parts[2]).padStart(2, '0')
-        return `${year}-${month}-${day}`
-      }
-      
-      // 处理中文格式 YYYY年MM月DD日
-      if (/^\d{4}年\d{1,2}月\d{1,2}日$/.test(dateStr)) {
-        const year = dateStr.match(/^(\d{4})年/)[1]
-        const month = String(dateStr.match(/年(\d{1,2})月/)[1]).padStart(2, '0')
-        const day = String(dateStr.match(/月(\d{1,2})日/)[1]).padStart(2, '0')
-        return `${year}-${month}-${day}`
-      }
-      
-      // 其他格式尝试用Date对象解析
-      try {
-        const date = new Date(dateStr)
-        if (!isNaN(date.getTime())) {
-          return this.formatDate(date)
-        }
-      } catch (error) {
-        console.warn('日期格式解析失败:', dateStr, error)
-      }
-      
-      // 如果都无法解析，返回原值
-      return dateStr
-    },
-
-    // 获取当前日期（用于日期选择器的默认显示）
-    getCurrentDate() {
-      const today = new Date()
-      return this.formatDate(today)
-    },
-
-    // 批量获取字典数据
-    async getBatchDictData() {
-      try {
-        // 定义需要的字典keys
-        const dictKeys = [
-          'SourceChannel',                    // 来源渠道
-          'source',                          // 来源
-          'customer_purchasing_power',       // 购买力
-          'preliminarycustomerintention',    // 客户初步意向度
-          'cognitive_concept',               // 认知理念
-          'kh_status',                      // 客户状态
-          'decision_maker',                 // 决策人
-          'distance'                        // 距离
-        ]
-
-        // 批量获取字典数据（静默获取，不显示加载提示）
-        // 暂时使用简化版本进行测试
-        const dictData = await dictUtilSimple.getBatchDict(dictKeys)
-        
-        // 处理字典数据
-        this.processDictData(dictData)
-
-        console.log('批量获取字典数据成功:', dictData)
-        
-      } catch (error) {
-        console.error('批量获取字典数据失败:', error)
-        
-        // 如果批量获取失败，回退到单个获取
-        await this.fallbackGetDict()
-      }
-    },
-
-    // 处理批量获取的字典数据
-    processDictData(dictData) {
-      // 字典key与本地配置的映射关系
-      const keyMapping = {
-        'SourceChannel': 'source_channel',
-        'source': 'source',
-        'customer_purchasing_power': 'purchasing_power',
-        'preliminarycustomerintention': 'initial_intent',
-        'cognitive_concept': 'cognitive_idea',
-        'kh_status': 'status',
-        'decision_maker': 'decision_maker',
-        'distance': 'distance'
-      }
-
-      // 处理每个字典数据
-      Object.keys(keyMapping).forEach(dictKey => {
-        const localKey = keyMapping[dictKey]
-        const dictItems = dictData[dictKey] || []
-
-        if (Array.isArray(dictItems) && dictItems.length > 0) {
-          const formattedOptions = dictItems.map(item => ({
-            text: item.name || '',
-            value: item.value || ''
-          }))
-          
-          // 设置到picker配置中
-          if (this.picker_config[localKey]) {
-            this.picker_config[localKey].options = formattedOptions
-          }
-        }
-      })
-    },
-
-    // 回退方案：单个获取字典（兼容原有逻辑）
-    async fallbackGetDict() {
-      console.log('使用回退方案获取字典数据')
-      try {
-        await this.getDict('source_channel')
-        await this.getDict('source')
-        await this.getDict('purchasing_power')
-        await this.getDict('initial_intent')
-        await this.getDict('cognitive_idea')
-        await this.getDict('status')
-        await this.getDict('decision_maker')
-        await this.getDict('distance')
-      } catch (error) {
-        console.error('回退方案也失败了:', error)
-      }
-    },
-	async get_campus_list(){
-
-		let res = await apiRoute.common_getCampusesList({})
-		if (res.code != 1) {
-		  uni.showToast({
-		    title: res.msg,
-		    icon: 'none'
-		  })
-		  return
-		}
-		
-		this.campus_list = res.data
-		
-		
-		let arr = []
-		this.campus_list.forEach((v,k)=>{
-		  arr.push({
-		    text: v.campus_name,
-		    value: v.id,
-		  })
-		})
-		
-		this.picker_config['campus'].options = arr
-		
-	},
-    //获取用户信息
-    async getUserInfo(){
-      let res = await apiRoute.getPersonnelInfo({})
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      this.userInfo = res.data
-
-      this.formData.consultant = res.data.id//顾问id
-      this.formData.staff_id = res.data.id//人员ID
-      this.picker_config['consultant'].text = res.data.name//顾问名字
-	  
-	  await this.get_campus_list()//获取校区
-    },
-
-
-
-
-
-
-    //获取字典
-    async getDict(inputName){
-      let key = ''
-      switch (inputName){
-        case 'source_channel': key = 'SourceChannel'; break;
-        case 'source': key = 'source'; break;
-        case 'purchasing_power': key = 'customer_purchasing_power'; break;
-        case 'cognitive_idea': key = 'cognitive_concept'; break;
-        case 'decision_maker': key = 'decision_maker'; break;
-        case 'initial_intent': key = 'preliminarycustomerintention'; break;
-        case 'status': key = 'kh_status'; break;
-        case 'distance': key = 'distance'; break;
-      }
-      if(!key){ return }
-      // 使用 util.getDict 获取并缓存字典
-      let dictionary = await util.getDict(key)
-      if(!dictionary || !Array.isArray(dictionary) || dictionary.length === 0){
-        uni.showToast({ title: '暂无选项', icon: 'none' })
-        return
-      }
-      let arr = []
-      // 处理接口返回的数据结构 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
-      dictionary.forEach((v) => {
-        arr.push({ text: v.name, value: v.value })
-      })
-      this.picker_config[inputName].options = arr
-    },
-
-    //##### 查重相关 #####
-    //客户列表--查重
-    async clientList(){
-
-      if(!this.student_name){
-        uni.showToast({
-          title: '请输入检索关键字',
-          icon: 'none'
-        })
-        return
-      }
-
-      this.clientUserList = []
-
-      let param = {
-        name:this.student_name
-      }
-      let res = await apiRoute.xs_getAllCustomerResources(param)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      console.log('查重',res)
-      this.clientUserList = res.data
-      this.openDuplicateCheck()
-    },
-    //打开结果列表
-    openDuplicateCheck(){
-      this.showDuplicateCheck = true
-    },
-    //关闭结果列表
-    closeDuplicateCheck(e){
-      this.showDuplicateCheck = false
-    },
-
-
-    //跳转页面-客户详情
-    openViewClueInfo(item) {
-      let resource_sharing_id = '';
-      if (item.resourceSharingHasMany && item.resourceSharingHasMany.length > 0) {
-        resource_sharing_id = item.resourceSharingHasMany[0].id; // 共享资源表id
-      }
-
-      if (!resource_sharing_id) {
-        uni.showToast({
-          title: '暂时无法查看',
-          icon: 'none'
-        });
-        return;
-      }
-
-      uni.navigateTo({
-        url: `/pages-market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
-      })
-    },
-
-    //跳转页面-我的消息
-    openViewMyMessage(item) {
-      let from_id = this.userInfo.id//发送者的id
-      let to_id = item.customerResource.id//接收者ID
-      uni.navigateTo({
-        url: `/pages-common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
-      })
-    },
-
-    //拨打电话
-    async dialTel(item) {
-
-      let tel = item.phone_number
-
-      if (!tel) {
-        uni.showToast({
-          title: '电话号码为空',
-          icon: 'none'
-        });
-        return;
-      }
-
-
-      let param = {
-        staff_id: this.userInfo.id,//员工id
-        resource_id: item.id,//资源ID
-        resource_type: '',//资源类型（如设备、文件、系统等）
-        communication_type: 'phone',//沟通类型: phone-电话, email-邮件, meeting-会议, other-其他
-        communication_result: 'success',//沟通结果: success-成功, failure-失败, pending-待定
-        remarks: null,//备注
-        tag: null,//标签
-      }
-
-      let res = await apiRoute.xs_communicationRecordsAdd(param)//添加通过记录
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      uni.makePhoneCall({
-        phoneNumber: tel
-      })
-    },
-
-
-
-    //联系电话失去焦点时间
-    async handlePhoneBlur(){
-      if(!this.formData.phone_number){
-        return
-      }
-
-      this.clientUserList = []
-
-      let param = {
-        phone_number:this.formData.phone_number
-      }
-      let res = await apiRoute.xs_getAllCustomerResources(param)
-      if(res.code != 1){
-        if(res.msg == '暂无数据'){
-          return
-        }
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      console.log('查重',res)
-      this.clientUserList = res.data
-      this.openDuplicateCheck()
-    },
-
-    //确认添加学员
-    async confirmAddStudent(){
-      if(!this.clientUserList || this.clientUserList.length == 0){
-        uni.showToast({
-          title: '没有找到重复的用户',
-          icon: 'none'
-        })
-        return
-      }
-      
-      //取第一个重复用户的ID作为user_id
-      const userId = this.clientUserList[0].id
-      
-      //检查必要字段
-      if(!this.formData.name){
-        uni.showToast({
-          title: '请填写学员姓名',
-          icon: 'none'
-        })
-        return
-      }
-      
-      if(!this.formData.gender){
-        uni.showToast({
-          title: '请选择学员性别',
-          icon: 'none'
-        })
-        return
-      }
-      
-      //准备学员数据
-      const studentData = {
-        name: this.formData.name,
-        gender: this.formData.gender,
-        user_id: userId,
-        status: 1
-      }
-      
-      try {
-        const res = await apiRoute.xs_addStudent(studentData)
-        if(res.code != 1){
-          uni.showToast({
-            title: res.msg || '添加学员失败',
-            icon: 'none'
-          })
-          return
-        }
-        
-        uni.showToast({
-          title: '学员添加成功',
-          icon: 'success'
-        })
-        
-        //关闭弹窗并跳转回列表页
-        this.showDuplicateCheck = false
-        setTimeout(() => {
-          uni.redirectTo({
-            url: `/pages-market/clue/index`
-          })
-        }, 1000)
-        
-      } catch (error) {
-        console.error('添加学员失败:', error)
-        uni.showToast({
-          title: '添加学员失败',
-          icon: 'none'
-        })
-      }
-    },
-
-
-
-
-
-
-
-
-
-    //切换tag列表
-    async segmented(e) {
-      console.log(e)
-      //e.id|0=基础信息 1=六要素
-      let status = e.id
-      this.optionTableId = String(status)
-    },
-
-
-    //######-----下拉选择器组件相关-----######
-    //打开下拉选择器
-    openCicker(input_name, linkage = true) {
-      this.picker_options = []
-
-      this.picker_input_name = input_name
-
-      let arr = this.picker_config[input_name]?.options || []
-
-      if (!arr.length) {
-        uni.showToast({ title: '暂无选项', icon: 'none' })
-        return
-      }
-
-      this.picker_options =arr
-      this.picker_linkage = linkage
-      // 使用 nextTick 确保数据更新后再打开 picker
-      this.$nextTick(() => {
-        this.picker_show = true
-      })
-    },
-    //监听-下拉选择器
-    changeCicker(e) {
-      console.log('监听-下拉选择器', this.picker_input_name, e,this.formData)
-      let input_name = this.picker_input_name
-      this.formData[input_name] = e.value
-      this.picker_config[input_name]['text'] = e.text
-
-      if(input_name == 'source'){
-        if(e.value != 1){
-          this.formData.source_channel = '0'//0=线下
-        }else{
-          this.formData.source_channel = ''//线下
-        }
-      }
-
-      // 清空转介绍资源选择，当来源改变时
-      if(input_name == 'source'){
-        this.clearReferralSelection()
-      }
-
-      this.cancelCicker()
-    },
-    //关闭下拉选择器
-    cancelCicker() {
-      this.picker_show = false
-      this.picker_input_name = ''
-      this.picker_options = []
-    },
-
-    // 转介绍资源搜索功能
-    async searchReferralResources() {
-      // 清除之前的定时器
-      if (this.referralSearchTimer) {
-        clearTimeout(this.referralSearchTimer)
-      }
-
-      // 如果搜索关键词为空，清空结果
-      if (!this.referralSearchQuery.trim()) {
-        this.referralSearchResults = []
-        return
-      }
-
-      // 设置防抖定时器
-      this.referralSearchTimer = setTimeout(async () => {
-        await this.doReferralSearch()
-      }, 300) // 300ms防抖
-    },
-
-    // 实际执行搜索的方法
-    async doReferralSearch() {
-      try {
-        // 搜索客户资源 - 优化参数处理
-        let param = {}
-        const searchQuery = this.referralSearchQuery.trim()
-        
-        // 判断搜索内容是手机号还是姓名
-        if (/^1[3-9]\d{9}$/.test(searchQuery)) {
-          // 如果是手机号格式，只传递phone_number参数
-          param.phone_number = searchQuery
-        } else if (/^\d+$/.test(searchQuery)) {
-          // 如果是纯数字但不是手机号格式，也当作手机号搜索
-          param.phone_number = searchQuery
-        } else {
-          // 如果包含非数字字符，当作姓名搜索
-          param.name = searchQuery
-        }
-        
-        let res = await apiRoute.xs_getAllCustomerResources(param)
-        if (res.code != 1) {
-          if (res.msg !== '暂无数据') {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none'
-            })
-          }
-          this.referralSearchResults = []
-          return
-        }
-
-        // 过滤掉当前正在添加的客户（如果手机号相同）
-        this.referralSearchResults = (res.data || []).filter(resource => {
-          return resource.phone_number !== this.formData.phone_number
-        })
-
-        // 如果没有搜索结果，给用户提示
-        if (this.referralSearchResults.length === 0 && searchQuery.length >= 2) {
-          // 静默处理，不显示"暂无数据"提示，让用户继续输入
-          console.log('未找到匹配的转介绍资源')
-        }
-
-      } catch (error) {
-        console.error('搜索转介绍资源失败:', error)
-        this.referralSearchResults = []
-        // 网络错误时给用户提示
-        if (this.referralSearchQuery.trim()) {
-          uni.showToast({
-            title: '搜索失败，请重试',
-            icon: 'none'
-          })
-        }
-      }
-    },
-
-    // 选择转介绍资源
-    selectReferralResource(resource) {
-      this.formData.referral_resource_id = resource.id
-      this.selectedReferralResource = resource
-      this.referralSearchQuery = ''
-      this.referralSearchResults = []
-      
-      uni.showToast({
-        title: '已选择转介绍资源',
-        icon: 'success'
-      })
-    },
-
-    // 清空转介绍资源选择
-    clearReferralSelection() {
-      this.formData.referral_resource_id = ''
-      this.selectedReferralResource = null
-      this.referralSearchQuery = ''
-      this.referralSearchResults = []
-    },
-
-
-    //######-----时间选择器组件相关-----######
-    //打开日期选择器
-    openDate(input_name) {
-      console.log('打开日期选择器:', input_name)
-      this.data_picker_input_name = input_name
-      
-      // 设置日期选择器显示
-      this.$nextTick(() => {
-        this.date_picker_show = true
-      })
-    },
-    //选择跟进时间
-    change_date(e) {
-      console.log('日期选择器返回数据:', e)
-      
-      // 获取选择的日期值，兼容不同的返回格式
-      let val = ''
-      if (e.result) {
-        val = e.result
-      } else if (e.value) {
-        val = e.value  
-      } else if (e.detail && e.detail.result) {
-        val = e.detail.result
-      } else if (e.detail && e.detail.value) {
-        val = e.detail.value
-      }
-      
-      // 确保日期格式为 YYYY-MM-DD
-      if (val && typeof val === 'string') {
-        // 如果是时间戳，转换为日期字符串
-        if (/^\d+$/.test(val)) {
-          const date = new Date(parseInt(val))
-          val = this.formatDate(date)
-        }
-        // 如果包含时间部分，只保留日期部分
-        else if (val.includes(' ')) {
-          val = val.split(' ')[0]
-        }
-        // 统一格式为 YYYY-MM-DD
-        if (val.includes('/')) {
-          const parts = val.split('/')
-          if (parts.length === 3) {
-            val = `${parts[0]}-${parts[1].padStart(2, '0')}-${parts[2].padStart(2, '0')}`
-          }
-        }
-      }
-
-      let input_name = this.data_picker_input_name
-      this.formData[input_name] = val
-      
-      console.log(`设置${input_name}为:`, val)
-      this.cancel_date()
-    },
-    //关闭选择跟进时间
-    cancel_date() {
-      this.date_picker_show = false
-    },
-
-    // 打开生日选择器
-    openBirthdayPicker() {
-      console.log('打开生日选择器')
-      this.picker_show_birthday = true
-    },
-
-    // 关闭生日选择器
-    closeBirthdayPicker() {
-      console.log('关闭生日选择器')
-      this.picker_show_birthday = false
-    },
-
-    // 获取生日选择器的当前值
-    getCurrentBirthdayValue() {
-      if (this.formData.birthday) {
-        return this.formData.birthday
-      }
-      // 默认返回30年前的日期作为初始值
-      const defaultDate = new Date()
-      defaultDate.setFullYear(defaultDate.getFullYear() - 30)
-      return this.formatDate(defaultDate)
-    },
-
-    //生日选择器
-    changePickerBirthday(e) {
-      console.log('生日选择器返回数据:', e)
-      let val = ''
-      
-      // 尝试多种方式获取返回值
-      if (e.result) {
-        val = e.result
-      } else if (e.value) {
-        val = e.value
-      } else if (e.detail && e.detail.result) {
-        val = e.detail.result
-      } else if (e.detail && e.detail.value) {
-        val = e.detail.value
-      } else if (Array.isArray(e) && e.length >= 3) {
-        // 如果返回数组格式 [2023, 1, 15] 
-        const year = e[0]
-        const month = String(e[1]).padStart(2, '0')
-        const day = String(e[2]).padStart(2, '0')
-        val = `${year}-${month}-${day}`
-      }
-
-      // 处理不同的日期格式
-      if (val && typeof val === 'string') {
-        // 如果是时间戳格式
-        if (/^\d+$/.test(val)) {
-          const date = new Date(parseInt(val))
-          val = this.formatDate(date)
-        }
-        // 如果包含时间部分，只保留日期部分
-        else if (val.includes('T')) {
-          val = val.split('T')[0]
-        }
-        // 如果包含空格，只保留日期部分
-        else if (val.includes(' ')) {
-          val = val.split(' ')[0]
-        }
-        // 统一日期格式
-        val = this.normalizeDate(val)
-      }
-
-      console.log('最终设置的生日值:', val)
-      this.formData.birthday = val
-      this.closeBirthdayPicker()
-    },
-
-    //下一步 index|0=添加客户,1六要素
-    async nextStep(index) {
-      this.optionTableId = String(index)
-    },
-    //表单验证
-    async validatorForm(data) {
-      //姓名
-      if(!data.name){
-        uni.showToast({
-          title: '学生姓名必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-      //电话
-      if(!data.phone_number){
-        uni.showToast({
-          title: '电话必填',
-          icon: 'none'
-        })
-        this.nextStep('0')
-        return false
-      }
-	  //校区必填
-	  if(!data.campus){
-	    uni.showToast({
-	      title: '校区必填',
-	      icon: 'none'
-	    })
-	    this.nextStep('0')
-	    return false
-	  }
-	  
-	  //转介绍资源必填（当来源为转介绍时）
-	  if(data.source == 3 && !data.referral_resource_id){
-	    uni.showToast({
-	      title: '请选择转介绍资源',
-	      icon: 'none'
-	    })
-	    this.nextStep('0')
-	    return false
-	  }
-	  
-      return true
-    },
-    //提交
-    async submit() {
-      console.log('提交',this.formData)
-      let data = {...this.formData}
-      //表单验证
-      let validatorForm = await this.validatorForm(data)
-      console.log('验证结果',validatorForm)
-      if(!validatorForm){
-        return
-      }
-
-      //防止重复提交
-      if (!this.is_submit) {
-        return
-      }
-      this.is_submit = false
-
-      let res = await apiRoute.xs_addCustomerResources(data)
-
-      this.is_submit = true
-
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      uni.showToast({
-        title: res.msg,
-        icon: 'success'
-      })
-      //延迟1s执行
-      setTimeout(() => {
-        //跳转页面-线索列表
-        //关闭当前页跳转新页面
-        uni.redirectTo({
-          url: `/pages-market/clue/index`
-        })
-      }, 1000)
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.search_box{
-  padding: 20rpx 40rpx;
-  border-bottom: 1px solid #333333;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .input_box{
-    width: 70%;
-    input{
-      width: 100%;
-      height: 60rpx;
-      color: #fff;
-      font-size: 28rpx;
-    }
-  }
-  .btn{
-    font-size: 28rpx;
-    color: #24BA9F;
-  }
-}
-
-	.assemble {
-		width: 100%;
-		height: 100vh;
-		background: #292929;
-		overflow: auto;
-	}
-
-	.title {
-		font-size: 26rpx;
-		color: #fff;
-		padding: 26rpx 0 26rpx 32rpx;
-	}
-
-	.input-title {
-		font-size: 26rpx;
-		color: #fff;
-	}
-
-	.form-style {
-		width: 100%;
-	}
-
-	.input-style {
-		text-align: right !important;
-	}
-
-	.fui-btn__box {
-		margin: 50rpx auto 120rpx;
-		width: 92%;
-	}
-
-  //查重结构弹出层
-  .fui-scroll__wrap{
-    height: 60vh;
-    .title_box{
-      padding: 10rpx 20rpx;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .title{
-        font-size: 28rpx;
-        color: #101010;
-      }
-    }
-    .section_ul{
-      margin-bottom: 100rpx;
-      height: 98%;
-      .not_list{
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        .img{
-          width: 112rpx;
-          height: 112rpx;
-        }
-        .title{
-          padding: 0;
-          margin-top: 10rpx;
-          color: #101010;
-          font-size: 28rpx;
-          text-align: center;
-        }
-      }
-      .ul{
-        padding: 26rpx;
-        padding-bottom: 100rpx;
-        display: flex;
-        flex-direction: column;
-        .li{
-          margin-bottom: 26rpx;
-          padding: 26rpx;
-          display: flex;
-          justify-content: space-between;
-          gap: 10rpx;
-
-          border-radius: 18rpx;
-          background-color: rgba(67,69,68,1);
-          color: #fff;
-          font-size: 28rpx;
-          border: 0rpx solid rgba(121,121,121,1);
-          .left_box{
-            width: 80%;
-            display: flex;
-            flex-direction: column;
-            gap: 20rpx;
-            .box_1 {
-              display: flex;
-              align-items: center;
-              .img {
-                width: 48rpx;
-                height: 48rpx;
-                border-radius: 50%;
-              }
-              .name{
-                margin-left: 20rpx;
-              }
-            }
-            .box_2{
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-              .left{
-                display: flex;
-                align-items: flex-end;
-                .name{
-                  font-size: 28rpx;
-                }
-                .call{
-                  margin-left: 10rpx;
-                  font-size: 24rpx;
-                  color: #ba7b30;
-                }
-              }
-            }
-            .box_3{
-              display: flex;
-              gap: 30rpx;
-              .right{
-                display: flex;
-                align-items: center;
-                gap: 10rpx;
-                .img{
-                  width: 16rpx;
-                  height: 16rpx;
-                  border-radius: 50%;
-                }
-              }
-            }
-          }
-          .right_box{
-            width: 25%;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .img{
-              width: 70rpx;
-              height: 70rpx;
-              border-radius: 50%;
-            }
-          }
-        }
-      }
-    }
-
-  }
-
-// 快速填写弹窗样式
-.quick-fill-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 1500;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 40rpx;
-}
-
-.quick-fill-content {
-  background: #fff;
-  border-radius: 16rpx;
-  width: 100%;
-  max-width: 600rpx;
-  max-height: 80vh;
-  display: flex;
-  flex-direction: column;
-}
-
-.quick-fill-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.quick-fill-title {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #333;
-}
-
-.quick-fill-close {
-  width: 60rpx;
-  height: 60rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  
-  .close-text {
-    font-size: 32rpx;
-    color: #999;
-  }
-}
-
-.duplicate-notice {
-  padding: 32rpx;
-  text-align: center;
-  border-bottom: 1px solid #eee;
-  margin-bottom: 20rpx;
-  
-  text {
-    display: block;
-    margin-bottom: 20rpx;
-  }
-}
-
-.quick-fill-body {
-  padding: 32rpx;
-  flex: 1;
-  overflow-y: auto;
-}
-
-.quick-fill-tip {
-  margin-bottom: 24rpx;
-  font-size: 24rpx;
-  color: #666;
-  line-height: 1.5;
-  
-  text:first-child {
-    display: block;
-    margin-bottom: 8rpx;
-  }
-  
-  text:last-child {
-    display: block;
-    color: #29d3b4;
-    font-weight: 500;
-  }
-}
-
-.quick-fill-textarea {
-  width: 100%;
-  height: 300rpx;
-  border: 1px solid #ddd;
-  border-radius: 8rpx;
-  padding: 16rpx;
-  font-size: 28rpx;
-  line-height: 1.5;
-  background: #fafafa;
-  box-sizing: border-box;
-}
-
-.quick-fill-buttons {
-  display: flex;
-  gap: 20rpx;
-  padding: 32rpx;
-  border-top: 1px solid #f0f0f0;
-}
-
-.quick-fill-btn {
-  flex: 1;
-  height: 72rpx;
-  line-height: 72rpx;
-  text-align: center;
-  border-radius: 8rpx;
-  font-size: 28rpx;
-  font-weight: 600;
-  
-  &.cancel-btn {
-    background: #f5f5f5;
-    color: #666;
-    border: 1px solid #ddd;
-  }
-  
-  &.confirm-btn {
-    background: #29d3b4;
-    color: #fff;
-  }
-}
-
-// 转介绍资源选择相关样式
-.referral-search-container {
-  position: relative;
-  
-  .referral-search-results {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    right: 0;
-    background: #333;
-    border-radius: 8rpx;
-    border: 1px solid #555;
-    max-height: 400rpx;
-    overflow-y: auto;
-    z-index: 100;
-    margin-top: 8rpx;
-    
-    .referral-search-item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 20rpx;
-      border-bottom: 1px solid #555;
-      transition: background-color 0.2s;
-      
-      &:last-child {
-        border-bottom: none;
-      }
-      
-      &:hover, &.selected {
-        background: #434544;
-      }
-      
-      .resource-info {
-        flex: 1;
-        
-        .resource-name {
-          font-size: 28rpx;
-          color: #fff;
-          margin-bottom: 8rpx;
-        }
-        
-        .resource-phone {
-          font-size: 24rpx;
-          color: #999;
-        }
-      }
-      
-      .check-icon {
-        color: #29d3b4;
-        font-size: 32rpx;
-        font-weight: bold;
-      }
-    }
-  }
-  
-  .selected-referral-resource {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 16rpx;
-    background: #4a4a4a;
-    border-radius: 8rpx;
-    margin-top: 8rpx;
-    
-    .selected-resource-info {
-      flex: 1;
-      
-      .selected-resource-name {
-        font-size: 28rpx;
-        color: #29d3b4;
-        margin-bottom: 8rpx;
-      }
-      
-      .selected-resource-phone {
-        font-size: 24rpx;
-        color: #999;
-      }
-    }
-    
-    .clear-selection {
-      color: #f44336;
-      font-size: 32rpx;
-      font-weight: bold;
-      padding: 8rpx;
-      cursor: pointer;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/class_arrangement.vue b/uniapp/pages/market/clue/class_arrangement.vue
deleted file mode 100644
index 42946130..00000000
--- a/uniapp/pages/market/clue/class_arrangement.vue
+++ /dev/null
@@ -1,623 +0,0 @@
-<template>
-	<view class="class-arrange-root">
-		<!-- 顶部日期选择 -->
-		<view class="date-bar">
-			<view class="date-item" v-for="(item, idx) in weekList" :key="idx" :class="{active: item.status}" @click="getDate(item.date,item.day)">
-				<view class="week">{{ item.week }}</view>
-				<view class="day">{{ item.day }}</view>
-			</view>
-		</view>
-		<!-- "查询"按钮移到日期条下方 -->
-		<view class="more-bar-wrapper">
-			<view class="more-bar" @click="openSearchPopup">
-				<text>查询</text>
-				<uni-icons type="arrowdown" size="18" color="#bdbdbd" />
-			</view>
-		</view>
-		<!-- 日历底部弹窗 -->
-		<uni-popup ref="calendarPopup" type="bottom">
-			<uni-calendar @change="onCalendarChange" />
-		</uni-popup>
-
-		<!-- 查询弹窗 -->
-		<view v-if="showSearchPopup" class="search_popup_mask" @tap="showSearchPopup=false">
-			<view class="search_popup_content" @tap.stop>
-				<view class="popup_search_content">
-					<view class="popup_header">
-						<view class="popup_title">筛选</view>
-						<view class="popup_close" @tap="showSearchPopup=false">
-							<text class="close_text">✕</text>
-						</view>
-					</view>
-					
-					<scroll-view :scroll-y="true" class="popup_scroll_view">
-						<!-- 筛选区域 -->
-						<view class="popup_filter_section">
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">时间查询</text>
-									<picker :value="timeIndex" :range="timeOptions" @change="onTimeChange">
-										<view class="popup_filter_picker">{{ timeOptions[timeIndex] }}</view>
-									</picker>
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">班主任筛选</text>
-									<input class="popup_filter_input" placeholder="人员名称筛选" v-model="searchForm.teacher_name" />
-								</view>
-							</view>
-							
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">开始日期</text>
-									<picker mode="date" :value="searchForm.start_date" @change="onStartDateChange">
-										<view class="popup_filter_input">
-											{{ searchForm.start_date || '选择开始日期' }}
-										</view>
-									</picker>
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">结束日期</text>
-									<picker mode="date" :value="searchForm.end_date" @change="onEndDateChange">
-										<view class="popup_filter_input">
-											{{ searchForm.end_date || '选择结束日期' }}
-										</view>
-									</picker>
-								</view>
-							</view>
-							
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">固定位筛选</text>
-									<input class="popup_filter_input" placeholder="输入固定位编号" v-model="searchForm.venue_number" type="number" />
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-					
-					<view class="popup_filter_buttons">
-						<view class="popup_filter_btn reset_btn" @click="resetSearchOnly">重置</view>
-						<view class="popup_filter_btn search_btn" @click="searchDataAndClose">搜索</view>
-						<view class="popup_filter_btn close_btn" @click="closeSearchPopup">关闭</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-
-		<!-- 课程卡片列表 -->
-		<view class="course-list">
-			<view class="course-card" v-for="(course, idx) in courseList" :key="idx">
-				<view class="card-header">
-					<view class="status-end">{{ getStatusText(course.status) }}</view>
-				</view>
-				<view class="card-body">
-					<view class="row">时间：{{ course.course_date || '未设置' }}</view>
-					<view class="row">校区：{{ course.campus_name || '未设置' }}</view>
-					<view class="row">教室：{{ course.venue ? course.venue.venue_name : '未设置' }}</view>
-					<view class="row">课程：{{ course.course ? course.course.course_name : '未设置' }}</view>
-					<view class="row">人数：{{ course.available_capacity || 0 }}</view>
-					<view class="row">安排情况：{{ course.student ? course.student.length : 0 }}/{{course.max_students ? course.max_students : '不限'}}</view>
-				</view>
-				<view class="card-footer">
-					<button class="detail-btn" @click="viewDetail(course)">详情</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js';
-	export default {
-		data() {
-			return {
-				weekList: [],
-				selectedDayIndex: 4,
-				date: '',
-				courseList: [],
-				resource_id: '',
-        student_id: '',
-				
-				// 查询弹窗相关
-				showSearchPopup: false,
-				searchForm: {
-					time_hour: '',
-					start_date: '',
-					end_date: '',
-					teacher_name: '',
-					venue_number: ''
-				},
-				
-				// 时间选择器相关
-				timeIndex: 0,
-				timeOptions: ['全部时间', '上午(8:00-12:00)', '下午(12:00-18:00)', '晚上(18:00-22:00)']
-			};
-		},
-		onLoad(options) {
-			this.resource_id = options.resource_id || '';
-			this.student_id = options.student_id || '';
-			this.getDate();
-			
-		},
-		methods: {
-			async getDate(date = '', day = '') {
-				try {
-					let res = await apiRoute.getDate({
-						'date': date,
-						'day': day
-					})
-					this.weekList = res.data.dates
-					this.date = res.data.date
-
-					let data = await apiRoute.courseAllList({
-						'schedule_date': this.date
-					})
-					// 确保courseList是数组，并处理可能的空数据
-					this.courseList = Array.isArray(data.data) ? data.data : []
-
-
-				} catch (error) {
-					console.error('获取信息失败:', error);
-					// 确保即使出错也有默认数据
-					this.courseList = [];
-					uni.showToast({
-						title: '获取课程数据失败',
-						icon: 'none'
-					});
-				}
-			},
-			openCalendar() {
-				this.$refs.calendarPopup.open();
-			},
-			closeCalendar() {
-				console.log(123123)
-				this.$refs.calendarPopup.close();
-			},
-			viewDetail(course) {
-				// 跳转到课程详情页
-				const resourceId = this.resource_id || '';
-				const studentId = this.student_id || '';
-				uni.navigateTo({
-					url: '/pages-market/clue/class_arrangement_detail?schedule_id=' + course.id + '&resource_id=' + resourceId + '&student_id=' + studentId
-				});
-			},
-			onCalendarConfirm(e) {
-
-				// 这里可以处理选中的日期 e.fulldate
-				uni.showToast({
-					title: '选择日期：' + e.fulldate,
-					icon: 'none'
-				});
-
-				this.closeCalendar();
-			},
-			onCalendarChange(e) {
-				this.getDate(e.fulldate, e.date);
-				this.closeCalendar();
-			},
-			getStatusText(status) {
-				const statusMap = {
-					pending: '待开始',
-					upcoming: '即将开始',
-					ongoing: '进行中',
-					completed: '已结束'
-				};
-				return statusMap[status] || status;
-			},
-			
-			// 查询弹窗相关方法
-			openSearchPopup() {
-				this.showSearchPopup = true;
-			},
-			
-			closeSearchPopup() {
-				this.showSearchPopup = false;
-			},
-			
-			// 时间选择器变化
-			onTimeChange(e) {
-				this.timeIndex = e.detail.value;
-				this.searchForm.time_hour = this.timeOptions[this.timeIndex];
-			},
-			
-			// 开始日期选择变化
-			onStartDateChange(e) {
-				this.searchForm.start_date = e.detail.value;
-				console.log('开始日期选择:', e.detail.value);
-			},
-			
-			// 结束日期选择变化
-			onEndDateChange(e) {
-				this.searchForm.end_date = e.detail.value;
-				console.log('结束日期选择:', e.detail.value);
-			},
-			
-			// 搜索并关闭弹窗
-			searchDataAndClose() {
-				console.log('执行搜索，表单数据:', this.searchForm);
-				this.searchCourseData();
-				this.showSearchPopup = false;
-			},
-			
-			// 搜索课程数据
-			async searchCourseData() {
-				try {
-					let searchParams = {
-						schedule_date: this.date
-					};
-					
-					// 添加搜索条件
-					if (this.searchForm.time_hour && this.searchForm.time_hour !== '全部时间') {
-						searchParams.time_hour = this.searchForm.time_hour;
-					}
-					if (this.searchForm.start_date) {
-						searchParams.start_date = this.searchForm.start_date;
-					}
-					if (this.searchForm.end_date) {
-						searchParams.end_date = this.searchForm.end_date;
-					}
-					if (this.searchForm.teacher_name) {
-						searchParams.teacher_name = this.searchForm.teacher_name;
-					}
-					if (this.searchForm.venue_number) {
-						searchParams.venue_number = this.searchForm.venue_number;
-					}
-					
-					console.log('搜索参数:', searchParams);
-					
-					let data = await apiRoute.courseAllList(searchParams);
-					// 确保courseList是数组，并处理可能的空数据
-					this.courseList = Array.isArray(data.data) ? data.data : [];
-					
-					uni.showToast({
-						title: '查询完成',
-						icon: 'success'
-					});
-				} catch (error) {
-					console.error('搜索失败:', error);
-					uni.showToast({
-						title: '搜索失败',
-						icon: 'none'
-					});
-				}
-			},
-			
-			// 重置搜索条件
-			resetSearchOnly() {
-				this.searchForm = {
-					time_hour: '',
-					start_date: '',
-					end_date: '',
-					teacher_name: '',
-					venue_number: ''
-				};
-				this.timeIndex = 0;
-				
-				// 重新加载默认数据
-				this.getDate();
-			},
-			
-			// 数据安全处理方法 - 确保嵌套对象访问的安全性
-			safeGet(obj, path, defaultValue = '') {
-				if (!obj) return defaultValue;
-				const keys = path.split('.');
-				let result = obj;
-				for (let key of keys) {
-					if (result === null || result === undefined || !result.hasOwnProperty(key)) {
-						return defaultValue;
-					}
-					result = result[key];
-				}
-				return result || defaultValue;
-			}
-		},
-	};
-</script>
-
-<style lang="less" scoped>
-	.class-arrange-root {
-		background: #232323;
-		min-height: 100vh;
-		padding-bottom: 30rpx;
-	}
-
-	.date-bar {
-		display: flex;
-		align-items: center;
-		background: #232323;
-		padding: 0 0 10rpx 0;
-		overflow-x: auto;
-		border-bottom: 1px solid #333;
-
-		.date-item {
-			flex: 1;
-			text-align: center;
-			color: #bdbdbd;
-			padding: 16rpx 0 0 0;
-
-			.week {
-				font-size: 22rpx;
-			}
-
-			.day {
-				font-size: 28rpx;
-				margin-top: 4rpx;
-			}
-
-			&.active {
-				color: #29d3b4;
-
-				.day {
-					border-radius: 50%;
-					background: #333;
-					color: #29d3b4;
-					padding: 2rpx 10rpx;
-				}
-			}
-		}
-	}
-
-	.more-bar-wrapper {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		margin: 10rpx 0 0 0;
-	}
-
-	.more-bar {
-		display: flex;
-		align-items: center;
-		color: #bdbdbd;
-		font-size: 22rpx;
-		cursor: pointer;
-		background: #333;
-		border-radius: 20rpx;
-		padding: 8rpx 24rpx;
-	}
-
-	.course-list {
-		margin-top: 20rpx;
-
-		.course-card {
-			background: #434544;
-			border-radius: 10rpx;
-			margin: 0 0 20rpx 0;
-			padding: 0 0 20rpx 0;
-			box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-
-			.card-header {
-				display: flex;
-				justify-content: flex-end;
-				padding: 10rpx 20rpx 0 0;
-
-				.status-end {
-					background: #e95c6b;
-					color: #fff;
-					border-radius: 10rpx;
-					padding: 4rpx 18rpx;
-					font-size: 22rpx;
-				}
-			}
-
-			.card-body {
-				padding: 0 20rpx;
-
-				.row {
-					color: #fff;
-					font-size: 24rpx;
-					margin: 8rpx 0;
-				}
-			}
-
-			.card-footer {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 0 20rpx;
-
-				.sign-info {
-					color: #bdbdbd;
-					font-size: 22rpx;
-				}
-
-				.detail-btn {
-					background: transparent;
-					border: 2rpx solid #ffd86b;
-					color: #ffd86b;
-					border-radius: 8rpx;
-					padding: 6rpx 24rpx;
-					font-size: 24rpx;
-          width: 100%;
-					margin-top: 40rpx;
-				}
-			}
-		}
-	}
-
-	// 搜索弹窗样式
-	.search_popup_mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.6);
-		z-index: 999;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.search_popup_content {
-		background: #fff;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-		animation: slideDown 0.3s ease-out;
-		width: 100%;
-		max-height: 80vh;
-		overflow: hidden;
-		display: flex;
-		flex-direction: column;
-	}
-
-	@keyframes slideDown {
-		from {
-			transform: translateY(-100%);
-		}
-		to {
-			transform: translateY(0);
-		}
-	}
-
-	// 弹窗搜索内容样式
-	.popup_search_content {
-		padding: 0;
-		background: #fff;
-		min-height: 60vh;
-		max-height: 80vh;
-		display: flex;
-		flex-direction: column;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-		overflow: hidden;
-	}
-
-	.popup_header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 32rpx;
-		border-bottom: 1px solid #f0f0f0;
-	}
-
-	.popup_title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.popup_close {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		.close_text {
-			font-size: 32rpx;
-			color: #999;
-		}
-	}
-
-	.popup_scroll_view {
-		flex: 1;
-		padding: 32rpx;
-		overflow-y: auto;
-	}
-
-	.popup_filter_section {
-		margin-bottom: 32rpx;
-		
-		&:last-child {
-			margin-bottom: 0;
-		}
-	}
-
-	.popup_filter_row {
-		display: flex;
-		gap: 20rpx;
-		margin-bottom: 24rpx;
-		
-		&:last-child {
-			margin-bottom: 0;
-		}
-	}
-
-	.popup_filter_item {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		gap: 12rpx;
-		
-		&.full_width {
-			flex: 1;
-		}
-		
-		.popup_filter_label {
-			font-size: 26rpx;
-			color: #666;
-			font-weight: 500;
-		}
-		
-		.popup_filter_input {
-			height: 72rpx;
-			line-height: 72rpx;
-			padding: 0 16rpx;
-			border: 1px solid #ddd;
-			border-radius: 8rpx;
-			font-size: 28rpx;
-			color: #333;
-			background: #fff;
-			
-			&::placeholder {
-				color: #999;
-			}
-		}
-		
-		.popup_filter_picker {
-			height: 72rpx;
-			line-height: 72rpx;
-			padding: 0 16rpx;
-			border: 1px solid #ddd;
-			border-radius: 8rpx;
-			font-size: 28rpx;
-			color: #333;
-			background: #fff;
-			position: relative;
-			
-			&::after {
-				content: '▼';
-				position: absolute;
-				right: 16rpx;
-				font-size: 20rpx;
-				color: #999;
-			}
-		}
-	}
-
-	.popup_filter_buttons {
-		display: flex;
-		gap: 20rpx;
-		padding: 32rpx;
-		margin-top: auto;
-		border-top: 1px solid #f0f0f0;
-		background: #fff;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-	}
-
-	.popup_filter_btn {
-		flex: 1;
-		height: 72rpx;
-		line-height: 72rpx;
-		text-align: center;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-		
-		&.search_btn {
-			background: #29d3b4;
-			color: #fff;
-		}
-		
-		&.reset_btn {
-			background: #f5f5f5;
-			color: #666;
-			border: 1px solid #ddd;
-		}
-		
-		&.close_btn {
-			background: #666;
-			color: #fff;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/class_arrangement_detail.vue b/uniapp/pages/market/clue/class_arrangement_detail.vue
deleted file mode 100644
index 949d09cc..00000000
--- a/uniapp/pages/market/clue/class_arrangement_detail.vue
+++ /dev/null
@@ -1,1292 +0,0 @@
-<template>
-  <view class="course-schedule">
-    <!-- Course Info -->
-    <view class="course-info">
-      <text class="course-title">课程安排详情</text>
-      <view class="course-detail">
-        <text class="course-item">日期：{{ schedule_info.course_date }}</text>
-        <text class="course-item">课程名称：{{ schedule_info.course_name }}</text>
-        <text class="course-item">课程时间：{{ schedule_info.time_slot }}</text>
-        <text class="course-item">主教练：{{ schedule_info.coach_name || '待安排' }}</text>
-        <text class="course-item">场地信息：{{ schedule_info.venue_name }}</text>
-      </view>
-    </view>
-
-    <!-- Formal Students Section -->
-    <view class="section">
-      <text class="section-title">正式学员</text>
-      <view class="cards-grid">
-        <!-- Student Card with Data -->
-        <view 
-          v-for="(stu, idx) in formalStudents" 
-          :key="idx" 
-          class="student-card filled"
-          @tap="viewStudent(stu)"
-        >
-          <view v-if="stu.renewal_status" class="renewal-badge">待续费</view>
-          <view class="avatar">{{ stu.name && stu.name.charAt(0) }}</view>
-          <view class="student-info">
-            <view class="student-name">{{ stu.name }}</view>
-            <view class="student-age">年龄：{{ stu.age || '未知' }}岁</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>
-          </view>
-        </view>
-
-        <!-- Empty Slots -->
-        <view 
-          v-for="n in formalEmptySeats" 
-          :key="n" 
-          class="student-card empty" 
-          :data-type="'formal'"
-          :data-index="n"
-          @tap="openStudentModal"
-        >
-          <view class="add-icon">
-            <text class="plus-icon">+</text>
-          </view>
-          <view class="add-text">
-            <view class="slot-title">空位</view>
-            <view class="slot-subtitle">点击添加学员</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- Waiting List Section -->
-    <view class="section">
-      <text class="section-title waiting-title">等待位</text>
-      <view class="cards-grid">
-        <!-- Waiting Students -->
-        <view 
-          v-for="(stu, idx) in waitingStudents" 
-          :key="idx" 
-          class="student-card waiting filled"
-          @tap="viewStudent(stu)"
-        >
-          <view class="avatar waiting-avatar">{{ stu.name && stu.name.charAt(0) }}</view>
-          <view class="student-info">
-            <view class="student-name">{{ stu.name }}</view>
-            <view class="student-age">年龄：{{ stu.age || '未知' }}岁</view>
-            <view class="course-status">课程状态：{{ stu.courseStatus }}</view>
-            <view class="course-progress">上课情况：{{ stu.course_progress.used }}/{{ stu.course_progress.total }}节 ({{ stu.course_progress.percentage }}%)</view>
-            <view class="expiry-date">到期时间：{{ stu.expiryDate || '未设置' }}</view>
-          </view>
-        </view>
-        
-        <!-- Waiting Empty Slots -->
-        <view 
-          v-for="n in waitingEmptySeats" 
-          :key="n" 
-          class="student-card waiting" 
-          :data-type="'waiting'"
-          :data-index="n"
-          @tap="openStudentModal"
-        >
-          <view class="add-icon waiting-icon">
-            <text class="plus-icon">+</text>
-          </view>
-          <view class="add-text">
-            <view class="slot-title">等待位</view>
-            <view class="slot-subtitle">点击添加学员</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- Bottom Popup Modal -->
-    <view v-if="showModal" class="modal-overlay" @tap="closeModal">
-      <view class="modal-content" @tap.stop>
-        <view class="modal-header">
-          <text>添加学员</text>
-        </view>
-        
-        <view class="modal-body">
-          <!-- Customer Selection - 只在没有预设学生时显示 -->
-          <view v-if="!presetStudent || (!presetStudent.name && !presetStudent.phone)" class="form-section">
-            <text class="form-label">客户选择</text>
-            
-            <input 
-              v-model="searchQuery"
-              placeholder="请输入手机号或姓名"
-              class="search-input"
-              @input="searchStudents"
-            />
-            
-            <!-- Search Results -->
-            <view v-if="searchResults.length > 0" class="search-results">
-              <view 
-                v-for="student in searchResults" 
-                :key="student.id"
-                :class="['student-item', { selected: selectedStudent && selectedStudent.id === student.id }]"
-                @tap="selectStudent(student)"
-              >
-                <view class="student-avatar">{{ student.name ? student.name.charAt(0) : '?' }}</view>
-                <view class="student-details">
-                  <view class="student-name">
-                    {{ student.name }}
-                    <text v-if="student.is_formal_student" class="formal-badge">正式学员</text>
-                  </view>
-                  <view class="student-phone">{{ student.phone }}</view>
-                </view>
-                <view v-if="selectedStudent && selectedStudent.id === student.id" class="check-icon">
-                  <text>✓</text>
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <!-- 预设学生信息显示 -->
-          <view v-if="presetStudent && presetStudent.name && presetStudent.phone" class="form-section">
-            <text class="form-label">选中学员</text>
-            <view class="preset-student">
-              <view class="student-avatar">{{ (presetStudent && presetStudent.name) ? presetStudent.name.charAt(0) : '?' }}</view>
-              <view class="student-details">
-                <view class="student-name">{{ (presetStudent && presetStudent.name) || '未知学员' }}</view>
-                <view class="student-phone">{{ (presetStudent && presetStudent.phone) || '未知手机号' }}</view>
-              </view>
-            </view>
-          </view>
-
-          <!-- Course Arrangement -->
-          <view class="form-section">
-            <text class="form-label">课程安排</text>
-            <view class="radio-group">
-              <label class="radio-item">
-                <radio 
-                  value="1" 
-                  :checked="courseArrangement === '1'"
-                  @tap="courseArrangement = '1'"
-                />
-                <text class="radio-text">临时课</text>
-              </label>
-              <label class="radio-item">
-                <radio 
-                  value="2" 
-                  :checked="courseArrangement === '2'"
-                  @tap="courseArrangement = '2'"
-                />
-                <text class="radio-text">固定课</text>
-              </label>
-            </view>
-          </view>
-
-          <!-- Remarks -->
-          <view class="form-section">
-            <text class="form-label">备注</text>
-            <textarea 
-              v-model="remarks"
-              placeholder="请输入备注信息"
-              class="remarks-textarea"
-            ></textarea>
-          </view>
-        </view>
-
-        <!-- Modal Footer -->
-        <view class="modal-footer">
-          <view class="btn btn-cancel" @tap="closeModal">取消</view>
-          <view class="btn btn-confirm" @tap="confirmSelection">确定</view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 请假原因弹窗 -->
-    <fui-modal ref="leaveReasonModal" :buttons="[]" width="600" title="请假申请">
-      <view class="leave-form">
-        <view class="leave-label">请假原因</view>
-        <view class="leave-input">
-          <fui-textarea v-model="leaveReason" placeholder="请输入请假原因" :isCounter="true" :maxlength="200"
-            minHeight="200" :isAutoHeight="true"></fui-textarea>
-        </view>
-        <view class="leave-buttons">
-          <fui-button background="#434544" color="#fff" borderColor="#666" btnSize="medium"
-            @tap="$refs.leaveReasonModal.close()">取消</fui-button>
-          <fui-button background="#29d3b4" color="#fff" btnSize="medium"
-            @tap="submitLeaveRequest">提交</fui-button>
-        </view>
-      </view>
-    </fui-modal>
-  </view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js';
-	export default {
-		data() {
-			return {
-				course_id: '',
-				schedule_info: {}, // 课程安排基本信息
-				date: '',
-				students: [], // 所有学员数据
-				formalStudents: [], // 正式学员
-				waitingStudents: [], // 等待位学员
-				resource_id: '',
-				student_id: '', // 预设学生ID
-				leaveReason: '', // 请假原因
-				currentStudent: null, // 当前操作的学生
-				formalEmptySeats: [], // 正式学员空位数组
-				waitingEmptySeats: [1, 2], // 等待位固定2个空位
-				
-				// 新增弹窗相关数据
-				showModal: false,
-				searchQuery: '',
-				courseArrangement: '1', // 1=临时课, 2=固定课
-				remarks: '',
-				selectedStudent: null,
-				currentSlot: null,
-				searchResults: [],
-				presetStudent: null // 预设学生信息
-			};
-		},
-		onLoad(query) {
-			console.log('onLoad 参数:', query);
-			// 支持两种参数名：id 和 schedule_id
-			this.course_id = query.id || query.schedule_id || '';
-			this.resource_id = query.resource_id || '';
-			this.student_id = query.student_id || '';
-			
-			console.log('初始化参数 - course_id:', this.course_id, 'resource_id:', this.resource_id, 'student_id:', this.student_id);
-			
-			// 智能路由逻辑：如果有预设的resource_id和student_id，直接获取学生信息
-			if (this.resource_id && this.student_id) {
-				this.loadPresetStudent();
-			}
-			
-			// 确保有课程ID才调用API
-			if (this.course_id) {
-				this.getScheduleDetail();
-			} else {
-				console.error('缺少课程ID参数');
-				uni.showToast({
-					title: '缺少课程ID参数',
-					icon: 'none'
-				});
-			}
-		},
-		methods: {
-			// 返回上一页
-			goBack() {
-				uni.navigateBack();
-			},
-
-			// 加载预设学生信息
-			async loadPresetStudent() {
-				try {
-					// 调用API获取客户资源详细信息
-					const res = await apiRoute.getCustomerResourcesInfo({ resource_sharing_id: this.resource_id });
-					if (res.code === 1 && res.data) {
-						// 直接从客户资源详情获取基础信息，然后调用优化后的接口获取课程状态
-						const customerRes = await apiRoute.getCustomerResourcesAll({ 
-							phone_number: res.data.phone_number 
-						});
-						
-						let isFormalStudent = false;
-						let courseInfo = [];
-						
-						if (customerRes.code === 1 && customerRes.data && customerRes.data.length > 0) {
-							const customer = customerRes.data.find(c => c.member_id === res.data.member_id);
-							if (customer) {
-								isFormalStudent = customer.is_formal_student || false;
-								courseInfo = customer.course_info || [];
-							}
-						}
-						
-						this.presetStudent = {
-							id: res.data.id,
-							name: res.data.name,
-							phone: res.data.phone_number,
-							age: res.data.age,
-							member_id: res.data.member_id,
-							resource_id: res.data.id,
-							is_formal_student: isFormalStudent,
-							course_info: courseInfo
-						};
-						
-						this.selectedStudent = this.presetStudent;
-						console.log('加载预设学生信息:', this.presetStudent);
-					}
-				} catch (error) {
-					console.error('加载预设学生信息失败:', error);
-				}
-			},
-
-			// 打开学生选择弹窗
-			openStudentModal(event) {
-				// 从 data 属性获取参数
-				const type = event.currentTarget.dataset.type;
-				const index = event.currentTarget.dataset.index;
-
-				this.showModal = true;
-				this.currentSlot = { type, index };
-				this.resetForm();
-
-				// 如果有预设学生，直接选中
-				if (this.presetStudent) {
-					this.selectedStudent = this.presetStudent;
-				}
-			},
-
-			// 关闭弹窗
-			closeModal() {
-				this.showModal = false;
-				this.resetForm();
-			},
-
-			// 重置表单
-			resetForm() {
-				if (!this.presetStudent) {
-					this.searchQuery = '';
-					this.searchResults = [];
-					this.selectedStudent = null;
-				}
-				this.courseArrangement = '1';
-				this.remarks = '';
-			},
-
-			// 搜索学生 - 智能检索
-			async searchStudents() {
-				if (!this.searchQuery.trim()) {
-					this.searchResults = [];
-					return;
-				}
-
-				// 智能判断输入类型：如果全是数字则判断为手机号，否则为姓名
-				const isPhoneNumber = /^\d+$/.test(this.searchQuery.trim());
-				
-				try {
-					uni.showLoading({
-						title: '搜索中...'
-					});
-
-					// 调用后端接口进行检索
-					const params = {};
-					if (isPhoneNumber) {
-						params.phone_number = this.searchQuery.trim();
-					} else {
-						params.name = this.searchQuery.trim();
-					}
-
-					const res = await apiRoute.getCustomerResourcesAll(params);
-					
-					uni.hideLoading();
-
-					if (res.code === 1 && Array.isArray(res.data)) {
-						// 后端已经返回了正式学员状态，直接使用
-						this.searchResults = res.data.map(student => ({
-							id: student.id,
-							name: student.name,
-							phone: student.phone_number,
-							age: student.age,
-							member_id: student.member_id,
-							resource_id: student.id,
-							is_formal_student: student.is_formal_student || false,
-							course_info: student.course_info || []
-						}));
-					} else {
-						this.searchResults = [];
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('搜索学员失败:', error);
-					this.searchResults = [];
-				}
-			},
-
-
-			// 选择学生
-			selectStudent(student) {
-				this.selectedStudent = student;
-			},
-
-			// 确认选择
-			async confirmSelection() {
-				if (!this.selectedStudent) {
-					uni.showToast({
-						title: '请选择学员',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 如果选择的是固定课，需要验证是否为正式学员
-				if (this.courseArrangement === '2') {
-					if (!this.selectedStudent.is_formal_student) {
-						uni.showToast({
-							title: '只有正式学员才能选择固定课',
-							icon: 'none'
-						});
-						return;
-					}
-				}
-
-				// 构建添加学员的数据
-				const data = {
-					'resources_id': this.selectedStudent.resource_id || this.resource_id,
-					'person_type': 'customer_resource',
-					'schedule_id': this.course_id,
-					'course_date': this.schedule_info.course_date,
-					'time_slot': this.schedule_info.time_slot,
-					'position': this.currentSlot.index,
-					'schedule_type': this.currentSlot.type === 'waiting' ? 2 : 1,
-					'course_type': this.currentSlot.type === 'waiting' ? 3 : parseInt(this.courseArrangement),
-					'remark': this.remarks
-				};
-
-				try {
-					uni.showLoading({
-						title: '添加中...'
-					});
-
-					let res = await apiRoute.addSchedule(data);
-
-					uni.hideLoading();
-
-					if (res.code == 1) {
-						uni.showToast({
-							title: '添加成功',
-							icon: 'success'
-						});
-
-						this.closeModal();
-						// 刷新数据
-						await this.getScheduleDetail();
-					} else {
-						uni.showToast({
-							title: res.msg || '添加失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error('添加学员失败:', error);
-					
-					// 尝试获取具体的错误信息
-					let errorMsg = '添加失败';
-					if (error && error.data && error.data.msg) {
-						errorMsg = error.data.msg;
-					} else if (error && error.message) {
-						errorMsg = error.message;
-					} else if (typeof error === 'string') {
-						errorMsg = error;
-					}
-					
-					uni.showToast({
-						title: errorMsg,
-						icon: 'none'
-					});
-				}
-			},
-
-			// 获取课程安排类型文本
-			getScheduleTypeText(type) {
-				const typeMap = {
-					1: '固定课',
-					2: '临时课'
-				};
-				return typeMap[type] || '未知';
-			},
-			viewStudent(stu) {
-				console.log(stu, this.schedule_info);
-
-				// 显示操作选项弹窗
-				uni.showActionSheet({
-					title: `学员: ${stu.name}`,
-					itemList: stu.person_type === 'customer_resource' ? ['取消课程'] : ['申请请假'],
-					success: (res) => {
-						if (res.tapIndex === 0) {
-							// 判断学员类型
-							if (stu.person_type === 'customer_resource') {
-								// 如果是客户资源，弹出确认取消课程的弹窗
-								uni.showModal({
-									title: '取消课程',
-									content: `是否取消学员 ${stu.name} 的课程？`,
-									success: async (res) => {
-										if (res.confirm) {
-											// 用户点击确定，调用schedule_del接口
-											try {
-												uni.showLoading({
-													title: '处理中...'
-												});
-
-												const params = {
-													resources_id: stu.resources_id,
-													id: this.schedule_info.id
-												};
-
-												const result = await apiRoute.schedule_del(params);
-
-												uni.hideLoading();
-
-												if (result.code === 1) {
-													uni.showToast({
-														title: '取消课程成功',
-														icon: 'success'
-													});
-
-													// 刷新数据
-													await this.getScheduleDetail();
-												} else {
-													uni.showToast({
-														title: result.msg || '取消课程失败',
-														icon: 'none'
-													});
-												}
-											} catch (error) {
-												uni.hideLoading();
-												uni.showToast({
-													title: '操作失败，请重试',
-													icon: 'none'
-												});
-												console.error('取消课程失败:', error);
-											}
-										}
-									}
-								});
-							} else if (stu.person_type === 'student') {
-								// 如果是学生，弹出请假原因输入框
-								this.$refs.leaveReasonModal.open();
-								this.currentStudent = stu; // 保存当前操作的学生信息
-							}
-						}
-					}
-				});
-			},
-			getStatusText(status) {
-				const statusMap = {
-					0: '待上课',
-					1: '已上课',
-					2: '请假'
-				};
-				return statusMap[status] || status;
-			},
-			// 获取课程类型文本
-			getCourseTypeText(courseType) {
-				const courseTypeMap = {
-					1: '正式课',
-					2: '体验课',
-					3: '补课',
-					4: '试听课'
-				};
-				return courseTypeMap[courseType] || '未知';
-			},
-			// 分类学员数据
-			categorizeStudents() {
-				// 根据schedule_type分类学员
-				// schedule_type: 1=正式位, 2=等待位
-				this.formalStudents = this.students.filter(stu => stu.schedule_type === 1 || stu.schedule_type === null);
-				this.waitingStudents = this.students.filter(stu => stu.schedule_type === 2);
-
-				// 确保学员名称存在，如果不存在则返回未知学员
-				this.formalStudents.forEach(stu => {
-					if (!stu.name) stu.name = '未知学员';
-				});
-				this.waitingStudents.forEach(stu => {
-					if (!stu.name) stu.name = '未知学员';
-				});
-
-				console.log('学员分类完成:', {
-					formal: this.formalStudents.length,
-					waiting: this.waitingStudents.length
-				});
-			},
-			async scheduleList() {
-				try {
-					console.log('开始获取学员列表, schedule_id:', this.course_id);
-					let res = await apiRoute.scheduleList({
-						'schedule_id': this.course_id
-					})
-
-					console.log('学员列表响应:', res);
-
-					if (res.code === 1 && Array.isArray(res.data)) {
-						// 确保学员列表按照位置排序
-						this.students = res.data.sort((a, b) => {
-							// 如果有position字段，按position排序
-							if (a.position !== undefined && b.position !== undefined) {
-								return parseInt(a.position) - parseInt(b.position);
-							}
-							// 否则按照ID排序
-							return a.id - b.id;
-						});
-
-						// 分类学员
-						this.categorizeStudents();
-					} else {
-						this.students = [];
-						this.formalStudents = [];
-						this.waitingStudents = [];
-					}
-
-					// 更新可用容量
-					this.updateAvailableCapacity();
-
-					return this.students;
-				} catch (error) {
-					console.error('获取学员列表失败:', error);
-					this.students = [];
-					this.formalStudents = [];
-					this.waitingStudents = [];
-					return [];
-				}
-			},
-			async getScheduleDetail() {
-				try {
-					console.log('开始获取课程安排详情, schedule_id:', this.course_id);
-					let res = await apiRoute.getScheduleDetail({
-						'schedule_id': this.course_id
-					})
-					console.log('课程安排详情响应:', res);
-
-					if (res.code === 1 && res.data) {
-						this.schedule_info = res.data.schedule_info;
-						this.formalStudents = res.data.formal_students || [];
-						this.waitingStudents = res.data.waiting_students || [];
-
-						// 计算可用容量
-						this.updateAvailableCapacity();
-					} else {
-						uni.showToast({
-							title: res.msg || '获取课程安排详情失败',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					console.error('获取课程安排详情失败:', error);
-					uni.showToast({
-						title: '获取课程安排详情失败',
-						icon: 'none'
-					});
-				}
-			},
-			// 更新可用容量
-			updateAvailableCapacity() {
-				// 确保schedule_info已加载
-				if (!this.schedule_info) return;
-
-				console.log('更新可用容量 - 课程最大容量:', this.schedule_info.max_students, '正式学员数量:', this.formalStudents.length);
-
-				// 计算正式位已占用的位置数
-				const occupiedFormalSeats = this.formalStudents.length;
-
-				// 获取课程最大容量（正式位）
-				const maxStudents = parseInt(this.schedule_info.max_students) || 0;
-
-				let remainingFormalSeats = 0;
-				if (maxStudents === 0) {
-					// 如果max_students为0，则没有学员限制，可以一直新增学员
-					// 这里设置一个合理的默认显示数量，比如显示最多6个空位
-					remainingFormalSeats = Math.max(1, 6 - occupiedFormalSeats);
-				} else {
-					// 有限制的情况下，计算剩余空位
-					remainingFormalSeats = Math.max(0, maxStudents - occupiedFormalSeats);
-				}
-
-				console.log('计算后的正式位剩余容量:', remainingFormalSeats);
-
-				// 初始化正式位空位数组
-				this.formalEmptySeats = [];
-				for (let i = 1; i <= remainingFormalSeats; i++) {
-					this.formalEmptySeats.push(i);
-				}
-
-				// 等待位永远都能添加学员，这里固定显示2个等待位空位（减去已有的等待位学员）
-				const remainingWaitingSeats = Math.max(0, 2 - this.waitingStudents.length);
-				this.waitingEmptySeats = [];
-				for (let i = 1; i <= remainingWaitingSeats; i++) {
-					this.waitingEmptySeats.push(i);
-				}
-
-				console.log('等待位剩余空位:', remainingWaitingSeats);
-			},
-			async addStudent(e, index, type = 'formal') {
-				console.log('添加学员到位置:', index, '类型:', type);
-
-				const data = {
-					'resources_id': this.resource_id,
-					'person_type': 'customer_resource',
-					'schedule_id': this.course_id,
-					'course_date': this.schedule_info.course_date,
-					'time_slot': this.schedule_info.time_slot,
-					'position': index, // 位置信息
-					'schedule_type': type === 'waiting' ? 2 : 1, // 1=正式位, 2=等待位
-					'course_type': type === 'waiting' ? 3 : 1 // 3=等待位, 1=正式课
-				};
-
-				try {
-					uni.showLoading({
-						title: '添加中...'
-					});
-
-					let res = await apiRoute.addSchedule(data)
-
-					uni.hideLoading();
-
-					if (res.code == 1) {
-						uni.showToast({
-							title: '添加成功',
-							icon: 'success'
-						});
-
-						// 刷新数据并更新可用容量
-						await this.getScheduleDetail();
-					} else {
-						uni.showToast({
-							title: res.msg || '添加失败',
-							icon: 'none'
-						});
-					}
-
-				} catch (error) {
-					uni.hideLoading();
-					console.error('添加学员失败:', error);
-					
-					// 尝试获取具体的错误信息
-					let errorMsg = '添加失败';
-					if (error && error.data && error.data.msg) {
-						errorMsg = error.data.msg;
-					} else if (error && error.message) {
-						errorMsg = error.message;
-					} else if (typeof error === 'string') {
-						errorMsg = error;
-					}
-					
-					uni.showToast({
-						title: errorMsg,
-						icon: 'none'
-					});
-				}
-			},
-			// 提交请假申请
-			submitLeaveRequest() {
-				if (!this.leaveReason.trim()) {
-					uni.showToast({
-						title: '请填写请假原因',
-						icon: 'none'
-					});
-					return;
-				}
-
-				// 调用请假接口
-				uni.showLoading({
-					title: '提交中...'
-				});
-
-				// 构建请假参数
-				const params = {
-					resources_id: this.currentStudent.resources_id,
-					id: this.schedule_info.id,
-					remark: this.leaveReason
-				};
-
-				// 调用请假接口
-				apiRoute.schedule_del(params)
-					.then(res => {
-						uni.hideLoading();
-						if (res.code === 1) {
-							uni.showToast({
-								title: '请假申请提交成功',
-								icon: 'success'
-							});
-							this.$refs.leaveReasonModal.close();
-							this.leaveReason = ''; // 清空请假原因
-
-							// 刷新数据并更新可用容量
-							this.getScheduleDetail().then(() => {
-								// 确保数据刷新后更新可用容量
-								this.updateAvailableCapacity();
-							});
-						} else {
-							uni.showToast({
-								title: res.msg || '请假申请提交失败',
-								icon: 'none'
-							});
-						}
-					})
-					.catch(err => {
-						uni.hideLoading();
-						uni.showToast({
-							title: '请假申请提交失败，请重试',
-							icon: 'none'
-						});
-					});
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-.course-schedule {
-	background: #232323;
-	min-height: 100vh;
-	padding-bottom: 30rpx;
-}
-
-.header {
-	display: flex;
-	align-items: center;
-	padding: 40rpx 30rpx 20rpx 30rpx;
-	position: relative;
-
-	.back-btn {
-		position: absolute;
-		left: 30rpx;
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		.back-icon {
-			color: #fff;
-			font-size: 48rpx;
-			font-weight: bold;
-		}
-	}
-
-	.title {
-		color: #fff;
-		font-size: 36rpx;
-		font-weight: bold;
-		text-align: center;
-		flex: 1;
-	}
-}
-
-.course-info {
-	font-size: 28rpx;
-	background: #434544;
-	border-radius: 16rpx;
-	padding: 30rpx 20rpx;
-
-	.course-title {
-		color: #fff;
-		font-size: 32rpx;
-		font-weight: bold;
-		margin-bottom: 16rpx;
-		display: block;
-	}
-
-	.course-detail {
-		.course-item {
-			color: #29d3b4;
-			font-size: 26rpx;
-			margin-bottom: 8rpx;
-			display: block;
-		}
-	}
-}
-
-.section {
-	margin: 30rpx;
-	
-	.section-title {
-		color: #ffd86b;
-		font-size: 28rpx;
-		margin-bottom: 30rpx;
-		display: block;
-		
-		&.waiting-title {
-			color: #8a7fff !important;
-		}
-	}
-}
-
-.cards-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 20rpx;
-}
-
-.student-card {
-	background: #333;
-	border-radius: 12rpx;
-	padding: 24rpx;
-	width: calc(50% - 10rpx);
-	box-sizing: border-box;
-	display: flex;
-	align-items: flex-start;
-	position: relative;
-	min-height: 200rpx;
-
-	.renewal-badge {
-		position: absolute;
-		top: 8rpx;
-		right: 8rpx;
-		background: #ff6b6b;
-		color: #fff;
-		font-size: 20rpx;
-		padding: 4rpx 8rpx;
-		border-radius: 8rpx;
-	}
-
-	.avatar {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: #29d3b4;
-		color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 32rpx;
-		margin-right: 18rpx;
-		flex-shrink: 0;
-
-		&.waiting-avatar {
-			background: #8a7fff;
-		}
-	}
-
-	.student-info {
-		flex: 1;
-		overflow: hidden;
-
-		.student-name {
-			color: #fff;
-			font-size: 28rpx;
-			font-weight: bold;
-			margin-bottom: 8rpx;
-		}
-
-		.student-age,
-		.course-status,
-		.course-arrangement,
-		.remaining-hours,
-		.expiry-date {
-			color: #bdbdbd;
-			font-size: 22rpx;
-			margin-bottom: 4rpx;
-			line-height: 1.3;
-		}
-	}
-
-	.add-icon {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: #ffd86b;
-		color: #232323;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 18rpx;
-		flex-shrink: 0;
-
-		.plus-icon {
-			font-size: 36rpx;
-			font-weight: bold;
-		}
-
-		&.waiting-icon {
-			background: #8a7fff;
-			color: #1a1a2a;
-		}
-	}
-
-	.add-text {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-
-		.slot-title {
-			color: #ffd86b;
-			font-size: 28rpx;
-			font-weight: bold;
-			margin-bottom: 4rpx;
-		}
-
-		.slot-subtitle {
-			color: #ffd86b;
-			font-size: 22rpx;
-		}
-	}
-
-	&.empty {
-		border: 2rpx dashed #ffd86b;
-		background: #232323;
-	}
-
-	&.waiting {
-		background: #2a2a3a;
-		border: 1rpx solid #8a7fff;
-
-		&.empty {
-			border: 2rpx dashed #8a7fff;
-			background: #1a1a2a;
-
-			.add-text {
-				.slot-title,
-				.slot-subtitle {
-					color: #8a7fff;
-				}
-			}
-		}
-
-		&.filled {
-			.student-info {
-				.student-name {
-					color: #8a7fff;
-				}
-			}
-		}
-	}
-}
-
-/* 弹窗样式 */
-.modal-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100vw;
-	height: 100vh;
-	background: rgba(0, 0, 0, 0.5);
-	z-index: 1000;
-	display: flex;
-	align-items: flex-end;
-}
-
-.modal-content {
-	background: #fff;
-	border-radius: 24rpx 24rpx 0 0;
-	width: 100%;
-	max-height: 80vh;
-	overflow: hidden;
-}
-
-.modal-header {
-	padding: 40rpx;
-	border-bottom: 1rpx solid #eee;
-	text-align: center;
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #333;
-}
-
-.modal-body {
-	padding: 40rpx;
-	max-height: 60vh;
-	overflow-y: auto;
-}
-
-.form-section {
-	margin-bottom: 40rpx;
-
-	.form-label {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 20rpx;
-		display: block;
-	}
-}
-
-.search-tabs {
-	display: flex;
-	gap: 20rpx;
-	margin-bottom: 20rpx;
-
-	.tab-btn {
-		flex: 1;
-		padding: 20rpx;
-		text-align: center;
-		background: #f5f5f5;
-		border-radius: 8rpx;
-		font-size: 26rpx;
-		color: #666;
-
-		&.active {
-			background: #29d3b4;
-			color: #fff;
-		}
-	}
-}
-
-.search-input {
-	width: 100%;
-	padding: 24rpx;
-	border: 1rpx solid #ddd;
-	border-radius: 8rpx;
-	font-size: 28rpx;
-	box-sizing: border-box;
-  height: 90rpx;
-}
-
-.search-results {
-	margin-top: 20rpx;
-	max-height: 400rpx;
-	overflow-y: auto;
-}
-
-.student-item {
-	display: flex;
-	align-items: center;
-	padding: 20rpx;
-	border: 1rpx solid #eee;
-	border-radius: 8rpx;
-	margin-bottom: 16rpx;
-
-	&.selected {
-		border-color: #29d3b4;
-		background: rgba(41, 211, 180, 0.1);
-	}
-
-	.student-avatar {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: #29d3b4;
-		color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 24rpx;
-		margin-right: 20rpx;
-	}
-
-	.student-details {
-		flex: 1;
-
-		.student-name {
-			font-size: 28rpx;
-			color: #333;
-			margin-bottom: 8rpx;
-			display: flex;
-			align-items: center;
-			gap: 16rpx;
-			
-			.formal-badge {
-				background: #29d3b4;
-				color: #fff;
-				font-size: 20rpx;
-				padding: 4rpx 8rpx;
-				border-radius: 8rpx;
-				white-space: nowrap;
-			}
-		}
-
-		.student-phone {
-			font-size: 24rpx;
-			color: #666;
-		}
-	}
-
-	.check-icon {
-		color: #29d3b4;
-		font-size: 32rpx;
-	}
-}
-
-.preset-student {
-	display: flex;
-	align-items: center;
-	padding: 20rpx;
-	background: #f5f5f5;
-	border-radius: 8rpx;
-
-	.student-avatar {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: #29d3b4;
-		color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 24rpx;
-		margin-right: 20rpx;
-	}
-
-	.student-details {
-		flex: 1;
-
-		.student-name {
-			font-size: 28rpx;
-			color: #333;
-			margin-bottom: 8rpx;
-		}
-
-		.student-phone {
-			font-size: 24rpx;
-			color: #666;
-		}
-	}
-}
-
-.radio-group {
-	display: flex;
-	gap: 40rpx;
-
-	.radio-item {
-		display: flex;
-		align-items: center;
-		
-		.radio-text {
-			margin-left: 16rpx;
-			font-size: 28rpx;
-			color: #333;
-		}
-	}
-}
-
-.remarks-textarea {
-	width: 100%;
-	min-height: 120rpx;
-	padding: 20rpx;
-	border: 1rpx solid #ddd;
-	border-radius: 8rpx;
-	font-size: 28rpx;
-	box-sizing: border-box;
-	resize: none;
-}
-
-.modal-footer {
-	padding: 40rpx;
-	border-top: 1rpx solid #eee;
-	display: flex;
-	gap: 20rpx;
-
-	.btn {
-		flex: 1;
-		padding: 24rpx;
-		text-align: center;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-
-		&.btn-cancel {
-			background: #f5f5f5;
-			color: #666;
-		}
-
-		&.btn-confirm {
-			background: #29d3b4;
-			color: #fff;
-		}
-	}
-}
-
-/* 请假弹窗样式 */
-.leave-form {
-	padding: 20rpx;
-
-	.leave-label {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 20rpx;
-	}
-
-	.leave-input {
-		margin-bottom: 30rpx;
-	}
-
-	.leave-buttons {
-		display: flex;
-		justify-content: space-between;
-		gap: 20rpx;
-
-		.fui-button {
-			flex: 1;
-		}
-	}
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/clue_info.less b/uniapp/pages/market/clue/clue_info.less
deleted file mode 100644
index ce333c24..00000000
--- a/uniapp/pages/market/clue/clue_info.less
+++ /dev/null
@@ -1,431 +0,0 @@
-// 客户详情页样式文件
-.assemble {
-  background-color: #292929;
-  min-height: 100vh;
-}
-
-.content {
-  padding: 20rpx;
-}
-
-.tab-switcher-container {
-  margin: 20rpx 0;
-}
-
-// 学生信息区域
-.student-section {
-  margin-top: 20rpx;
-
-  .section-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx;
-
-    .section-title {
-      font-size: 32rpx;
-      font-weight: bold;
-      color: #fff;
-    }
-
-    .add-student-btn {
-      display: flex;
-      align-items: center;
-      background: #29d3b4;
-      color: #fff;
-      border-radius: 20rpx;
-      padding: 12rpx 20rpx;
-      font-size: 24rpx;
-
-      .add-icon {
-        margin-right: 8rpx;
-        font-weight: bold;
-        font-size: 20rpx;
-      }
-
-      &:active {
-        background: #1ea08e;
-        transform: scale(0.95);
-      }
-    }
-  }
-
-  .student-cards {
-    width: 100%;
-    min-height: 600rpx;
-
-    .student-swiper {
-      width: 100%;
-      height: 560rpx;
-
-      .student-swiper-content {
-        display: flex;
-        flex-direction: column;
-        height: 580rpx;
-        padding: 20rpx;
-        box-sizing: border-box;
-        background-color: #434544;
-        border-radius: 16rpx;
-        margin: 0 10rpx;
-        color: #fff;
-      }
-    }
-  }
-}
-
-.popup-footer {
-  display: flex;
-  padding: 30rpx 40rpx;
-  padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
-  border-top: 1px solid #333;
-  gap: 30rpx;
-  flex-shrink: 0; /* 确保底部按钮区域不被压缩 */
-  background: #1a1a1a; /* 确保背景色一致 */
-
-  .popup-footer-btns {
-    display: flex;
-    justify-content: space-between;
-
-    .footer-btn {
-      flex: 1;
-      height: 88rpx;
-      display: flex;
-      width: 45%;
-      align-items: center;
-      justify-content: center;
-      border-radius: 12rpx;
-      font-size: 32rpx;
-      font-weight: 500;
-
-      &.cancel-btn {
-        background: #cccccc;
-      }
-
-      &.confirm-btn {
-        background: linear-gradient(45deg, #29D3B4, #1DB584);
-        color: #ffffff;
-      }
-    }
-  }
-
-}
-
-// 课程、通话、体测记录等区域
-.course-section, .call-section, .fitness-section, .study-plan-section {
-  background-color: #434544;
-  border-radius: 16rpx;
-  margin: 20rpx 0;
-
-  .section-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx;
-
-    .context-title {
-      font-size: 28rpx;
-      font-weight: bold;
-      color: #fff;
-    }
-
-    .add-record-btn {
-      display: flex;
-      align-items: center;
-      background: #29d3b4;
-      color: #fff;
-      border-radius: 20rpx;
-      padding: 12rpx 20rpx;
-      font-size: 24rpx;
-
-      .add-icon {
-        margin-right: 8rpx;
-        font-weight: bold;
-      }
-
-      &:active {
-        background: #1ea08e;
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-// 操作按钮区域 - 独立于Swiper外部
-.student-section .action-buttons-section {
-  display: flex;
-  gap: 8rpx;
-  margin-top: 15rpx;
-  padding: 15rpx;
-  flex-wrap: nowrap;
-  height: 100rpx;
-  box-sizing: border-box;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-  background-color: #434544;
-  border-radius: 16rpx;
-  margin: 15rpx 0;
-
-  &::-webkit-scrollbar {
-    display: none;
-  }
-
-  .action-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    background: rgba(255, 255, 255, 0.05);
-    border: 1px solid rgba(41, 211, 180, 0.3);
-    border-radius: 8rpx;
-    padding: 12rpx 8rpx;
-    min-width: 90rpx;
-    flex-shrink: 0;
-    transition: all 0.3s ease;
-
-    .action-icon {
-      font-size: 24rpx;
-      margin-bottom: 5rpx;
-      line-height: 1;
-    }
-
-    .action-text {
-      font-size: 18rpx;
-      color: #fff;
-      text-align: center;
-      line-height: 1.2;
-      word-break: break-all;
-    }
-
-    &:active {
-      background: rgba(41, 211, 180, 0.2);
-      border-color: #29d3b4;
-      transform: scale(0.95);
-
-      .action-text {
-        color: #29d3b4;
-      }
-    }
-  }
-}
-
-// 通用空状态样式
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 60rpx 20rpx;
-  min-height: 200rpx;
-
-  .empty-icon {
-    font-size: 60rpx;
-    opacity: 0.6;
-    margin-bottom: 20rpx;
-  }
-
-  .empty-text {
-    color: #ccc;
-    font-size: 28rpx;
-    margin-bottom: 20rpx;
-  }
-
-  .empty-add-btn {
-    background: #29d3b4;
-    color: #fff;
-    padding: 12rpx 24rpx;
-    border-radius: 20rpx;
-    font-size: 24rpx;
-    transition: all 0.3s ease;
-
-    &:active {
-      background: #1ea08e;
-      transform: scale(0.95);
-    }
-  }
-}
-
-// 备注弹窗样式
-.remark-dialog {
-  width: 600rpx;
-  padding: 30rpx;
-  background: #fff;
-  border-radius: 16rpx;
-
-  textarea {
-    width: 100%;
-    height: 200rpx;
-    padding: 20rpx;
-    border: 2rpx solid #e9ecef;
-    border-radius: 12rpx;
-    font-size: 28rpx;
-    color: #333;
-    background-color: #fff;
-    box-sizing: border-box;
-    resize: none;
-
-    &::placeholder {
-      color: #999;
-    }
-
-    &:focus {
-      border-color: #29d3b4;
-      outline: none;
-      box-shadow: 0 0 0 2rpx rgba(41, 211, 180, 0.1);
-    }
-  }
-
-  .dialog-btns {
-    display: flex;
-    gap: 20rpx;
-    margin-top: 30rpx;
-
-    .btn {
-      flex: 1;
-      padding: 20rpx;
-      border-radius: 8rpx;
-      font-size: 28rpx;
-      text-align: center;
-
-      &.cancel {
-        background: #f8f9fa;
-        color: #666;
-        border: 2rpx solid #e9ecef;
-      }
-
-      &.confirm {
-        background: #29d3b4;
-        color: #fff;
-      }
-    }
-  }
-}
-
-// 二维码支付弹窗样式
-.qrcode-payment-modal {
-  width: 600rpx;
-  background: #fff;
-  border-radius: 20rpx;
-  overflow: hidden;
-
-  .modal-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 40rpx 40rpx 20rpx;
-    border-bottom: 1px solid #f0f0f0;
-
-    .modal-title {
-      font-size: 36rpx;
-      font-weight: 600;
-      color: #333;
-    }
-
-    .close-btn {
-      width: 60rpx;
-      height: 60rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 50%;
-      background: #f5f5f5;
-      color: #666;
-      font-size: 32rpx;
-
-      &:active {
-        background: #e5e5e5;
-        transform: scale(0.95);
-      }
-    }
-  }
-
-  .order-info {
-    padding: 30rpx 40rpx;
-
-    .info-row {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20rpx;
-
-      .label {
-        font-size: 28rpx;
-        color: #666;
-        margin-right: 20rpx;
-      }
-
-      .value {
-        font-size: 28rpx;
-        color: #333;
-        flex: 1;
-      }
-
-      .amount {
-        font-size: 32rpx;
-        color: #ff4757;
-        font-weight: 600;
-        flex: 1;
-      }
-    }
-  }
-
-  .qrcode-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 40rpx;
-    background: #fafafa;
-
-    .qrcode-image {
-      width: 300rpx;
-      height: 300rpx;
-      border: 1px solid #e5e5e5;
-      border-radius: 12rpx;
-      background: #fff;
-      margin-bottom: 20rpx;
-    }
-
-    .qrcode-tip {
-      font-size: 24rpx;
-      color: #666;
-      text-align: center;
-      line-height: 1.4;
-    }
-  }
-
-  .modal-buttons {
-    display: flex;
-    padding: 30rpx 40rpx 40rpx;
-    gap: 20rpx;
-
-    .btn {
-      flex: 1;
-      height: 80rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 40rpx;
-      font-size: 28rpx;
-      font-weight: 500;
-
-      &.secondary {
-        background: #f5f5f5;
-        color: #666;
-
-        &:active {
-          background: #e5e5e5;
-          transform: scale(0.98);
-        }
-      }
-
-      &.primary {
-        background: #29d3b4;
-        color: #fff;
-
-        &:active {
-          background: #1ea08e;
-          transform: scale(0.98);
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/clue_info.vue b/uniapp/pages/market/clue/clue_info.vue
deleted file mode 100644
index a800a7aa..00000000
--- a/uniapp/pages/market/clue/clue_info.vue
+++ /dev/null
@@ -1,1567 +0,0 @@
-<!--客户详情 - 重构版本-->
-<template>
-  <view class="assemble">
-    <!-- 主要内容区域 -->
-    <view class="content">
-      <!-- 客户信息卡片 -->
-      <ClientInfoCard 
-        :client-info="clientInfo" 
-        :actions="[]"
-        @call="handleMakeCall"
-        @message="handleSendMessage"
-      />
-      
-      <!-- 标签切换器 -->
-      <view class="tab-switcher-container">
-        <TabSwitcher 
-          :tabs="tabs" 
-          :active-tab-id="switch_tags_type"
-          @tab-change="handleTabChange"
-        />
-      </view>
-
-      <!-- 学生信息卡片区域 -->
-      <view class="student-section" v-if="switch_tags_type == 1 || switch_tags_type == 7">
-        <view class="section-header">
-          <text class="section-title">学生信息</text>
-          <view class="add-student-btn" @click.stop="openAddStudentDialog">
-            <text class="add-icon">+</text>
-            <text class="add-text">添加学生</text>
-          </view>
-        </view>
-        
-        <!-- 学生信息滑动卡片 -->
-        <view class="student-cards">
-          <swiper 
-            class="student-swiper"
-            :indicator-dots="studentList.length > 1"
-            :circular="studentList.length > 1"
-            indicator-color="rgba(255, 255, 255, 0.3)"
-            indicator-active-color="#29D3B4"
-            previous-margin="20"
-            next-margin="20"
-            @change="onStudentSwiperChange">
-            <swiper-item v-for="(student, index) in studentList" :key="student.id">
-              <view class="student-swiper-content">
-                <StudentInfoCard 
-                  :student="student"
-                  :actions="[]"
-                  :show-details="true"
-                  @action="handleStudentAction"
-                />
-              </view>
-            </swiper-item>
-          </swiper>
-        </view>
-        
-        <!-- 操作按钮区域 - 移到Swiper外部，独立滑动 -->
-        <view class="action-buttons-section" v-if="currentStudent">
-          <view 
-            class="action-item" 
-            v-for="action in actionButtons" 
-            :key="action.key"
-            @click.stop="handleStudentActionClick(action, currentStudent)"
-          >
-            <view class="action-icon">
-              <text>{{ action.icon }}</text>
-            </view>
-            <text class="action-text">{{ action.text }}</text>
-          </view>
-        </view>
-        
-        <!-- 空状态 -->
-        <view v-if="studentList.length === 0" class="empty-state">
-          <text class="empty-icon">👤</text>
-          <text class="empty-text">暂无学生信息</text>
-          <view class="empty-add-btn" @click.stop="openAddStudentDialog">
-            <text>添加第一个学生</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 课程信息标签内容 -->
-      <view class="course-section" v-if="switch_tags_type == 2">
-        <CourseInfoCard 
-          v-if="courseInfo && courseInfo.length > 0"
-          :course-list="courseInfo"
-          @view-detail="viewCourseDetail"
-        />
-        <view v-else class="empty-state">
-          <text class="empty-icon">📚</text>
-          <text class="empty-text">暂无课程信息</text>
-        </view>
-      </view>
-
-      <!-- 通话记录标签内容 -->
-      <view class="call-section" v-if="switch_tags_type == 3">
-        <view v-if="listCallUp.length === 0" class="empty-state">
-          <text class="empty-icon">📞</text>
-          <text class="empty-text">暂无通话记录</text>
-        </view>
-        <CallRecordCard 
-          v-for="record in listCallUp" 
-          :key="record.id"
-          :record="record"
-          @remark="openAddRemark"
-        />
-      </view>
-      
-      <!-- 体测记录标签内容 -->
-      <view class="fitness-section" v-if="switch_tags_type == 4">
-        <view class="section-header" v-if="currentStudent">
-          <text class="context-title">{{ currentStudent.name }}的体测记录</text>
-          <view class="add-record-btn" @click.stop="openAddFitnessRecord">
-            <text class="add-icon">+</text>
-            <text class="add-text">新增记录</text>
-          </view>
-        </view>
-        
-        <view v-if="currentStudentFitnessRecords.length === 0" class="empty-state">
-          <text class="empty-icon">📊</text>
-          <text class="empty-text">暂无体测记录</text>
-        </view>
-        <FitnessRecordCard 
-          v-for="record in currentStudentFitnessRecords" 
-          :key="record.id"
-          :record="record"
-          @edit="openEditFitnessRecord"
-        />
-      </view>
-      
-      <!-- 学习计划标签内容 -->
-      <view class="study-plan-section" v-if="switch_tags_type == 5">
-        <view v-if="!studyPlanList || studyPlanList.length === 0" class="empty-state">
-          <text class="empty-icon">📚</text>
-          <text class="empty-text">暂无学习计划</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部弹窗组件 -->
-    <BottomPopup 
-      :visible="currentPopup !== null"
-      :title="popupTitle"
-      :has-footer="needsFooter"
-      @close="closePopup"
-      @click.stop
-    >
-      <!-- 课程信息弹窗 -->
-      <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"
-      />
-      
-      <!-- 服务列表弹窗 -->
-      <ServiceListCard
-        v-if="currentPopup === 'service_list'"
-        :service-list="serviceList"
-      />
-      
-      <!-- 底部操作按钮 -->
-      <template #footer>
-        <view class="popup-footer-btns">
-          <view class="footer-btn cancel-btn" @click.stop="closePopup">关闭</view>
-          <view 
-            class="footer-btn confirm-btn"
-            v-if="showAddButton"
-            @click.stop="handleAddAction"
-          >新增</view>
-        </view>
-      </template>
-    </BottomPopup>
-
-    <!-- 保留原有的编辑弹窗 -->
-    <uni-popup ref="remarkPopup" type="dialog">
-      <view class="remark-dialog">
-        <textarea 
-          v-model="remark_content" 
-          placeholder="请输入备注内容"
-          maxlength="200"
-        ></textarea>
-        <view class="dialog-btns">
-          <view class="btn cancel" @click="closeRemark">取消</view>
-          <view class="btn confirm" @click="confirmRemark">确定</view>
-        </view>
-      </view>
-    </uni-popup>
-    
-    <FitnessRecordPopup ref="fitnessRecordPopup" :resource-id="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>
-
-<script>
-import apiRoute from '@/api/apiRoute.js'
-// 组件导入
-import ClientInfoCard from '@/components/client-info-card/client-info-card.vue'
-import StudentInfoCard from '@/components/student-info-card/student-info-card.vue'
-import TabSwitcher from '@/components/tab-switcher/tab-switcher.vue'
-import CallRecordCard from '@/components/call-record-card/call-record-card.vue'
-import FitnessRecordCard from '@/components/fitness-record-card/fitness-record-card.vue'
-// 新的底部弹窗组件
-import BottomPopup from '@/components/bottom-popup/index.vue'
-import StudyPlanCard from '@/components/study-plan-card/index.vue'
-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'
-
-export default {
-  components: {
-    ClientInfoCard,
-    StudentInfoCard,
-    TabSwitcher,
-    CallRecordCard,
-    FitnessRecordCard,
-    BottomPopup,
-    StudyPlanCard,
-    CourseInfoCard,
-    OrderListCard,
-    ServiceListCard,
-    OrderFormPopup,
-    StudentEditPopup,
-    FitnessRecordPopup,
-    StudyPlanPopup
-  },
-  data() {
-    return {
-      switch_tags_type: 1,
-      resource_sharing_id: '',
-      
-      
-      // 基本数据
-      clientInfo: { id: '', resource_id: '', customerResource: {} },
-      userInfo: {},
-      listCallUp: [],
-      courseInfo: [],
-      fitnessRecords: [],
-      studentList: [],
-      currentStudentIndex: 0,
-      
-      // 底部弹窗相关
-      currentPopup: null,
-      studyPlanList: [],
-      orderList: [],
-      serviceList: [],
-      
-      // 订单表单弹窗
-      showOrderForm: false,
-      
-      // 二维码支付弹窗
-      showQRCodeModal: false,
-      qrCodePaymentData: null,
-      // 支付状态轮询定时器
-      paymentStatusTimer: null,
-      
-      // 编辑相关
-      remark_content: '',
-      currentRecord: null,
-      
-      // 配置数据
-      tabs: [
-        { id: 1, name: '基本资料' },
-        { id: 3, name: '通话记录' },
-        { id: 7, name: '修改资料' },
-        { id: 6, name: '修改记录' }
-      ],
-      
-      actionButtons: [
-        { key: 'course_arrangement', text: '课程安排', icon: '📅' },
-        { key: 'order_list', text: '订单列表', icon: '📋' },
-        { key: 'service_list', text: '服务列表', icon: '🔧' },
-        { key: 'course_info', text: '课程信息', icon: '📚' },
-        { key: 'fitness_record', text: '体测记录', icon: '📊' },
-        { key: 'study_plan', text: '学习计划', icon: '📝' }
-      ]
-    }
-  },
-  computed: {
-    currentStudent() {
-      return this.studentList[this.currentStudentIndex] || null
-    },
-    
-    currentStudentFitnessRecords() {
-      if (!this.currentStudent) return []
-      // 体测记录使用resource_id字段，与学生记录的resource_id匹配
-      // 如果没有匹配到，则显示所有记录（用于展示Mock数据）
-      const filtered = this.fitnessRecords.filter(record => 
-        record.student_id === this.currentStudent.id || 
-        record.resource_id === this.currentStudent.id ||
-        record.resource_id === this.clientInfo.resource_id
-      )
-      
-      // 如果没有匹配到任何记录，返回所有记录用于测试
-      return filtered.length > 0 ? filtered : this.fitnessRecords
-    },
-    
-    popupTitle() {
-      const titles = {
-        'course_info': '课程信息',
-        'fitness_record': '体测记录',
-        'study_plan': '学习计划',
-        'order_list': '订单列表',
-        'service_list': '服务列表'
-      }
-      return titles[this.currentPopup] || ''
-    },
-    
-    needsFooter() {
-      // 所有弹窗都显示底部按钮区域
-      return this.currentPopup !== null
-    },
-    
-    showAddButton() {
-      // 只有体测记录和学习计划弹窗显示新增按钮
-      return ['fitness_record', 'study_plan'].includes(this.currentPopup)
-    },
-
-  },
-  onLoad(options) {
-    if (!options?.resource_sharing_id) {
-      uni.showToast({ title: '缺少必要参数', icon: 'none' })
-      setTimeout(() => uni.navigateBack(), 1500)
-      return
-    }
-    this.resource_sharing_id = options.resource_sharing_id
-  },
-  
-  onShow() {
-    this.init()
-  },
-
-  onUnload() {
-    // 页面销毁时清除定时器，防止内存泄漏
-    this.stopPaymentStatusPolling()
-  },
-  methods: {
-
-    async init() {
-      try {
-        await this.getInfo()
-        await Promise.all([
-          this.getUserInfo(),
-          this.getListCallUp(),
-          this.getCourseInfo(),
-          this.getFitnessRecords(),
-          this.getStudentList()
-        ])
-      } catch (error) {
-        console.error('数据加载失败:', error)
-      }
-    },
-
-    async getUserInfo() {
-      try {
-        const res = await apiRoute.getPersonnelInfo({})
-        if (res.code === 1) {
-          this.userInfo = res.data
-        }
-      } catch (error) {
-        console.error('获取员工信息失败:', error)
-      }
-    },
-
-    async getInfo() {
-      if (!this.resource_sharing_id) return
-      try {
-        const res = await apiRoute.xs_resourceSharingInfo({ resource_sharing_id: this.resource_sharing_id })
-        if (res.code === 1) {
-          this.clientInfo = res.data
-        }
-      } catch (error) {
-        console.error('获取客户详情失败:', error)
-      }
-    },
-
-    async getListCallUp() {
-      if (!this.clientInfo?.resource_id) return
-      try {
-        const res = await apiRoute.listCallUp({ resource_id: this.clientInfo.resource_id })
-        if (res.code === 1) {
-          this.listCallUp = res.data || []
-        }
-      } catch (error) {
-        console.error('获取通话记录失败:', error)
-      }
-    },
-    handleMakeCall() {
-      const phone = this.clientInfo?.customerResource?.phone_number
-      if (phone) {
-        uni.makePhoneCall({ phoneNumber: phone })
-      }
-    },
-    
-    handleSendMessage() {
-      uni.showToast({ title: '发送消息功能待实现', icon: 'none' })
-    },
-
-    openAddRemark(record) {
-      this.remark_content = record.remarks || ''
-      this.currentRecord = record
-      this.$refs.remarkPopup.open()
-    },
-
-    async confirmRemark() {
-      if (!this.remark_content.trim() || !this.currentRecord?.id) {
-        uni.showToast({ title: '请输入备注内容', icon: 'none' })
-        return
-      }
-      
-      try {
-        const res = await apiRoute.xs_communicationRecordsEdit({
-          id: this.currentRecord.id,
-          remarks: this.remark_content
-        })
-        
-        if (res.code === 1) {
-          uni.showToast({ title: '备注更新成功', icon: 'success' })
-          await this.getListCallUp()
-        }
-      } catch (error) {
-        uni.showToast({ title: '更新失败', icon: 'none' })
-      }
-      
-      this.closeRemark()
-    },
-
-    closeRemark() {
-      this.$refs.remarkPopup.close()
-      this.remark_content = ''
-      this.currentRecord = null
-    },
-
-
-
-
-    async getCourseInfo(studentId = null) {
-      if (!this.clientInfo?.resource_id) return
-      try {
-        const targetStudentId = studentId || this.currentStudent?.id
-        const res = await apiRoute.getStudentCourseInfo({
-          resource_id: this.clientInfo.resource_id,
-          member_id: this.clientInfo.customerResource?.member_id || '',
-          student_id: targetStudentId
-        })
-        if (res.code === 1) {
-          this.courseInfo = res.data || []
-          
-          // 为测试数据添加必要的resource_id字段
-          if (this.courseInfo.length > 0) {
-            this.courseInfo.forEach(course => {
-              if (!course.resource_id) {
-                course.resource_id = this.clientInfo.resource_id || 1; // 添加resource_id
-              }
-              if (!course.student_course_id && !course.id) {
-                course.student_course_id = Math.floor(Math.random() * 1000); // 添加测试用的ID
-              }
-            });
-          }
-        }
-      } catch (error) {
-        console.error('获取课程信息失败:', error)
-      }
-    },
-
-
-    // 学生卡片操作按钮点击处理 - 传递具体学生信息
-    async handleStudentActionClick(action, student) {
-      // 设置当前操作的学生
-      this.setCurrentStudent(student)
-      
-      switch (action.key) {
-        case 'course_arrangement':
-          this.$navigateToPage(`/pages-market/clue/class_arrangement`, {
-            resource_id: this.clientInfo.id,
-            student_id: student.id
-          })
-          break
-        case 'course_info':
-          await this.getCourseInfo(student.id)
-          this.currentPopup = 'course_info'
-          break
-        case 'fitness_record':
-          await this.getFitnessRecords(student.id)
-          this.currentPopup = 'fitness_record'
-          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':
-          await this.getServiceList(student.id)
-          this.currentPopup = 'service_list'
-          break
-      }
-    },
-    
-    closePopup() {
-      console.log('关闭弹窗，当前弹窗类型:', this.currentPopup)
-      this.currentPopup = null
-      // 重置相关数据
-      this.studyPlanList = []
-      this.orderList = []
-      this.serviceList = []
-      this.courseInfo = []
-      this.fitnessRecords = []
-    },
-    
-    handleAddAction() {
-      if (this.currentPopup === 'fitness_record') {
-        this.openAddFitnessRecord()
-      } else if (this.currentPopup === 'study_plan') {
-        this.openAddStudyPlan()
-      }
-    },
-    
-
-
-
-    viewCourseDetail(course) {
-      if (!course?.id) {
-        uni.showToast({ title: '课程信息不完整', icon: 'none' })
-        return
-      }
-      this.$navigateToPage(`/pages-market/course/course_detail`, {
-        id: course.id,
-        resource_id: this.clientInfo.resource_id
-      })
-    },
-
-    async handleTabChange({ tabId }) {
-      this.switch_tags_type = tabId
-      
-      if (tabId === 2) await this.getCourseInfo()
-      if (tabId === 3) await this.getListCallUp()
-      if (tabId === 4) await this.getFitnessRecords()
-      if (tabId === 6) {
-        this.$navigateToPage(`/pages-market/clue/edit_clues_log`, {
-          resource_id: this.clientInfo.resource_id
-        })
-      }
-      if (tabId === 7) this.$navigateToPage(`/pages-market/clue/edit_clues`, {
-        resource_sharing_id: this.clientInfo.id
-      })
-    },
-    
-    handleStudentAction({ action, student }) {
-      this.setCurrentStudent(student)
-      
-      switch (action.key) {
-        case 'course_info':
-          this.switch_tags_type = 2
-          break
-        case 'fitness_record':
-          this.switch_tags_type = 4
-          break
-        case 'study_plan':
-          this.switch_tags_type = 5
-          break
-      }
-    },
-    
-    setCurrentStudent(student) {
-      const index = this.studentList.findIndex(s => s.id === student.id)
-      if (index !== -1) this.currentStudentIndex = index
-    },
-    
-    onStudentSwiperChange(e) {
-      this.currentStudentIndex = e.detail.current
-    },
-
-    async getFitnessRecords(studentId = null) {
-      if (!this.clientInfo?.resource_id) return
-      
-      try {
-        // 如果指定了学生ID，则获取该学生的体测记录
-        const targetStudentId = studentId || this.currentStudent?.id
-        
-        // 调用体测记录API
-        const res = await apiRoute.xy_physicalTest({
-          resource_id: this.clientInfo.resource_id,
-          student_id: targetStudentId
-        })
-        
-        if (res.code === 1 && res.data) {
-          // 处理体测记录数据，转换PDF文件格式
-          this.fitnessRecords = this.processFitnessRecords(res.data.data || [])
-        } else {
-          console.warn('获取体测记录失败:', res.msg)
-          this.fitnessRecords = []
-        }
-      } catch (error) {
-        console.error('获取体测记录异常:', error)
-        this.fitnessRecords = []
-      }
-    },
-
-    // 处理体测记录数据，转换PDF文件格式
-    processFitnessRecords(records) {
-      if (!records || !Array.isArray(records)) return []
-      
-      return records.map(record => {
-        const processedRecord = {
-          ...record,
-          test_date: record.created_at ? record.created_at.split(' ')[0] : '', // 从created_at提取日期
-          pdf_files: []
-        }
-        
-        // 处理PDF文件
-        if (record.physical_test_report) {
-          // 如果physical_test_report是字符串路径
-          if (typeof record.physical_test_report === 'string') {
-            const pdfPaths = record.physical_test_report.split(',').filter(path => path.trim())
-            processedRecord.pdf_files = pdfPaths.map((path, index) => ({
-              id: `${record.id}_${index}`,
-              name: this.extractFileName(path) || `体测报告_${index + 1}.pdf`,
-              size: 0, // 无法从路径获取大小
-              url: this.getFullPdfUrl(path),
-              server_path: path.trim(),
-              upload_time: record.created_at || ''
-            }))
-          }
-          // 如果physical_test_report已经是数组格式
-          else if (Array.isArray(record.physical_test_report)) {
-            processedRecord.pdf_files = record.physical_test_report
-          }
-        }
-        
-        return processedRecord
-      })
-    },
-
-    // 从文件路径提取文件名
-    extractFileName(filePath) {
-      if (!filePath) return ''
-      const parts = filePath.split('/')
-      return parts[parts.length - 1] || ''
-    },
-
-    // 获取完整的PDF文件URL
-    getFullPdfUrl(relativePath) {
-      if (!relativePath) return ''
-      
-      // 如果已经是完整URL，直接返回
-      if (relativePath.startsWith('http://') || relativePath.startsWith('https://')) {
-        return relativePath
-      }
-      
-      // 构建完整的URL
-      const { img_domian } = require('@/common/config.js')
-      
-      // 处理相对路径
-      let cleanPath = relativePath
-      if (cleanPath.startsWith('./')) {
-        cleanPath = cleanPath.substring(2)
-      }
-      if (cleanPath.startsWith('/')) {
-        cleanPath = cleanPath.substring(1)
-      }
-      
-      return `${img_domian}${cleanPath}`
-    },
-
-    openAddFitnessRecord() {
-      this.$refs.fitnessRecordPopup.openAdd()
-    },
-
-    openEditFitnessRecord(record) {
-      // 确保记录包含正确格式的PDF文件信息
-      const processedRecord = {
-        ...record,
-        pdf_files: record.pdf_files || [] // 使用已处理的pdf_files数据
-      }
-      this.$refs.fitnessRecordPopup.openEdit(processedRecord)
-    },
-
-    async handleFitnessRecordConfirm(result) {
-      try {
-        const { isEditing, data } = result
-        
-        if (isEditing) {
-          // 编辑体测记录
-          const response = await apiRoute.xy_physicalTestEdit(data)
-          if (response.code === 1) {
-            uni.showToast({ title: '编辑成功', icon: 'success' })
-            // 刷新体测记录列表
-            await this.getFitnessRecords()
-          } else {
-            uni.showToast({ title: response.msg || '编辑失败', icon: 'none' })
-          }
-        } else {
-          // 新增体测记录
-          const response = await apiRoute.xy_physicalTestAdd(data)
-          if (response.code === 1) {
-            uni.showToast({ title: '新增成功', icon: 'success' })
-            // 刷新体测记录列表
-            await this.getFitnessRecords()
-          } else {
-            uni.showToast({ title: response.msg || '新增失败', icon: 'none' })
-          }
-        }
-      } catch (error) {
-        console.error('保存体测记录失败:', error)
-        uni.showToast({ title: '保存失败，请重试', icon: 'none' })
-      }
-    },
-
-    // 学习计划相关方法
-    openAddStudyPlan() {
-      if (!this.currentStudent) {
-        uni.showToast({ title: '请先选择学生', icon: 'none' })
-        return
-      }
-      this.$refs.studyPlanPopup.openAdd()
-    },
-
-    openEditStudyPlan(plan) {
-      this.$refs.studyPlanPopup.openEdit(plan)
-    },
-
-    async handleStudyPlanConfirm(result) {
-      try {
-        const { isEditing, data } = result
-        
-        if (isEditing) {
-          // 编辑学习计划
-          const response = await apiRoute.editStudyPlan(data)
-          if (response.code === 1) {
-            uni.showToast({ title: '编辑成功', icon: 'success' })
-            // 刷新学习计划列表
-            await this.getStudyPlanList()
-          } else {
-            uni.showToast({ title: response.msg || '编辑失败', icon: 'none' })
-          }
-        } else {
-          // 新增学习计划
-          const response = await apiRoute.addStudyPlan(data)
-          if (response.code === 1) {
-            uni.showToast({ title: '新增成功', icon: 'success' })
-            // 刷新学习计划列表
-            await this.getStudyPlanList()
-          } else {
-            uni.showToast({ title: response.msg || '新增失败', icon: 'none' })
-          }
-        }
-      } catch (error) {
-        console.error('保存学习计划失败:', error)
-        uni.showToast({ title: '保存失败，请重试', icon: 'none' })
-      }
-    },
-
-
-    async getStudentList() {
-      try {
-        if (this.clientInfo?.resource_id) {
-          const res = await apiRoute.xs_getStudentList({ parent_resource_id: this.clientInfo.resource_id })
-          if (res.code === 1) {
-            // 处理接口返回的学生数据，转换字段
-            this.studentList = await this.processStudentData(res.data || [])
-            return
-          }
-        }
-        // 使用模拟数据（匹配真实接口字段结构）
-        const mockData = [
-          {
-            id: 1,
-            name: '张小明',
-            gender: 1, // 1=男, 2=女
-            birthday: '2015-05-10',
-            remark: '活泼开朗，学习能力强',
-            member_label: 1, // student_label表的ID，需要转换为标签名称
-            coach_id: 1, // personnel表的ID，需要转换为教练姓名
-            consultant_id: 2, // personnel表的ID，需要转换为顾问姓名
-            trial_class_count: 3,
-            // 其他原有字段
-            age: 9
-          }
-        ]
-        
-        // 处理模拟数据
-        this.studentList = await this.processStudentData(mockData)
-      } catch (error) {
-        console.error('获取学生列表失败:', error)
-      }
-    },
-
-    // 处理学生数据，转换字段为显示用的格式
-    async processStudentData(students) {
-      if (!students || students.length === 0) return []
-      
-      const processedStudents = []
-      
-      for (const student of students) {
-        const processedStudent = {
-          ...student,
-          // 转换字段名称和处理逻辑
-          student_tags: await this.getStudentLabel(student.member_label),
-          class_teacher: await this.getPersonnelName(student.coach_id),
-          academic_affairs: await this.getPersonnelName(student.consultant_id),
-          trial_course_count: student.trial_class_count || 0,
-          // 使用后端API返回的真实到访状态数据
-          course_visit_status: this.formatVisitStatus(student.first_visit_status, student.second_visit_status)
-        }
-        processedStudents.push(processedStudent)
-      }
-      
-      return processedStudents
-    },
-
-    // 获取学员标签名称
-    async getStudentLabel(labelId) {
-      if (!labelId) return []
-      
-      // TODO: 调用接口获取student_label表中的标签名称
-      // const res = await apiRoute.getStudentLabel({ id: labelId })
-      
-      // 模拟数据
-      const labelMap = {
-        1: '优秀学员',
-        2: '积极参与',
-        3: '需要关注'
-      }
-      
-      return labelMap[labelId] ? [labelMap[labelId]] : []
-    },
-
-    // 获取人员姓名（教练或顾问）
-    async getPersonnelName(personnelId) {
-      if (!personnelId) return ''
-      
-      // TODO: 调用接口获取personnel表中的人员姓名
-      // const res = await apiRoute.getPersonnelInfo({ id: personnelId })
-      
-      // 模拟数据
-      const personnelMap = {
-        1: '李老师',
-        2: '王主任',
-        3: '张教练'
-      }
-      
-      return personnelMap[personnelId] || ''
-    },
-
-    // 格式化到访状态 - 使用后端API返回的真实数据
-    formatVisitStatus(firstVisitStatus, secondVisitStatus) {
-      // 如果都未到访
-      if (firstVisitStatus === '未到访' && secondVisitStatus === '未到访') {
-        return '未到访'
-      }
-      // 如果一访已到，二访未到
-      else if (firstVisitStatus === '已到访' && secondVisitStatus === '未到访') {
-        return '一访已到'
-      }
-      // 如果一访和二访都已到
-      else if (firstVisitStatus === '已到访' && secondVisitStatus === '已到访') {
-        return '二访已到'
-      }
-      // 默认情况
-      else {
-        return '未到访'
-      }
-    },
-    openAddStudentDialog() {
-      this.$refs.studentEditPopup.openAdd()
-    },
-
-
-    async handleStudentEditConfirm(result) {
-      try {
-        // 调用学生添加API接口
-        const res = await apiRoute.xs_addStudent(result.studentData)
-        
-        if (res.code === 1) {
-          this.$refs.studentEditPopup.close()
-          uni.showToast({ title: '保存成功', icon: 'success' })
-          // 保存成功后刷新学生列表
-          await this.getStudentList()
-        } else {
-          uni.showToast({ title: res.msg || '保存失败', icon: 'none' })
-        }
-      } catch (error) {
-        console.error('保存学生信息失败:', error)
-        uni.showToast({ title: '保存失败', icon: 'none' })
-      }
-    },
-
-    // 获取学习计划列表
-    async getStudyPlanList(studentId = null) {
-      if (!this.clientInfo?.resource_id) return
-      const targetStudentId = studentId || this.currentStudent?.id
-      
-      if (!targetStudentId) {
-        console.warn('学习计划列表：缺少学生ID')
-        this.studyPlanList = []
-        return
-      }
-      
-      try {
-        const response = await apiRoute.getStudyPlanList({
-          student_id: targetStudentId
-        })
-        
-        if (response.code === 1) {
-          this.studyPlanList = response.data || []
-        } else {
-          console.error('获取学习计划失败:', response.msg)
-          this.studyPlanList = []
-        }
-      } catch (error) {
-        console.error('获取学习计划异常:', error)
-        this.studyPlanList = []
-      }
-    },
-
-    // 获取订单列表
-    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,
-        // 保留原始数据
-        _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()
-      
-      // 启动支付状态轮询定时器 - 每15秒查询一次
-      this.startPaymentStatusPolling()
-    },
-    
-    // 关闭二维码支付弹窗
-    closeQRCodeModal() {
-      this.showQRCodeModal = false
-      this.qrCodePaymentData = null
-      this.$refs.qrCodePopup.close()
-      
-      // 清除支付状态轮询定时器
-      this.stopPaymentStatusPolling()
-    },
-    
-    // 确认二维码支付完成
-    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()
-      
-      uni.showModal({
-        title: '订单详情',
-        content: detailText,
-        showCancel: false,
-        confirmText: '知道了'
-      })
-    },
-
-    // 获取订单状态文本
-    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
-      }
-    },
-
-    // 启动支付状态轮询
-    startPaymentStatusPolling() {
-      // 清除之前的定时器
-      this.stopPaymentStatusPolling()
-      
-      // 立即执行一次检查
-      this.checkPaymentStatus()
-      
-      // 启动定时器，每15秒执行一次
-      this.paymentStatusTimer = setInterval(() => {
-        this.checkPaymentStatus()
-      }, 15000)
-      
-      console.log('支付状态轮询定时器已启动')
-    },
-
-    // 停止支付状态轮询
-    stopPaymentStatusPolling() {
-      if (this.paymentStatusTimer) {
-        clearInterval(this.paymentStatusTimer)
-        this.paymentStatusTimer = null
-        console.log('支付状态轮询定时器已停止')
-      }
-    },
-
-    // 检查支付状态
-    async checkPaymentStatus() {
-      if (!this.qrCodePaymentData?.order) {
-        console.warn('无订单信息，停止轮询')
-        this.stopPaymentStatusPolling()
-        return
-      }
-
-      const order = this.qrCodePaymentData.order
-      
-      try {
-        console.log('轮询检查支付状态，订单号:', order.order_no)
-        
-        // 调用接口查询订单支付状态
-        const res = await apiRoute.checkOrderPaymentStatus({
-          order_no: order.order_no
-        })
-        
-        if (res.code === 1 && res.data) {
-          const orderStatus = res.data.order_status
-          
-          if (orderStatus === 'paid') {
-            // 支付成功
-            console.log('检测到支付成功')
-            this.handlePaymentSuccess(order)
-          } else {
-            console.log('订单状态:', orderStatus, '继续轮询...')
-          }
-        } else {
-          console.warn('查询支付状态失败:', res.msg)
-        }
-      } catch (error) {
-        console.error('查询支付状态异常:', error)
-      }
-    },
-
-    // 处理支付成功
-    handlePaymentSuccess(order) {
-      // 停止轮询
-      this.stopPaymentStatusPolling()
-      
-      // 显示支付成功提示
-      uni.showModal({
-        title: '支付成功',
-        content: `订单 ${order.order_no} 已成功支付`,
-        showCancel: false,
-        confirmText: '确定',
-        success: (res) => {
-          if (res.confirm) {
-            // 关闭二维码支付弹窗
-            this.closeQRCodeModal()
-            
-            // 刷新订单列表
-            this.getOrderList()
-          }
-        }
-      })
-    }
-  },
-}
-</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>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/clue_table.vue b/uniapp/pages/market/clue/clue_table.vue
deleted file mode 100644
index 46f36e54..00000000
--- a/uniapp/pages/market/clue/clue_table.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <view class="dark-table-container">
-    <view v-for="(row, rIdx) in data" :key="rIdx" class="card">
-      <view class="card-title" @click="toggleExpand(rIdx)">
-        {{ row.channel }}
-        <text class="expand-icon">{{ expanded[rIdx] ? '▲' : '▼' }}</text>
-      </view>
-      <view class="card-content">
-        <view
-          class="card-row"
-          v-for="(col, cIdx) in getVisibleColumns(rIdx)"
-          :key="cIdx"
-        >
-          <view class="card-label">
-            {{ col.label }}
-            <text v-if="col.tip" class="tip" @click.stop="showTip(col.tip)">?</text>
-          </view>
-          <view class="card-value">{{ row[col.key] || '-' }}</view>
-        </view>
-      </view>
-      <view v-if="columns.length > 6" class="expand-btn" @click="toggleExpand(rIdx)">
-        {{ expanded[rIdx] ? '收起' : '展开全部' }}
-      </view>
-    </view>
-    <!-- 说明弹窗 -->
-    <uni-popup ref="popup" type="center">
-      <view class="popup-content">{{ tipContent }}</view>
-    </uni-popup>
-    <AQTabber></AQTabber>
-  </view>
-</template>
-
-<script>
-import AQTabber from "@/components/AQ/AQTabber.vue"
-
-export default {
-  components: {
-    AQTabber,
-  },
-  data() {
-    return {
-      columns: [
-        { label: '渠道', key: 'channel' },
-        { label: '资源数', key: 'resource', tip: '本月的新资源' },
-        { label: '到访数(一访)', key: 'visit1', tip: '本月资源的一访到访数' },
-        { label: '到访率(一访)', key: 'visitRate1', tip: '一访到访数/本月新资源数' },
-        { label: '到访数(二访)', key: 'visit2', tip: '二访到访数/一访到访数' },
-        { label: '到访率(二访)', key: 'visitRate2', tip: '二访到访数/一访到访数' },
-        { label: '关单数(一访)', key: 'close1', tip: '本月一访到访的关单数' },
-        { label: '关单率(一访)', key: 'closeRate1', tip: '一访关单数/一访到访数' },
-        { label: '关单数(二访)', key: 'close2', tip: '二访到访的关单数' },
-        { label: '关单率(二访)', key: 'closeRate2', tip: '二访关单数/二访到访数' },
-        { label: '月总转', key: 'monthTrans', tip: '关单数（合计）/资源数' },
-        { label: '往月到访数', key: 'lastMonthVisit', tip: '本月资源在往月到访的到访数' },
-        { label: '月共到访', key: 'monthTotalVisit', tip: '本月资源任在本月到访/关单' },
-        { label: '往月关单数', key: 'lastMonthClose', tip: '本月关单-往月关单' },
-        { label: '月共关单', key: 'monthTotalClose', tip: '本月关单+往月关单' },
-      ],
-      data: [
-        { channel: '体检包（地推）', resource: 10, visit1: 5, visitRate1: '50%', visit2: 2, visitRate2: '40%', close1: 1, closeRate1: '20%', close2: 1, closeRate2: '50%', monthTrans: '10%', lastMonthVisit: 0, monthTotalVisit: 5, lastMonthClose: 0, monthTotalClose: 1 },
-      ],
-      tipContent: '',
-      expanded: {},
-    }
-  },
-  methods: {
-    showTip(content) {
-      this.tipContent = content
-      this.$refs.popup.open()
-    },
-    toggleExpand(idx) {
-      this.$set(this.expanded, idx, !this.expanded[idx])
-    },
-    getVisibleColumns(idx) {
-      // 只展示前5个字段，展开后展示全部（不含渠道）
-      const cols = this.columns.slice(1)
-      if (this.expanded[idx]) return cols
-      return cols.slice(0, 5)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.dark-table-container {
-  background: #18181c;
-  color: #f1f1f1;
-  min-height: 100vh;
-  padding: 24rpx 12rpx;
-}
-.card {
-  background: #23232a;
-  border-radius: 18rpx;
-  box-shadow: 0 4rpx 24rpx rgba(0,0,0,0.18);
-  margin-bottom: 32rpx;
-  padding: 24rpx 20rpx 8rpx 20rpx;
-  transition: box-shadow 0.2s;
-}
-.card-title {
-  font-size: 32rpx;
-  font-weight: bold;
-  margin-bottom: 18rpx;
-  color: #ffb300;
-  letter-spacing: 2rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  cursor: pointer;
-}
-.expand-icon {
-  font-size: 24rpx;
-  color: #bdbdbd;
-  margin-left: 12rpx;
-}
-.card-content {
-  display: flex;
-  flex-direction: column;
-  gap: 12rpx;
-  overflow: hidden;
-  transition: max-height 0.3s;
-}
-.card-row {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px dashed #333;
-  padding: 8rpx 0;
-}
-.card-label {
-  color: #bdbdbd;
-  font-size: 26rpx;
-  display: flex;
-  align-items: center;
-}
-.card-value {
-  color: #f1f1f1;
-  font-size: 26rpx;
-  text-align: right;
-  max-width: 60%;
-  word-break: break-all;
-}
-.tip {
-  color: #ffb300;
-  margin-left: 8rpx;
-  font-size: 24rpx;
-  cursor: pointer;
-}
-.expand-btn {
-  color: #ffb300;
-  text-align: center;
-  font-size: 26rpx;
-  margin: 10rpx 0 0 0;
-  padding-bottom: 8rpx;
-  cursor: pointer;
-}
-.popup-content {
-  background: #23232a;
-  color: #fff;
-  padding: 32rpx;
-  border-radius: 16rpx;
-  min-width: 300rpx;
-  text-align: center;
-}
-</style> 
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/edit_clues.vue b/uniapp/pages/market/clue/edit_clues.vue
deleted file mode 100644
index 725949d5..00000000
--- a/uniapp/pages/market/clue/edit_clues.vue
+++ /dev/null
@@ -1,1806 +0,0 @@
-<!--编辑客户-->
-<template>
-	<view class="assemble">
-		<fui-segmented-control style="padding-top: 30rpx;" :values="optionTable" :current="(Number(optionTableId))"
-			type="text" activeColor="#29d3b4" color="#fff" @click="segmented">
-		</fui-segmented-control>
-
-		<!-- 基础信息 -->
-		<view v-if="optionTableId == 0" style="margin-top: 20rpx;">
-			<view class="form-style">
-				<fui-form ref="form" top="0" :model="formData" :show="false">
-					<view class="title" style="margin-top: 20rpx; display: flex; justify-content: space-between; align-items: center;">
-						<text>基础信息</text>
-						<view @click="viewEditLog" style="color: #29d3b4; font-size: 28rpx;">
-							查看修改记录
-						</view>
-					</view>
-					<view class="input-style">
-						<!-- 校区 -->
-						<fui-form-item label="校区" labelSize='32' prop="campus" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('campus')">
-									{{ formData.campus ? picker_config.campus.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 来源 -->
-						<fui-form-item label="来源" labelSize='26' prop="source" 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')">
-									{{ formData.source ? picker_config.source.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 来源渠道 -->
-						<fui-form-item 
-							v-if="formData.source == 1"
-							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')">
-									{{ formData.source_channel ? picker_config.source_channel.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 姓名 -->
-						<fui-form-item label="姓名" labelSize='26' prop="name" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写" v-model="formData.name" backgroundColor="#434544" size="26" color="#fff"></fui-input>
-							</view>
-						</fui-form-item>
-						<!-- 性别 -->
-						<fui-form-item label="性别" labelSize='26' prop="gender" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-radio-group name="radio" v-model="formData.gender" @change="changeSex">
-									<view class="fui-list__item" style="display: flex;justify-content: flex-end;">
-										<fui-label>
-											<view class="fui-align__center">
-												<fui-radio value="male" checked></fui-radio>
-												<text class="fui-text">男</text>
-											</view>
-										</fui-label>
-										<fui-label :margin="['0','0','0','40rpx']">
-											<view class="fui-align__center">
-												<fui-radio value="female"></fui-radio>
-												<text class="fui-text">女</text>
-											</view>
-										</fui-label>
-									</view>
-								</fui-radio-group>
-							</view>
-						</fui-form-item>
-						<!-- 电话 -->
-						<fui-form-item label="电话" labelSize='26' prop="phone_number" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写" v-model="formData.phone_number" backgroundColor="#434544" size="26" color="#fff" @blur="handlePhoneBlur"></fui-input>
-							</view>
-						</fui-form-item>
-						<!-- 资源是否有效 -->
-						 <fui-form-item label="资源是否有效" labelSize='26' prop="is_valid" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-radio-group name="radio" v-model="formData.efficacious">
-									<view class="fui-list__item" style="display: flex;justify-content: flex-end;">
-										<fui-label>
-											<view class="fui-align__center">
-												<fui-radio :value="1" checked></fui-radio>
-												<text class="fui-text">是</text>
-											</view>
-										</fui-label>
-										<fui-label :margin="['0','0','0','40rpx']">
-											<view class="fui-align__center">
-												<fui-radio :value="0"></fui-radio>
-												<text class="fui-text">否</text>
-											</view>
-										</fui-label>
-									</view>
-								</fui-radio-group>
-							</view>
-						</fui-form-item>
-					</view>
-					<!-- 添加底部安全区 -->
-					<view class="safe-area-bottom"></view>
-				</fui-form>
-			</view>
-		</view>
-
-		<!-- 电话六要素 -->
-		<view v-if="optionTableId == 1" style="margin-top: 20rpx;">
-			<view class="form-style">
-				<fui-form ref="form" top="0" :model="formData" :show="false">
-					<view class="title" style="margin-top: 20rpx; display: flex; justify-content: space-between; align-items: center;">
-						<text>六要素信息</text>
-						<view @click="viewEditLog" style="color: #29d3b4; font-size: 28rpx;">
-							查看修改记录
-						</view>
-					</view>
-					<view class="input-style">
-						<!-- 购买力 -->
-						<fui-form-item label="购买力" labelSize='26' prop="purchasing_power" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('purchasing_power')">
-									{{ formData.purchasing_power ? picker_config.purchasing_power.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						
-						<fui-form-item label="需求" labelSize='26' prop="demand" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-input :borderBottom="false" :padding="[0]" placeholder="点击填写" v-model="formData.demand" backgroundColor="#434544" size="26" color="#fff" ></fui-input>
-							</view>
-						</fui-form-item>
-						
-						<!-- 理念 -->
-						<fui-form-item label="理念" labelSize='26' prop="cognitive_idea" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('cognitive_idea')">
-									{{ formData.cognitive_idea ? picker_config.cognitive_idea.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 可选上课时间 -->
-						<fui-form-item labelWidth=“200” label="可选上课时间" labelSize='26' prop="optional_class_time" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openDate('optional_class_time')">
-									{{ formData.optional_class_time ? formData.optional_class_time : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 承诺到访时间 -->
-						<fui-form-item labelWidth=“200” label="承诺到访时间" labelSize='26' prop="promised_visit_time" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openDate('promised_visit_time')">
-									{{ formData.promised_visit_time ? formData.promised_visit_time : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 距离 -->
-						<fui-form-item label="距离" labelSize='26' prop="distance" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('distance')">
-									{{ formData.distance ? picker_config.distance.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 决策人 -->
-						<fui-form-item label="决策人" labelSize='26' prop="decision_maker" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<view class="input-title" style="margin-right:14rpx;" @click="openCicker('decision_maker')">
-									{{ formData.decision_maker ? picker_config.decision_maker.text : '点击选择' }}
-								</view>
-							</view>
-						</fui-form-item>
-						<!-- 是否加微信 -->
-						<fui-form-item label="是否加微信" labelSize='26' prop="call_intent" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-radio-group name="radio" v-model="formData.call_intent">
-									<view class="fui-list__item" style="display: flex;justify-content: flex-end;">
-										<fui-label>
-											<view class="fui-align__center">
-												<fui-radio value="1" checked></fui-radio>
-												<text class="fui-text">是</text>
-											</view>
-										</fui-label>
-										<fui-label :margin="['0','0','0','40rpx']">
-											<view class="fui-align__center">
-												<fui-radio value="2"></fui-radio>
-												<text class="fui-text">否</text>
-											</view>
-										</fui-label>
-									</view>
-								</fui-radio-group>
-							</view>
-						</fui-form-item>
-						
-						<!-- 备注 -->
-						<fui-form-item label="备注" labelSize='26' prop="remark" background='#434544' labelColor='#fff' :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;">
-								<fui-textarea v-model="formData.remark" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :borderTop="false" :isCounter="true" :maxlength="500" :minHeight="250" :isAutoHeight="true"></fui-textarea>
-							</view>
-						</fui-form-item>
-					</view>
-					<!-- 添加底部安全区 -->
-					<view class="safe-area-bottom"></view>
-				</fui-form>
-			</view>
-		</view>
-
-		<!-- 面咨记录 -->
-		<view v-if="optionTableId == 2" style="margin-top: 20rpx;">
-			<view class="form-style">
-				<fui-form ref="form" top="0" :model="formData" :show="false">
-					<view class="title" style="margin-top: 20rpx;">跟进与面咨</view>
-					<view class="input-style">
-						<!-- 一访时间 -->
-						<fui-form-item label="一访时间" labelSize='26' prop="first_visit_time" background='#434544' labelColor='#fff'  :bottomBorder='false'>
-							<view class="input-title" style="margin-right:14rpx;" @click="openDate('first_visit_time')">
-									{{ formData.first_visit_time ? formData.first_visit_time : '点击选择' }}
-								</view>
-						</fui-form-item>
-						<!-- 一访情况 -->
-						<fui-form-item label="一访情况" labelSize='26' prop="first_visit_status" background='#434544' labelColor='#fff'  :bottomBorder='false'>
-							<view class="textarea-container">
-								<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')">
-									{{ formData.second_visit_time ? formData.second_visit_time : '点击选择' }}
-								</view>
-						</fui-form-item>
-						<!-- 二访情况 -->
-						<fui-form-item label="二访情况" labelSize='26' prop="second_visit_status" background='#434544' labelColor='#fff'  :bottomBorder='false'>
-							<view class="textarea-container">
-								<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">
-									<view class="fui-list__item" style="display: flex;justify-content: flex-end;">
-										<fui-label>
-											<view class="fui-align__center">
-												<fui-radio :value="1" :disabled="true"></fui-radio>
-												<text class="fui-text">报名</text>
-											</view>
-										</fui-label>
-										<fui-label :margin="['0','0','0','40rpx']">
-											<view class="fui-align__center">
-												<fui-radio :value="2" :disabled="true"></fui-radio>
-												<text class="fui-text">未报名</text>
-											</view>
-										</fui-label>
-									</view>
-								</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">
-								<fui-textarea v-model="formData.consultation_remark" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff"  :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
-							</view>
-						</fui-form-item>
-						<!-- 标识 -->
-
-					</view>
-					<!-- 添加底部安全区 -->
-					<view class="safe-area-bottom"></view>
-				</fui-form>
-			</view>
-		</view>
-
-		<!-- 选择器、日期选择等控件保留原有 -->
-		<fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date" :value="default_date_value"></fui-date-picker>
-		<fui-picker :linkage='picker_linkage' :options="picker_options" :layer="1" :show="picker_show" @change="changeCicker" @cancel="cancelCicker"></fui-picker>
-
-		<!-- 快速填写弹窗 -->
-		<view v-if="showQuickFill" class="quick-fill-mask" @tap="showQuickFill=false">
-			<view class="quick-fill-content" @tap.stop>
-				<view class="quick-fill-header">
-					<view class="quick-fill-title">快速填写</view>
-					<view class="quick-fill-close" @tap="showQuickFill=false">
-						<text class="close-text">✕</text>
-					</view>
-				</view>
-				<view class="quick-fill-body">
-					<view class="quick-fill-tip">
-						<text>请粘贴包含客户信息的文本，支持格式：</text>
-						<text>姓名：张三，电话：13800138000，校区：测试校区</text>
-					</view>
-					<textarea 
-						class="quick-fill-textarea" 
-						placeholder="请粘贴客户信息文本..."
-						v-model="quickFillText"
-						:maxlength="1000"
-					></textarea>
-				</view>
-				<view class="quick-fill-buttons">
-					<view class="quick-fill-btn cancel-btn" @click="showQuickFill=false">取消</view>
-					<view class="quick-fill-btn confirm-btn" @click="parseQuickFillText">解析并填写</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 底部保存按钮 -->
-		<view class="save-btn-box">
-			<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="submit">保存</fui-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js';
-	import commonApi from '@/api/common.js';
-	import marketApi from '@/api/market.js';
-	import memberApi from '@/api/member.js';
-
-
-	export default {
-		data() {
-			return {
-				is_submit: true, //是否提交(防止重复提交)|true=可提交,false=不可提交
-
-				resource_sharing_id: '', //resource_sharing_id(资源共享表id)
-				
-				// 快速填写相关
-				showQuickFill: false, // 是否显示快速填写弹窗
-				quickFillText: '', // 快速填写文本内容
-				
-				//表单
-				formData: {
-					// 客户基础信息
-					source_channel: '', //来源渠道
-					source: '', //来源
-					consultant: '', //顾问
-					name: '', //姓名
-					age: '', //年龄
-					birthday: '', //生日
-					gender: 'male', //性别|male-男性, female-女性, other-其他
-					phone_number: '', //联系电话
-					demand: '', //需求
-					decision_maker: '', //决策人
-					initial_intent: '', //客户初步意向度: high-高, medium-中, low-低
-					status: '', //客户状态: active-活跃, inactive-不活跃, pending-待定
-
-					//六要素信息
-					purchasing_power: '', //购买力
-					cognitive_idea: '', //认知理念
-					communication: '', //沟通备注
-					promised_visit_time: '', //承诺到访时间
-					staff_id: '', //人员ID
-					distance: '', //距离
-					optional_class_time: '', //可选上课时间
-					first_visit_status: '', //一访情况
-					second_visit_status: '', //二访情况
-					efficacious:'1',
-					call_intent:'2'
-				},
-
-				//下拉选择器相关
-				picker_input_name: '', //下拉组件的input_name
-				picker_show: false, //下拉组件是否展示
-				picker_linkage: true, //选择器是否为联动选择
-				picker_options: [
-					// {
-					//   text:'张三',
-					//   value:'1'
-					// },
-				], //选择器可选值列表
-				picker_config: {
-					//来源渠道
-					source_channel: {
-						text: '', //回显中文名字
-						options: [
-							// {
-							//   text:'张三',
-							//   value:'1'
-							// }
-						], //可选值列表
-					},
-					//来源
-					source: {
-						text: '',
-						options: [],
-					},
-					//顾问
-					consultant: {
-						text: '',
-						options: [],
-					},
-					//购买力
-					purchasing_power: {
-						text: '',
-						options: [],
-					},
-					//认知理念
-					cognitive_idea: {
-						text: '',
-						options: [],
-					},
-					//客户初步意向度
-					initial_intent: {
-						text: '',
-						options: [],
-					},
-					//所属校区
-					campus: {
-						text: '',
-						options: [],
-					},
-					//是否加微信
-					call_intent: {
-						text: '',
-						options: [
-							{
-								text:'是',
-								value:'1'
-							},
-							{
-								text:'否',
-								value:'2'
-							}
-						],
-					},
-					//客户状态
-					status: {
-						text: '',
-						options: [],
-					},
-					//决策人
-					decision_maker: {
-						text: '',
-						options: [],
-					},
-					//距离
-					distance: {
-						text: '',
-						options: [],
-					},
-				}, //选择器选项配置
-
-				// 年月日选择组件
-				data_picker_input_name: '', //时间组件的input_name
-				date_picker_show: false, //时间选择器是否展示
-				default_date_value: '', // 添加默认日期值
-
-
-
-				// 查重相关  
-				clientUserList: [], //查重用户列表
-				showDuplicateCheck: false, //是否显示查重弹出层
-
-				campus_list:[],
-				//tab切换
-				optionTableId: 0,
-				optionTable: [{
-						id: 0,
-						name: '基础信息'
-					},
-					{
-						id: 1,
-						name: '电话六要素'
-					},{
-						id: 2,
-						name: '面咨记录'
-					}
-				],
-			}
-		},
-		onLoad(options) {
-			console.log('onLoad - 接收到参数:', options);
-			if (!options || !options.resource_sharing_id) {
-				console.error('缺少必要参数 resource_sharing_id');
-				uni.showToast({
-					title: '缺少必要参数',
-					icon: 'none'
-				});
-				setTimeout(() => {
-					uni.navigateBack();
-				}, 1500);
-				return;
-			}
-			this.resource_sharing_id = options.resource_sharing_id; //共享资源表id
-			console.log('设置 resource_sharing_id:', this.resource_sharing_id);
-		},
-		onShow() {
-			console.log('onShow - 开始初始化');
-			this.init();
-		},
-		methods: {
-			//初始化
-			async init() {
-				try {
-					console.log('init - 开始初始化流程');
-					
-					if (!this.resource_sharing_id) {
-						console.error('resource_sharing_id 为空，无法初始化');
-						uni.showToast({
-							title: '缺少必要参数',
-							icon: 'none'
-						});
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 1500);
-						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({
-						title: '加载数据失败，请重试',
-						icon: 'none'
-					});
-				} finally {
-					uni.hideLoading();
-				}
-			},
-			
-			// 批量获取字典数据
-			async getBatchDictData() {
-				try {
-					console.log('开始批量获取字典数据');
-					
-					// 定义需要的字典keys和对应的本地键名
-					const dictKeys = [
-						'SourceChannel',
-						'source', 
-						'customer_purchasing_power',
-						'preliminarycustomerintention',
-						'cognitive_concept',
-						'kh_status',
-						'decision_maker',
-						'distance'
-					];
-					
-					const dictMapping = {
-						'SourceChannel': 'source_channel',
-						'source': 'source',
-						'customer_purchasing_power': 'purchasing_power',
-						'preliminarycustomerintention': 'initial_intent',
-						'cognitive_concept': 'cognitive_idea',
-						'kh_status': 'status',
-						'decision_maker': 'decision_maker',
-						'distance': 'distance'
-					};
-					
-					try {
-						// 使用批量接口一次性获取所有字典
-						console.log('调用批量字典接口，keys:', dictKeys);
-						const batchResult = await apiRoute.common_getBatchDict(dictKeys);
-						
-						if (batchResult && batchResult.code === 1 && batchResult.data) {
-							console.log('批量字典接口响应成功:', batchResult.data);
-							
-							// 处理批量返回的字典数据
-							Object.keys(batchResult.data).forEach(key => {
-								const localKey = dictMapping[key];
-								if (localKey && Array.isArray(batchResult.data[key])) {
-									this.processDictData(localKey, batchResult.data[key]);
-								}
-							});
-							
-							console.log('批量字典数据处理完成');
-							return;
-						} else {
-							console.warn('批量字典接口返回数据格式异常:', batchResult);
-						}
-					} catch (batchError) {
-						console.error('批量字典接口调用失败:', batchError);
-					}
-					
-					// 如果批量接口失败，回退到单个获取
-					console.log('批量接口失败，使用回退方案');
-					await this.fallbackGetDict();
-					
-				} catch (error) {
-					console.error('批量获取字典数据失败:', error);
-					// 如果批量获取失败，回退到单个获取
-					await this.fallbackGetDict();
-				}
-			},
-
-			// 加载单个字典数据
-			async loadDictData(key, localKey) {
-				try {
-					// 检查缓存
-					if (window._dictCache[key]) {
-						// 使用缓存数据
-						const dictData = window._dictCache[key];
-						this.processDictData(localKey, dictData);
-						return dictData;
-					}
-					
-					// 加载字典数据
-					const dictData = await this.$util.getDict(key);
-					
-					// 缓存数据
-					if (Array.isArray(dictData) && dictData.length > 0) {
-						window._dictCache[key] = dictData;
-						this.processDictData(localKey, dictData);
-					}
-					
-					return dictData;
-				} catch (error) {
-					console.error(`加载字典 ${key} 失败:`, error);
-					return [];
-				}
-			},
-
-			// 处理字典数据
-			processDictData(localKey, dictData) {
-				if (!Array.isArray(dictData) || dictData.length === 0) return;
-				
-				let formattedOptions = dictData.map(item => ({
-					text: item.name || '',
-					value: item.value || ''
-				}));
-				
-				// 特殊处理来源渠道，添加线下选项
-				if (localKey === 'source_channel') {
-					formattedOptions.unshift({
-						text: '线下',
-						value: '0'
-					});
-				}
-				
-				// 确保 picker_config 存在
-				if (!this.picker_config[localKey]) {
-					this.picker_config[localKey] = { options: [], text: '点击选择' };
-				}
-				
-				this.picker_config[localKey].options = formattedOptions;
-			},
-
-			// 回退方案：单个获取字典
-			async fallbackGetDict() {
-				console.log('使用回退方案获取字典数据');
-				try {
-					// 优先获取关键字典
-					await Promise.all([
-						this.getDict('source_channel'),
-						this.getDict('source')
-					]);
-					
-					// 延迟加载其他字典
-					setTimeout(async () => {
-						try {
-							await Promise.all([
-								this.getDict('purchasing_power'),
-								this.getDict('initial_intent'),
-								this.getDict('cognitive_idea'),
-								this.getDict('status'),
-								this.getDict('decision_maker'),
-								this.getDict('distance')
-							]);
-						} catch (error) {
-							console.error('回退方案第二阶段失败:', error);
-						}
-					}, 100);
-				} catch (error) {
-					console.error('回退方案也失败了:', error);
-				}
-			},
-			
-			async get_campus_list(){
-			
-				let res = await apiRoute.common_getCampusesList({})
-				if (res.code != 1) {
-				  uni.showToast({
-				    title: res.msg,
-				    icon: 'none'
-				  })
-				  return
-				}
-				
-				this.campus_list = res.data
-				
-				
-				let arr = []
-				this.campus_list.forEach((v,k)=>{
-				  arr.push({
-				    text: v.campus_name,
-				    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({
-							title: res.msg,
-							icon: 'none'
-						});
-						return;
-					}
-
-					let customerResource = res.data.customerResource || {}; //客户资源详情
-					let sixSpeed = res.data.customerResource.sixSpeed || {}; //六要素详情
-					console.log('getInfo - 客户资源详情:', customerResource);
-					console.log('getInfo - 六要素详情:', sixSpeed);
-
-					// 存储原始数据，用于后续回显
-					this._resourceDetail = res.data;
-
-					this.formData = {
-						resource_sharing_id: this.resource_sharing_id, //资源共享表id
-						// 客户基础信息
-						id: customerResource.id || '', //客户资源表id
-						source_channel: customerResource.source_channel || '', //来源渠道
-						source: customerResource.source || '', //来源
-						name: customerResource.name || '', //姓名
-						age: customerResource.age || '', //年龄
-						birthday: customerResource.birthday || '', //生日
-						gender: customerResource.gender || 'male', //性别|male-男性, female-女性, other-其他
-						phone_number: customerResource.phone_number || '', //联系电话
-						demand: customerResource.demand || '', //需求
-						decision_maker: customerResource.decision_maker || '', //决策人
-						initial_intent: customerResource.initial_intent || '', //客户初步意向度: high-高, medium-中, low-低
-						status: customerResource.status || '', //客户状态: active-活跃, inactive-不活跃, pending-待定
-						campus: customerResource.campus || '', // 校区
-						customer_type: customerResource.customer_type || '', // 客户分类
-
-						//六要素信息
-						purchasing_power: sixSpeed.purchase_power || '', //购买力
-						cognitive_idea: sixSpeed.concept_awareness || '', //认知理念
-						communication: sixSpeed.communication || '', //沟通备注
-						staff_id: sixSpeed.staff_id || '', //人员ID
-						distance: sixSpeed.distance || '', //距离
-						promised_visit_time: sixSpeed.promised_visit_time || '', //承诺到访时间
-						optional_class_time: sixSpeed.preferred_class_time || '', //可选上课时间
-						first_visit_time: sixSpeed.first_visit_time || '', // 一访时间
-						first_visit_status: sixSpeed.first_visit_status || '', //一访情况
-						second_visit_time: sixSpeed.second_visit_time || '', // 二访时间
-						second_visit_status: sixSpeed.second_visit_status || '', //二访情况
-						remark: sixSpeed.consultation_remark || '', // 备注
-						consultation_remark: sixSpeed.consultation_remark || '', // 面咨备注
-						chasing_orders: sixSpeed.chasing_orders || '', // 追单标注
-						is_bm: sixSpeed.is_bm || 2, // 是否报名，默认未报名
-						efficacious: sixSpeed.efficacious || '',
-						call_intent: sixSpeed.call_intent || '', // 是否加微信
-					};
-					
-					console.log('getInfo - 表单数据设置完成:', this.formData);
-
-					// 格式化日期时间
-					if (sixSpeed.promised_visit_time) {
-						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 = this.$util.formatToDateTime(sixSpeed.preferred_class_time, 'Y-m-d');
-					}
-					
-					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({
-						title: '获取客户详情失败，请重试',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 设置选择器文本回显
-			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);
-					this.setPickerTextByValue('consultant', this.formData.consultant, customerResource.consultant_name);
-					this.setPickerTextByValue('initial_intent', this.formData.initial_intent, customerResource.initial_intent_name);
-					this.setPickerTextByValue('status', this.formData.status, customerResource.status_name);
-					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);
-					// 不再需要设置call_intent的选择器文本，因为已改为单选组件
-					
-					console.log('选择器文本回显完成');
-				} catch (error) {
-					console.error('设置选择器文本回显失败:', error);
-				}
-			},
-
-			// 根据值设置选择器文本
-			setPickerTextByValue(pickerName, value, defaultText) {
-				// 使用空值缓存加速处理
-				if (!value) {
-					this.picker_config[pickerName] = this.picker_config[pickerName] || {};
-					this.picker_config[pickerName].text = '点击选择';
-					return;
-				}
-				
-				// 创建映射缓存，避免重复查找
-				if (!this._valueTextMapping) {
-					this._valueTextMapping = {};
-				}
-				
-				// 检查缓存
-				const cacheKey = `${pickerName}_${value}`;
-				if (this._valueTextMapping[cacheKey]) {
-					this.picker_config[pickerName] = this.picker_config[pickerName] || {};
-					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;
-				} else if (defaultText) {
-					// 如果找不到匹配的选项但有默认文本，则使用默认文本
-					textValue = defaultText;
-				} else {
-					textValue = '点击选择';
-				}
-				
-				// 保存到缓存
-				this._valueTextMapping[cacheKey] = textValue;
-				this.picker_config[pickerName].text = textValue;
-			},
-
-			// 获取资源详情（缓存数据，避免重复请求）
-			async getResourceDetail() {
-				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
-					return res.data
-				}
-				return null
-			},
-
-
-
-
-
-
-			//获取字典
-			async getDict(inputName) {
-				try {
-					console.log(`getDict - 开始获取字典数据: ${inputName}`);
-					
-					let key = '';
-					switch (inputName) {
-						//来源渠道
-						case 'source_channel':
-							key = 'SourceChannel';
-							break;
-						//来源
-						case 'source':
-							key = 'source';
-							break;
-						//购买力
-						case 'purchasing_power':
-							key = 'customer_purchasing_power';
-							break;
-						//认知理念
-						case 'cognitive_idea':
-							key = 'cognitive_concept';
-							break;
-						//是否加微信 - 已改为单选组件，不再需要从字典获取
-						case 'call_intent':
-							return Promise.resolve();
-							break;
-						//决策人
-						case 'decision_maker':
-							key = 'decision_maker';
-							break;
-						//客户初步意向度
-						case 'initial_intent':
-							key = 'preliminarycustomerintention';
-							break;
-						//客户状态
-						case 'status':
-							key = 'kh_status';
-							break;
-						//距离
-						case 'distance':
-							key = 'distance';
-							break;
-						//客户分类
-						case 'customer_type':
-							key = 'customer_type';
-							break;
-						default:
-							console.warn(`未知的字典类型: ${inputName}`);
-							return;
-					}
-					
-					console.log(`getDict - 字典键值映射: ${inputName} -> ${key}`);
-					
-					// 确保 picker_config[inputName] 存在
-					if (!this.picker_config[inputName]) {
-						this.picker_config[inputName] = { options: [], text: '点击选择' };
-					}
-
-					// 使用 util.getDict 获取并缓存字典
-					console.log(`getDict - 调用 $util.getDict('${key}')`);
-					let dictionary = await this.$util.getDict(key);
-					console.log(`getDict - 字典数据获取结果:`, dictionary);
-					
-					if(!dictionary || !Array.isArray(dictionary) || dictionary.length === 0){
-						console.warn(`字典 ${key} 数据为空`);
-						return;
-					}
-					
-					let arr = [];
-					// 处理接口返回的数据结构 [{name: "抖音", value: "1", sort: 0, memo: ""}, ...]
-					dictionary.forEach((v) => {
-						arr.push({ text: v.name, value: v.value });
-					});
-
-					if (inputName == 'source_channel') {
-						// 插入到arr的头部
-						arr.unshift({
-							text: '线下',
-							value: '0',
-						});
-					}
-
-					this.picker_config[inputName].options = arr;
-					
-					console.log(`getDict - 字典 ${inputName} 加载完成，选项数: ${arr.length}`);
-					return arr;
-				} catch (error) {
-					console.error(`获取字典 ${inputName} 失败:`, error);
-					return [];
-				}
-			},
-
-			//打开结果列表
-			openDuplicateCheck() {
-				this.showDuplicateCheck = true
-			},
-			//关闭结果列表
-			closeDuplicateCheck(e) {
-				this.showDuplicateCheck = false
-			},
-
-
-
-
-
-			//联系电话失去焦点时间
-			async handlePhoneBlur() {
-				if (!this.formData.phone_number) {
-					return
-				}
-
-				this.clientUserList = []
-
-				let param = {
-					phone_number: this.formData.phone_number
-				}
-				let res = await apiRoute.xs_getAllCustomerResources(param)
-				if (res.code != 1) {
-					if (res.msg == '暂无数据') {
-						return
-					}
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-				console.log('查重', res)
-
-
-
-				this.clientUserList = res.data
-
-				if (this.clientUserList.length == 1) {
-					if (this.clientUserList[0].id == this.formData.id) {
-						//查重后的手机号是自己,就不展示查重结果了
-						return
-					}
-				}
-
-				this.openDuplicateCheck()
-			},
-
-
-
-
-
-
-			//性别选择器
-			changeSex(e) {
-				this.formData.gender = e.detail.value
-			},
-
-
-
-			//切换tag列表
-			async segmented(e) {
-				console.log(e)
-				//e.id|0=基础信息 1=六要素
-				let status = e.id
-				this.optionTableId = String(status)
-			},
-
-			//查看修改记录
-			viewEditLog() {
-				if (!this.resource_sharing_id) {
-					uni.showToast({
-						title: '客户信息不存在',
-						icon: 'none'
-					});
-					return;
-				}
-
-				uni.navigateTo({
-					url: `/pages-market/clue/edit_clues_log?customer_resource_id=${this.resource_sharing_id}`
-				});
-			},
-
-			// 快速填写相关方法
-			// 打开快速填写弹窗
-			openQuickFill() {
-				this.showQuickFill = true
-				this.quickFillText = ''
-			},
-			
-			// 解析快速填写文本
-			parseQuickFillText() {
-				if (!this.quickFillText.trim()) {
-					uni.showToast({
-						title: '请输入要解析的文本',
-						icon: 'none'
-					})
-					return
-				}
-				
-				try {
-					// 定义字段映射规则
-					const fieldRules = [
-						{ key: 'name', patterns: ['姓名', '客户姓名', '用户姓名', '学员姓名', '学生姓名'] },
-						{ key: 'phone_number', patterns: ['电话', '手机', '联系电话', '手机号', '电话号码', '联系方式'] },
-						{ key: 'campus', patterns: ['校区', '所属校区', '校区名称'] },
-						{ key: 'age', patterns: ['年龄'] },
-						{ key: 'birthday', patterns: ['生日', '出生日期', '生日日期'] }
-					]
-					
-					// 用于存储解析结果
-					const parsedData = {}
-					const text = this.quickFillText.trim()
-					
-					// 对每个字段规则进行匹配
-					fieldRules.forEach(rule => {
-						rule.patterns.forEach(pattern => {
-							// 匹配模式：字段名 + 冒号/等号 + 数据内容
-							const regex = new RegExp(`${pattern}\\s*[：:=]\\s*([^，,\\n\\s]+)`, 'g')
-							const match = regex.exec(text)
-							if (match && match[1]) {
-								parsedData[rule.key] = match[1].trim()
-							}
-						})
-					})
-					
-					console.log('解析结果:', parsedData)
-					
-					// 填写到表单中
-					let fillCount = 0
-					if (parsedData.name) {
-						this.formData.name = parsedData.name
-						fillCount++
-					}
-					if (parsedData.phone_number) {
-						this.formData.phone_number = parsedData.phone_number
-						fillCount++
-					}
-					if (parsedData.campus) {
-						// 需要在校区选项中查找匹配的项
-						this.findAndSetCampus(parsedData.campus)
-						fillCount++
-					}
-					if (parsedData.age) {
-						const age = parseInt(parsedData.age)
-						if (!isNaN(age) && age > 0 && age < 150) {
-							this.formData.age = age
-							fillCount++
-						}
-					}
-					if (parsedData.birthday) {
-						this.formData.birthday = parsedData.birthday
-						fillCount++
-					}
-					
-					if (fillCount > 0) {
-						uni.showToast({
-							title: `成功填写${fillCount}个字段`,
-							icon: 'success'
-						})
-						this.showQuickFill = false
-					} else {
-						uni.showToast({
-							title: '未能识别到有效信息，请检查格式',
-							icon: 'none'
-						})
-					}
-					
-				} catch (error) {
-					console.error('解析失败:', error)
-					uni.showToast({
-						title: '解析失败，请检查格式',
-						icon: 'none'
-					})
-				}
-			},
-			
-			// 查找并设置校区
-			findAndSetCampus(campusText) {
-				const campusOptions = this.picker_config.campus?.options || []
-				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
-				}
-			},
-
-
-			//######-----下拉选择器组件相关-----######
-			//打开下拉选择器
-			openCicker(input_name, linkage = true) {
-				this.picker_options = []
-
-				this.picker_input_name = input_name
-
-				let arr = this.picker_config[input_name]?.options || []
-
-				if (!arr.length) {
-					uni.showToast({
-						title: '暂无选项',
-						icon: 'none'
-					})
-					return
-				}
-
-				this.picker_options = arr
-				this.picker_linkage = linkage
-				// 使用 nextTick 确保数据更新后再打开 picker
-				this.$nextTick(() => {
-					this.picker_show = true
-				})
-			},
-			//监听-下拉选择器
-			changeCicker(e) {
-				console.log('监听-下拉选择器', this.picker_input_name, e);
-				let input_name = this.picker_input_name;
-				
-				// 更新表单数据
-				this.formData[input_name] = e.value;
-				
-				// 更新选择器文本
-				this.picker_config[input_name].text = e.text;
-				
-				// 特殊处理：来源选择
-				if (input_name === 'source') {
-					// 如果选择了线上(1)，则需要选择来源渠道
-					if (e.value === '1' || e.value === 1) {
-						// 清空来源渠道，等待用户选择
-						this.formData.source_channel = '';
-						this.picker_config.source_channel.text = '点击选择';
-					} else {
-						// 如果选择了其他来源，则设置来源渠道为线下
-						this.formData.source_channel = '0'; // 0=线下
-						this.picker_config.source_channel.text = '线下';
-					}
-				}
-				
-				this.cancelCicker();
-			},
-			//关闭下拉选择器
-			cancelCicker() {
-				this.picker_show = false
-				this.picker_input_name = ''
-				this.picker_options = []
-			},
-
-
-			//######-----时间选择器组件相关-----######
-			//打开下拉选择器
-			openDate(input_name) {
-				this.date_picker_show = true
-				this.data_picker_input_name = input_name
-				
-				// 设置默认日期值
-				if (this.formData[input_name]) {
-					// 如果有值，使用当前值
-					this.default_date_value = this.formData[input_name]
-				} else {
-					// 如果没有值，使用当天日期
-					const today = new Date()
-					const year = today.getFullYear()
-					const month = String(today.getMonth() + 1).padStart(2, '0')
-					const day = String(today.getDate()).padStart(2, '0')
-					this.default_date_value = `${year}-${month}-${day}`
-				}
-			},
-			//选择跟进时间
-			change_date(e) {
-				//跟进时间
-				let val = (e.result ?? '')
-				if (val) {
-					val = val
-				}
-
-				let input_name = this.data_picker_input_name
-				this.formData[input_name] = val
-
-				this.cancel_date()
-			},
-			//关闭选择跟进时间
-			cancel_date() {
-				this.date_picker_show = false
-			},
-
-			//下一步 index|0=添加客户,1六要素
-			async nextStep(index) {
-				this.optionTableId = String(index)
-			},
-			//表单验证
-			async validatorForm(data) {
-				//姓名
-				if(!data.name){
-				  uni.showToast({
-				    title: '学生姓名必填',
-				    icon: 'none'
-				  })
-				  this.nextStep('0')
-				  return false
-				}
-				//电话
-				if(!data.phone_number){
-				  uni.showToast({
-				    title: '电话必填',
-				    icon: 'none'
-				  })
-				  this.nextStep('0')
-				  return false
-				}
-				//校区必填
-				if(!data.campus){
-				  uni.showToast({
-				    title: '校区必填',
-				    icon: 'none'
-				  })
-				  this.nextStep('0')
-				  return false
-				}
-				return true
-			},
-			//提交
-			async submit() {
-				console.log('提交', this.formData)
-				let data = {
-					...this.formData
-				}
-				//表单验证
-				let validatorForm = await this.validatorForm(data)
-				console.log('验证结果', validatorForm)
-				if (!validatorForm) {
-					return
-				}
-
-				//防止重复提交
-				if (!this.is_submit) {
-					return
-				}
-				this.is_submit = false
-
-				let res = await apiRoute.xs_editCustomerResources(data)
-
-				this.is_submit = true
-
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-				uni.showToast({
-					title: res.msg,
-					icon: 'success'
-				})
-				//延迟1s执行
-				setTimeout(() => {
-					//跳转页面-客户详情列表
-					//关闭当前页跳转新页面
-					uni.redirectTo({
-						url: `/pages-market/clue/clue_info?resource_sharing_id=${this.resource_sharing_id}`
-					})
-				}, 1000)
-			},
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	.search_box {
-		padding: 20rpx 40rpx;
-		border-bottom: 1px solid #333333;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		.input_box {
-			width: 70%;
-
-			input {
-				width: 100%;
-				height: 60rpx;
-				color: #fff;
-				font-size: 28rpx;
-			}
-		}
-
-		.btn {
-			font-size: 28rpx;
-			color: #24BA9F;
-		}
-	}
-
-	.assemble {
-		width: 100%;
-		height: 100vh;
-		background: #292929;
-		overflow: auto;
-		
-		:deep(.fui-form__item-bottom) {
-			background: transparent !important;
-			left: 0 !important;
-			right: 0 !important;
-			display: none !important;
-		}
-	}
-
-	.title {
-		font-size: 26rpx;
-		color: #fff;
-		padding: 26rpx 0 26rpx 32rpx;
-	}
-
-	.input-title {
-		font-size: 26rpx;
-		color: #fff;
-	}
-
-	.form-style {
-		width: 100%;
-		// background: #434544;
-		
-		:deep(.fui-form__item-bottom) {
-			background: transparent !important;
-			left: 0 !important;
-			right: 0 !important;
-			display: none !important;
-		}
-	}
-
-	.form-style-vid {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 12rpx 0;
-	}
-
-	.input-style {
-		text-align: right !important;
-		
-		:deep(.fui-label__text) {
-			margin-top: 10rpx;
-		}
-		
-		:deep(.fui-form__item-flex) {
-			align-items: flex-start !important;
-		}
-		
-		:deep(.fui-form__item-flex-start) {
-			align-items: flex-start !important;
-		}
-		
-		:deep(.fui-textarea__wrap) {
-			border: none !important;
-			padding: 0 !important;
-		}
-		
-		:deep(.fui-textarea__counter) {
-			padding-right: 0 !important;
-		}
-	}
-	
-	.textarea-container {
-		width: 100%;
-		padding: 0 0 20rpx 0;
-		
-		:deep(.fui-textarea__wrap) {
-			border: none !important;
-			padding: 0 !important;
-			background-color: #434544;
-		}
-		
-		:deep(.fui-textarea__placeholder) {
-			text-align: left;
-		}
-		
-		:deep(.fui-textarea__inner) {
-			text-align: left;
-		}
-		
-		:deep(.fui-form__item-bottom) {
-			display: none !important;
-		}
-	}
-
-	.fui-btn__box {
-		margin: 50rpx auto 120rpx;
-		width: 92%;
-	}
-
-	//查重结构弹出层
-	.fui-scroll__wrap {
-		height: 60vh;
-
-		.title_box {
-			padding: 10rpx 20rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.title {
-				font-size: 28rpx;
-				color: #101010;
-			}
-		}
-
-		.section_ul {
-			margin-bottom: 100rpx;
-			height: 98%;
-
-			.not_list {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				.img {
-					width: 112rpx;
-					height: 112rpx;
-				}
-
-				.title {
-					padding: 0;
-					margin-top: 10rpx;
-					color: #101010;
-					font-size: 28rpx;
-					text-align: center;
-				}
-			}
-
-			.ul {
-				padding: 26rpx;
-				padding-bottom: 100rpx;
-				display: flex;
-				flex-direction: column;
-
-				.li {
-					margin-bottom: 26rpx;
-					padding: 26rpx;
-					display: flex;
-					justify-content: space-between;
-					gap: 10rpx;
-
-					border-radius: 18rpx;
-					background-color: rgba(67, 69, 68, 1);
-					color: #fff;
-					font-size: 28rpx;
-					border: 0rpx solid rgba(121, 121, 121, 1);
-
-					.left_box {
-						width: 80%;
-						display: flex;
-						flex-direction: column;
-						gap: 20rpx;
-
-						.box_1 {
-							display: flex;
-							align-items: center;
-
-							.img {
-								width: 48rpx;
-								height: 48rpx;
-								border-right: 50%;
-							}
-
-							.name {
-								margin-left: 20rpx;
-							}
-
-							.tag {
-								margin-left: 20rpx;
-								width: 84rpx;
-								height: 32rpx;
-								line-height: 28rpx;
-								border-radius: 0rpx 20rpx 20rpx 20rpx;
-								background-color: rgba(236, 128, 141, 0.3);
-								color: rgba(240, 90, 90, 1);
-								font-size: 20rpx;
-								text-align: center;
-								border: 0rpx solid rgba(121, 121, 121, 1);
-							}
-						}
-
-						.box_2 {
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-
-							.left {
-								display: flex;
-								align-items: flex-end;
-
-								.name {
-									font-size: 28rpx;
-								}
-
-								.call {
-									margin-left: 10rpx;
-									font-size: 24rpx;
-									color: #ba7b30;
-								}
-							}
-						}
-
-						.box_3 {
-							display: flex;
-							gap: 30rpx;
-
-							.left {}
-
-							.right {
-								display: flex;
-								align-items: center;
-								gap: 10rpx;
-
-								.img {
-									width: 16rpx;
-									height: 16rpx;
-									border-right: 50%;
-								}
-							}
-						}
-					}
-
-					.right_box {
-						width: 25%;
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.img {
-							width: 70rpx;
-							height: 70rpx;
-							border-radius: 50%;
-						}
-					}
-				}
-			}
-		}
-
-	}
-
-	.save-btn-box {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 100;
-		background: #292929;
-		padding: 20rpx 40rpx 40rpx 40rpx;
-		box-shadow: 0 -2rpx 8rpx rgba(0,0,0,0.12);
-	}
-	
-	.safe-area-bottom {
-		width: 100%;
-		height: 180rpx; /* 增加高度，确保有足够的空间 */
-	}
-	
-	// 快速填写弹窗样式
-	.quick-fill-mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.6);
-		z-index: 1500;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 40rpx;
-	}
-	
-	.quick-fill-content {
-		background: #fff;
-		border-radius: 16rpx;
-		width: 100%;
-		max-width: 600rpx;
-		max-height: 80vh;
-		display: flex;
-		flex-direction: column;
-	}
-	
-	.quick-fill-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 32rpx;
-		border-bottom: 1px solid #f0f0f0;
-	}
-	
-	.quick-fill-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-	}
-	
-	.quick-fill-close {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		.close-text {
-			font-size: 32rpx;
-			color: #999;
-		}
-	}
-	
-	.quick-fill-body {
-		padding: 32rpx;
-		flex: 1;
-		overflow-y: auto;
-	}
-	
-	.quick-fill-tip {
-		margin-bottom: 24rpx;
-		font-size: 24rpx;
-		color: #666;
-		line-height: 1.5;
-		
-		text:first-child {
-			display: block;
-			margin-bottom: 8rpx;
-		}
-		
-		text:last-child {
-			display: block;
-			color: #29d3b4;
-			font-weight: 500;
-		}
-	}
-	
-	.quick-fill-textarea {
-		width: 100%;
-		height: 300rpx;
-		border: 1px solid #ddd;
-		border-radius: 8rpx;
-		padding: 16rpx;
-		font-size: 28rpx;
-		line-height: 1.5;
-		background: #fafafa;
-		box-sizing: border-box;
-	}
-	
-	.quick-fill-buttons {
-		display: flex;
-		gap: 20rpx;
-		padding: 32rpx;
-		border-top: 1px solid #f0f0f0;
-	}
-	
-	.quick-fill-btn {
-		flex: 1;
-		height: 72rpx;
-		line-height: 72rpx;
-		text-align: center;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-		
-		&.cancel-btn {
-			background: #f5f5f5;
-			color: #666;
-			border: 1px solid #ddd;
-		}
-		
-		&.confirm-btn {
-			background: #29d3b4;
-			color: #fff;
-		}
-	}
-	
-	.quick-fill-btn {
-		padding: 0 32rpx;
-		background: #f5f5f5;
-		border: 1px solid #ddd;
-		border-radius: 8rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/edit_clues_log.vue b/uniapp/pages/market/clue/edit_clues_log.vue
deleted file mode 100644
index 7340b68f..00000000
--- a/uniapp/pages/market/clue/edit_clues_log.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--编辑客户-->
-<template>
-  <view class="assemble">
-<!--切换-->
-    <view class="tab_section">
-      <fui-segmented-control
-          :values="optionTable"
-          :current="(Number(optionTableId))"
-          type="button"
-          radius="8"
-          height="80"
-          color="#29d3b4"
-          bold="true"
-          @click="segmented">
-      </fui-segmented-control>
-    </view>
-
-<!--    客户资源修改记录-->
-    <scroll-view
-        v-show="filteredData.type == `resource`"
-        scroll-y="true"
-        :lower-threshold="lowerThreshold"
-        @scrolltolower="loadMoreData"
-        style="margin-top:40rpx;height: 80vh;"
-    >
-      <!--时间轴-->
-      <view class="table_list">
-        <fui-timeaxis background="#292929" :padding="['36rpx','16rpx']">
-          <fui-timeaxis-node
-              :lineColor="k<3 ? v.activeColor:'#ccc'"
-              :lined="k!==tableList.length-1"
-              v-for="(v,k) in tableList"
-              :key="k"
-          >
-            <!--inco-->
-            <view
-                class="fui-node"
-                :style="{borderColor:(k != tableList.length-1 ? '#29d3b4' :'' ) }"
-            >
-            </view>
-            <template v-slot:right>
-              <view
-                  class="fui-process__node table_itme"
-                  :style="{paddingBottom:(k !== tableList.length-1 ? '50rpx' :'0rpx')}"
-                  :class="{'fui-node__pb':k!==tableList.length-1}"
-              >
-
-                <view class="fui-title">
-                  <!--修改时间-->
-                  {{v.modification_time}}
-                </view>
-                <view class="itme_box">
-                  <view class="title_name">修改人：{{v.staff_id_name}} 修改了如下内容</view>
-                  <view class="table_section">
-                    <table class="table_box">
-                      <!-- 自定义表头 -->
-                      <thead>
-                      <tr>
-                        <th style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">字段名称</th>
-                        <th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
-                        <th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
-                      </tr>
-                      </thead>
-
-                      <!-- 自定义每一行数据 -->
-                      <tbody>
-                      <tr v-for="(row, index) in v.update_arr" :key="index">
-                        <td style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
-                        <td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
-                        <td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
-                      </tr>
-                      </tbody>
-                    </table>
-                  </view>
-                </view>
-              </view>
-            </template>
-          </fui-timeaxis-node>
-        </fui-timeaxis>
-      </view>
-    </scroll-view>
-
-<!--    六要素修改记录-->
-    <scroll-view
-        v-show="filteredData.type == `six_speed`"
-        scroll-y="true"
-        :lower-threshold="lowerThreshold"
-        @scrolltolower="loadMoreData"
-        style="margin-top:40rpx;height: 80vh;"
-    >
-      <!--时间轴-->
-      <view class="table_list">
-        <fui-timeaxis background="#292929" :padding="['36rpx','16rpx']">
-          <fui-timeaxis-node
-              :lineColor="k<3?v.activeColor:'#ccc'"
-              :lined="k!==tableList.length-1"
-              v-for="(v,k) in tableList"
-              :key="k"
-          >
-            <!--inco-->
-            <view
-                class="fui-node"
-                :style="{borderColor:(k != tableList.length-1 ? '#29d3b4' :'' ) }"
-            >
-            </view>
-            <template v-slot:right>
-              <view
-                  class="fui-process__node table_itme"
-                  :style="{paddingBottom:(k !== tableList.length-1 ? '50rpx' :'0rpx')}"
-                  :class="{'fui-node__pb':k!==tableList.length-1}"
-              >
-
-                <view class="fui-title">
-                  <!--修改时间-->
-                  {{v.modification_time}}
-                </view>
-                <view class="itme_box">
-                  <view class="title_name">修改人：{{v.staff_id_name}} 修改了如下内容</view>
-                  <view class="table_section">
-                    <table class="table_box">
-                      <!-- 自定义表头 -->
-                      <thead>
-                      <tr>
-                        <th style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">字段名称</th>
-                        <th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
-                        <th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
-                      </tr>
-                      </thead>
-
-                      <!-- 自定义每一行数据 -->
-                      <tbody>
-                      <tr v-for="(row, index) in v.update_arr" :key="index">
-                        <td style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
-                        <td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
-                        <td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
-                      </tr>
-                      </tbody>
-                    </table>
-                  </view>
-                </view>
-              </view>
-            </template>
-          </fui-timeaxis-node>
-        </fui-timeaxis>
-      </view>
-    </scroll-view>
-
-  </view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-
-export default {
-  data() {
-    return {
-
-      loading:false,//加载状态
-      lowerThreshold: 100,//距离底部多远触发
-      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
-
-      //筛选条件
-      filteredData:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        type:'resource',//查询类型|resource=客户资源,six_speed=六要素
-        customer_resource_id: '',//客户资源表id
-      },
-      //数据列表
-      tableList:[],//表格数据
-
-      //tab切换
-      optionTableId:0,//分段器初始选中项索引
-      optionTable:[
-        {
-          id: 0,
-          name: '客户资源修改记录',
-          type:'resource',
-        },
-        {
-          id: 1,
-          name: '六要素修改记录',
-          type:'six_speed',
-        }
-      ]
-    }
-  },
-  onLoad(options) {
-    this.filteredData.customer_resource_id = options.resource_id//客户资源表id
-  },
-  onShow() {
-    this.init()
-  },
-  //下拉刷新
-  async onPullDownRefresh() {
-    //重置为第一页
-    await this.resetFilteredData()
-    await this.getList()
-  },
-  methods: {
-    //初始化
-    async init() {
-      await this.getList()//获取客户修改记录列表
-    },
-
-    //加载更多(下一页)
-    loadMoreData() {
-      //判断是否加载
-      if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getList();
-      }
-    },
-    //重置为第一页
-    async resetFilteredData() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-
-      this.filteredData.page = 1//当前页码
-      this.filteredData.limit = 10//每页返回数据条数
-      this.filteredData.total = 10//数据总条数
-    },
-    //获取列表-客户信息修改记录
-    async getList(){
-      this.loading = true
-
-      let data = {...this.filteredData}
-
-      //判断是否还有数据
-      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
-        this.loading = false
-        uni.showToast({
-          title: '暂无更多',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(data.page == 1){
-        this.tableList = []
-      }
-
-      let res = await apiRoute.xs_customerResourcesGetEditLogList(data)
-      this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      console.log(123123123,res)
-
-      this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-      console.log('列表1',this.tableList)
-      this.filteredData.total = res.data.total
-      this.filteredData.page++
-
-    },
-
-    //切换tag列表
-    async segmented(e) {
-      console.log('切换',e)
-      //e.id|0=基础信息 1=六要素
-      let status = e.id
-      this.optionTableId = String(status)
-      this.filteredData.type = e.type//查询类型|resource=客户资源,six_speed=六要素
-
-      await this.resetFilteredData()
-      await this.getList()
-    },
-
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.assemble{
-  width: 100%;
-  height: 100%;
-  background-color: #292929;
-  overflow: auto;
-  .tab_section{
-    padding: 0 20rpx;
-    padding-top: 30rpx;
-  }
-  .table_list{
-    color: #fff;
-    ::v-deep .fui-timeaxis__line{
-      background-color: #fff;
-    }
-
-    .itme_box {
-      margin-top: 30rpx;
-      display: flex;
-      flex-direction: column;
-      gap: 25rpx;
-      .title_name{
-        font-size: 28rpx;
-      }
-      .table_section{
-        .table_box{
-          width: 100%;
-          border-collapse: collapse;
-          table-layout: fixed;
-          tr{
-            display: flex;
-            th{}
-            td{}
-          }
-        }
-      }
-
-    }
-
-    ::v-deep .fui-timeaxis__wrap{
-
-    }
-    .fui-node {
-      width: 32rpx;
-      height: 32rpx;
-      border-radius: 50%;
-      background: #fff;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border: 4px solid #ccc;
-      box-sizing: border-box;
-    }
-
-    .fui-process__node {
-      padding-left: 20rpx;
-    }
-
-    .fui-title {
-      font-size: 34rpx;
-      line-height: 34rpx;
-      font-weight: bold;
-    }
-
-    .fui-descr {
-      font-size: 28rpx;
-      padding-top: 12rpx;
-      color: #7F7F7F;
-    }
-
-    .fui-time__left {
-      font-size: 36rpx;
-      line-height: 36rpx;
-      text-align: right;
-      padding-right: 20rpx;
-    }
-
-    .fui-node__pbtm {
-      padding-bottom: 88rpx;
-    }
-
-
-  }
-
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/clue/index.vue b/uniapp/pages/market/clue/index.vue
deleted file mode 100644
index 3cf5b4df..00000000
--- a/uniapp/pages/market/clue/index.vue
+++ /dev/null
@@ -1,1749 +0,0 @@
-<template>
-	<view class="assemble">
-		<fui-segmented-control :values="values" type="text" activeColor="#29d3b4" color="#fff"
-			@click="segmented"></fui-segmented-control>
-
-		<!--我的客户-->
-		<scroll-view v-if="segmented_type == 1" scroll-y="true" :lower-threshold="lowerThreshold"
-			@scrolltolower="loadMoreData_1" style="height: 100vh;">
-
-			<!-- 搜索按钮区域 -->
-			<view class="search_section">
-				<view class="item">
-					<view class="input_box" @click="openSearchPopup">
-						<view class="input_box_text">校区/用户名/手机号/时间范围</view>
-					</view>
-					<view class="button" @click="openSearchPopup">搜索</view>
-				</view>
-			</view>
-			<view class="card" v-for="(v,k) in tableList_1" :key="k">
-				<view class="card-content">
-					<view class="card-left" @click="clue_info(v)">
-						<view style="display: flex;align-items: center;padding: 12rpx;">
-							<view>
-								<image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image">
-								</image>
-							</view>
-							<view class="card-text">{{ v.customerResource.name }}</view>
-							<view class="card-con-span">{{ v.customerResource.phone_number }}</view>
-						</view>
-						<view class="card-con">
-							所属校区：{{ v.customerResource.campus_name }}
-						</view>
-						<view class="card-con">
-							来源：{{ v.customerResource.source }}
-						</view>
-						<view class="card-con">
-							来源渠道：{{ v.customerResource.source_channel }}
-						</view>
-					</view>
-					<view class="card-right">
-						<!-- 开单状态标签 -->
-						<view :class="['status-tag',getOrderStatusClass(v.customerResource.order_status)]">
-							{{ v.customerResource.order_status || '未开单' }}
-						</view>
-						<!-- 到访状态标签 -->
-						<view class="visit-status">
-							<view :class="['visit-tag',getVisitStatusClass(v.customerResource.first_visit_status)]">
-								一访{{ v.customerResource.first_visit_status || '未到' }}
-							</view>
-							<view :class="['visit-tag',getVisitStatusClass(v.customerResource.second_visit_status)]">
-								二访{{ v.customerResource.second_visit_status || '未到' }}
-							</view>
-						</view>
-						<!--只有注册了member表的账号才可操作IM对话-->
-						<view class="btn-item" v-if="v.customerResource.member_id" @click.stop>
-							<image :src="$util.img('/uniapp_src/static/images/index/message.png')" class="image"
-								@click.stop="openViewMyMessage(v)"></image>
-						</view>
-						<view class="btn-item" v-if="v.customerResource.phone_number" @click.stop>
-							<image :src="$util.img('/uniapp_src/static/images/index/phone.png')" class="image"
-								@click.stop="dialTel(v)">
-							</image>
-						</view>
-					</view>
-				</view>
-				<view class="card-footer">
-					<view class="card-date">
-						<view class="card-con" v-if="v.customerResource.communication_time">
-							{{ $util.formatToDateTime((v.customerResource.communication_time || ''), 'm-d H:i') }}
-							拨打电话
-						</view>
-						<view class="card-con" v-else>
-							暂未联系
-						</view>
-						<view style="margin-left: 30rpx;">
-							<view style="display: flex;align-items: center;">
-								<view class="title-x">
-									是否有效：{{ v.sixSpeed && v.sixSpeed.efficacious === 1 ? '有效' : '无效' }}
-								</view>
-								<view style="padding: 12rpx;">
-									<image v-if=" v.sixSpeed && v.sixSpeed.efficacious === 1"
-										:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-										class="drop-image-x"></image>
-									<image v-else :src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-										class="drop-image-x"></image>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-
-		<!--资源分配-->
-		<scroll-view v-if="segmented_type == 2" scroll-y="true" :lower-threshold="lowerThreshold"
-			@scrolltolower="loadMoreData_2" style="height: 100vh;">
-			<view class="search_section">
-				<view class="item">
-					<view class="input_box" @click="openSearchPopup()">
-						<view class="input_box_text">校区/用户名/手机号/时间范围</view>
-					</view>
-					<view class="button" @click="openSearchPopup()">搜索</view>
-				</view>
-				<!-- 批量操作控制栏 -->
-				<view class="batch_control_bar">
-					<view class="batch_actions_left">
-						<view v-if="!batchMode" class="batch_toggle_btn" @click="enterBatchMode()">批量操作</view>
-						<view v-if="batchMode" class="batch_toggle_btn cancel" @click="exitBatchMode()">取消</view>
-						<view v-if="batchMode" class="batch_select_all" @click="toggleSelectAll()">
-							<text class="checkbox" :class="{ checked: isAllSelected }">✓</text>
-							<text class="select_all_text">全选</text>
-						</view>
-					</view>
-					<view v-if="batchMode && selectedItems.length > 0" class="batch_actions_right">
-						<view class="batch_assign_btn" @click="batchAssign()">
-							批量分配 ({{ selectedItems.length }})
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="card" v-for="(v,k) in tableList_2" :key="k" @click="batchMode ? toggleItemSelection(v) : null">
-				<view class="card-content">
-					<view class="card-left">
-						<view style="display: flex;align-items: center;padding: 12rpx;">
-							<!-- 批量选择复选框 -->
-							<view v-if="batchMode" class="batch_checkbox" @click.stop="toggleItemSelection(v)">
-								<text class="checkbox" :class="{ checked: selectedItems.includes(v.id) }">✓</text>
-							</view>
-							<view>
-								<image :src="$util.img('/uniapp_src/static/images/index/myk.png')" class="card-image">
-								</image>
-							</view>
-							<view class="card-text">{{v.customerResource.name}}</view>
-							<!--            <view class="card-label">{{v.is_status == 1 ? '试听' : '成交'}}</view>-->
-						</view>
-						<view class="card-con">
-							决策人：{{v.customerResource.name}} <span
-								class="card-con-span">{{v.customerResource.decision_maker}}</span>
-						</view>
-						<view class="card-con">
-							分配给：<span class="assigned-to" :class="v.shared_by_name === '未分配' ? 'unassigned' : 'assigned'">{{v.shared_by_name}}</span>
-						</view>
-					</view>
-					<view class="card-right">
-						<view class="btn-item" @click.stop="openAssign(v)">
-							<view class="ling">分配</view>
-						</view>
-					</view>
-				</view>
-				<view class="card-footer">
-					<view class="card-date">
-						<view class="card-con" v-if="v.customerResource.communication_time">
-							{{ $util.formatToDateTime((v.customerResource.communication_time || ''),'m-d H:i') }} 拨打电话
-						</view>
-						<view class="card-con" v-else>
-							暂未联系
-						</view>
-						<view style="margin-left: 30rpx;">
-							<view style="display: flex;align-items: center;">
-								<view style="padding: 12rpx;">
-									<image v-if="v.customerResource.initial_intent == 'high'"
-										:src="$util.img('/uniapp_src/static/images/index/intention3.png')"
-										class="drop-image-x"></image>
-									<image v-else-if="v.customerResource.initial_intent == 'medium'"
-										:src="$util.img('/uniapp_src/static/images/index/intention2.png')"
-										class="drop-image-x"></image>
-									<image v-else :src="$util.img('/uniapp_src/static/images/index/intention1.png')"
-										class="drop-image-x"></image>
-								</view>
-								<view class="title-x">
-									是否有效：{{ v.customerResource && v.customerResource.initial_intent_name || '' }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-
-		<!-- 顶部弹出搜索组件 -->
-		<view v-if="showSearchPopup" class="search_popup_mask" @tap="showSearchPopup=false">
-			<view class="search_popup_content" @tap.stop>
-				<view class="popup_search_content">
-					<view class="popup_header">
-						<view class="popup_title">筛选</view>
-						<view class="popup_close" @tap="showSearchPopup=false">
-							<text class="close_text">✕</text>
-						</view>
-					</view>
-
-					<scroll-view :scroll-y="true" class="popup_scroll_view">
-						<!-- 第一筛选区域 -->
-						<view class="popup_filter_section">
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">校区筛选</text>
-									<input class="popup_filter_input" placeholder="校区筛选" v-model="searchForm.campus_name" />
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">姓名</text>
-									<input class="popup_filter_input" placeholder="姓名" v-model="searchForm.name" />
-								</view>
-							</view>
-
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">电话</text>
-									<input class="popup_filter_input" placeholder="电话" v-model="searchForm.phone_number" />
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">来源</text>
-									<picker :value="sourceIndex" :range="sourceOptions" @change="onSourceChange">
-										<view class="popup_filter_picker">{{ sourceOptions[sourceIndex] }}</view>
-									</picker>
-								</view>
-							</view>
-
-							<view class="popup_filter_row" v-if="sourceIndex === 1">
-								<view class="popup_filter_item full_width">
-									<text class="popup_filter_label">来源渠道</text>
-									<input class="popup_filter_input" placeholder="来源渠道" v-model="searchForm.source_channel" />
-								</view>
-							</view>
-						</view>
-
-						<!-- 第二筛选区域 -->
-						<view class="popup_filter_section">
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">课程检索</text>
-									<input class="popup_filter_input" placeholder="课程检索" v-model="searchForm.course_search" />
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">到课类型</text>
-									<picker :value="attendanceIndex" :range="attendanceOptions" @change="onAttendanceChange">
-										<view class="popup_filter_picker">{{ attendanceOptions[attendanceIndex] }}</view>
-									</picker>
-								</view>
-							</view>
-
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">成交类型</text>
-									<picker :value="dealIndex" :range="dealOptions" @change="onDealChange">
-										<view class="popup_filter_picker">{{ dealOptions[dealIndex] }}</view>
-									</picker>
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">资源有效类型</text>
-									<picker :value="validIndex" :range="validOptions" @change="onValidChange">
-										<view class="popup_filter_picker">{{ validOptions[validIndex] }}</view>
-									</picker>
-								</view>
-							</view>
-
-							<view class="popup_filter_row">
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">沟通情况</text>
-									<picker :value="communicationIndex" :range="communicationOptions" @change="onCommunicationChange">
-										<view class="popup_filter_picker">{{ communicationOptions[communicationIndex] }}</view>
-									</picker>
-								</view>
-								<view class="popup_filter_item">
-									<text class="popup_filter_label">时间</text>
-									<view class="popup_filter_input" @click="openDatePicker">
-										{{ searchForm.time_range || '开始时间-结束时间' }}
-									</view>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-
-					<view class="popup_filter_buttons">
-						<view class="popup_filter_btn reset_btn" @click="resetSearchOnly">重置</view>
-						<view class="popup_filter_btn search_btn" @click="searchDataAndClose">搜索</view>
-						<view class="popup_filter_btn close_btn" @click="closeSearchPopup">关闭</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!--下拉选择器-->
-		<fui-select :show="select_show" :options="select_options" title="请选择员工" @confirm="getSales"
-			@close="closeAssign"></fui-select>
-
-		<!--    时间范围选择器-->
-		<fui-date-picker range :show="date_picker_show" type="3" @change="changeDatePicker" :value="selectedDate"
-			@cancel="cancelDatePicker" :z-index="1500"></fui-date-picker>
-
-		<!--    我的客户搜索条件栏目-->
-		<fui-drawer :show="showDrawer" direction="left" :maskClosable="true">
-			<view class="fui-scroll__view">
-				<view class="fui-title">筛选</view>
-				<scroll-view scroll-y style="height: 720rpx;">
-					<view class="drawer_box">
-
-						<fui-list-cell>
-							<view class="item">
-								<view class="title">校区筛选</view>
-								<view class="input_box">
-									<fui-input :clearable="true" borderTop placeholder="校区筛选"
-										v-model="showDrawerForm.campus_name"></fui-input>
-								</view>
-							</view>
-						</fui-list-cell>
-
-
-						<fui-list-cell>
-							<view class="item">
-								<view class="title">时间筛选</view>
-								<view class="input_box">
-									<fui-input :clearable="true" borderTop placeholder="开始时间-结束时间"
-										@click="openDatePicker" v-model="showDrawerForm.shared_at_str"></fui-input>
-								</view>
-							</view>
-						</fui-list-cell>
-
-						<fui-list-cell>
-							<view class="item">
-								<view class="title">姓名筛选</view>
-								<view class="input_box">
-									<fui-input :clearable="true" borderTop placeholder="姓名筛选"
-										v-model="showDrawerForm.name"></fui-input>
-								</view>
-							</view>
-						</fui-list-cell>
-
-						<fui-list-cell>
-							<view class="item">
-								<view class="title">电话筛选</view>
-								<view class="input_box">
-									<fui-input :clearable="true" borderTop placeholder="电话筛选"
-										v-model="showDrawerForm.phone_number"></fui-input>
-								</view>
-							</view>
-						</fui-list-cell>
-					</view>
-				</scroll-view>
-				<view class="fui-btn__box">
-					<view class="button clientbtn" @click="searchData()">搜索</view>
-					<view class="button clientbtn" @click="closeShowDrawer()">关闭</view>
-				</view>
-			</view>
-		</fui-drawer>
-
-		<view style="height: 170rpx;"></view>
-	</view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js';
-	export default {
-		data() {
-			return {
-				loading: false, //加载状态
-				lowerThreshold: 100, //距离底部多远触发
-				isReachedBottom: false, //防止重复加载|true=不可加载|false=可加载
-				selectedDate: this.getCurrentDate(), // 初始化当前日期
-
-				// 新增筛选相关数据
-				showSearchPopup: false, // 搜索弹窗是否显示
-				tempHideSearchPopup: false, // 临时隐藏搜索弹窗的状态
-				searchForm: {
-					campus_name: '',
-					name: '',
-					phone_number: '',
-					source: '',
-					source_channel: '',
-					course_search: '',
-					attendance_type: '',
-					deal_type: '',
-					valid_type: '',
-					communication_status: '',
-					time_range: ''
-				},
-
-				// 选择器相关
-				sourceIndex: 0,
-				sourceOptions: ['全部', '线上', '线下'],
-				attendanceIndex: 0,
-				attendanceOptions: ['全部', '一访未到', '一访已到', '二访未到', '二访已到', '未到访'],
-				dealIndex: 0,
-				dealOptions: ['全部', '已成交', '未成交'],
-				validIndex: 0,
-				validOptions: ['全部', '有效', '无效'],
-				communicationIndex: 0,
-				communicationOptions: ['全部', '已沟通', '未沟通'],
-				//筛选条件
-				filteredData: {
-					page: 1, //当前页码
-					limit: 10, //每页返回数据条数
-					total: 10, //数据总条数
-					type: '0', //0=全部,1=待跟进,2=7天,3=30天
-					is_gh: '2', //1=资源分配,2=我的客户
-				},
-
-				//顶部Tab栏
-				values: [{
-						id: 1,
-						name: '我的客户'
-					},
-					// {
-					//   id: 2,
-					//   name: '资源分配'
-					// }
-				],
-				segmented_type: 1, //当前选中的Tab栏目|1=我的客户,2=资源分配
-
-				userInfo: {}, //用户信息
-				//我的客户列表相关
-				//筛选条件
-				filteredData_1: {
-					page: 1, //当前页码
-					limit: 10, //每页返回数据条数
-					total: 10, //数据总条数
-					shared_by: '', //共享人ID|0=未分配
-					shared_at_str: '', //共享时间|开始时间(Y-m-d)-结束时间(Y-m-d)
-					shared_at_arr: [], //时间范围数组格式
-					phone_number: '', //客户资源表-手机号
-					name: '', //客户资源表-用户姓名
-					campus_name: '', //校区名称
-					source: '', //来源
-					source_channel: '', //来源渠道
-					attendance_type: '', //到课类型
-					deal_type: '', //成交类型
-					valid_type: '', //资源有效类型
-				},
-				//数据列表
-				tableList_1: [], //表格数据
-
-				//资源分配列表相关
-				//筛选条件
-				filteredData_2: {
-					page: 1, //当前页码
-					limit: 10, //每页返回数据条数
-					total: 10, //数据总条数
-					shared_by: '0', //共享人ID|0=未分配
-					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					phone_number: '', //客户资源表-手机号
-					name: '', //客户资源表-用户姓名
-					campus_name: '',
-				},
-				//数据列表
-				tableList_2: [], //表格数据
-
-				// 批量操作相关
-				batchMode: false, // 是否进入批量操作模式
-				selectedItems: [], // 已选择的资源ID列表
-				isAllSelected: false, // 是否全选
-
-				//员工select选择器
-				select_show: false, //是否展示选择器
-				select_item: {}, //当前选中的选项
-				select_options: [
-					// {
-					//   text: '张三',
-					//   value: '1',
-					// }
-				], //选择器可选项
-
-				//时间选择器相关
-				date_picker_show: false, //是否展示时间选择器
-
-				//抽屉搜索条件展示窗相关
-				showDrawer: false, //是否展示|false=否
-				showDrawerForm: {
-					campus_name: '',
-					shared_at_str: '', //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					phone_number: '', //客户资源表-手机号
-					name: '', //客户资源表-用户姓名
-				},
-
-
-			}
-		},
-		onLoad(options) {},
-		onShow() {
-			this.init() //初始化
-		},
-		//下拉刷新
-		async onPullDownRefresh() {
-			//重置为第一页
-			if (this.segmented_type == 1) {
-				//我的客户
-				await this.resetFilteredData_1()
-				await this.getList_1()
-			} else {
-				//资源分配
-				await this.resetFilteredData_2()
-				await this.getList_2()
-			}
-
-
-		},
-		methods: {
-			getCurrentDate() {
-				const now = new Date();
-				const year = now.getFullYear();
-				const month = String(now.getMonth() + 1).padStart(2, '0');
-				const day = String(now.getDate()).padStart(2, '0');
-				return `${year}-${month}-${day}`; // 示例：2024-04-15
-			},
-			//初始化
-			async init() {
-				await this.getUserInfo();
-				if (this.segmented_type == 1) {
-					await this.getList_1();
-				} else {
-					await this.getList_2();
-				}
-			},
-
-			//获取用户信息
-			async getUserInfo() {
-				let res = await apiRoute.getPersonnelInfo({})
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-
-				this.userInfo = res.data
-
-				this.filteredData_1.shared_by = this.userInfo.id //共享人ID始终是当前登录的员工
-
-				//判断用户是不是销售经理,是就展示"资源分配"
-				if (this.userInfo.role_key_arr.includes('market_manager')) {
-					this.values = [{
-							id: 1,
-							name: '我的客户'
-						},
-						{
-							id: 2,
-							name: '资源分配'
-						}
-					]
-					//是经理的情况下,获取这个校区的全部用户(身份是销售的)
-					// await this.getPersonnelAll();
-				} else {
-					this.values = [{
-						id: 1,
-						name: '我的客户'
-					}, ]
-				}
-			},
-
-
-			//获取全部员工
-			async getPersonnelAll(campus = '') {
-				let res = await apiRoute.common_getPersonnelAll({
-					personnel_id: this.userInfo.id, //客户id
-					account_type: 'market', //账号类型|teacher=老师,market=销售
-					campus: campus
-				})
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-
-				let arr = []
-				res.data.forEach((v, k) => {
-					arr.push({
-						text: v.name,
-						value: v.id,
-					})
-				})
-				this.select_options = arr
-				console.log('员工', this.select_options)
-			},
-
-			//获取列表-我的客户相关
-			//加载更多(下一页)
-			loadMoreData_1() {
-				//判断是否加载
-				if (!this.isReachedBottom) {
-					this.isReachedBottom = true; //设置为不可请求状态
-					this.getList_1();
-				}
-			},
-			//重置为第一页
-			async resetFilteredData_1() {
-				this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-
-				this.filteredData_1.page = 1 //当前页码
-				this.filteredData_1.limit = 10 //每页返回数据条数
-				this.filteredData_1.total = 10 //数据总条数
-			},
-			//获取列表-我的客户
-			async getList_1() {
-				this.loading = true
-
-				let data = {
-					...this.filteredData_1
-				}
-
-				//判断是否还有数据
-				if (this.filteredData_1.page * this.filteredData_1.limit > this.filteredData_1.total) {
-					this.loading = false
-					return
-				}
-
-				this.filteredData_1.shared_by = this.userInfo.id //共享人ID始终是当前登录的员工
-
-				if (data.page == 1) {
-					this.tableList_1 = []
-				}
-
-				let res = await apiRoute.xs_resourceSharingIndex(data)
-				this.loading = false
-				this.isReachedBottom = false;
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-
-				this.tableList_1 = this.tableList_1.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-				console.log('列表1', this.tableList_1)
-				this.filteredData_1.total = res.data.total
-				this.filteredData_1.page++
-
-			},
-
-			//获取列表-资源分配相关
-			//加载更多(下一页)
-			loadMoreData_2() {
-				//判断是否加载
-				if (!this.isReachedBottom) {
-					this.isReachedBottom = true; //设置为不可请求状态
-					this.getList_2();
-				}
-			},
-			//重置为第一页
-			async resetFilteredData_2() {
-				this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-				this.filteredData_2.page = 1 //当前页码
-				this.filteredData_2.limit = 10 //每页返回数据条数
-				this.filteredData_2.total = 10 //数据总条数
-			},
-			//获取列表-资源分配
-			async getList_2() {
-				this.loading = true
-
-				let data = {
-					...this.filteredData_2
-				}
-
-				//判断是否还有数据
-				if (this.filteredData_2.page * this.filteredData_2.limit > this.filteredData_2.total) {
-					this.loading = false
-					return
-				}
-
-				if (data.page == 1) {
-					this.tableList_2 = []
-				}
-
-				let res = await apiRoute.xs_resourceSharingIndex(data)
-				this.loading = false
-				this.isReachedBottom = false;
-				if (res.code != 1) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-
-				console.log(123123, res)
-
-				this.tableList_2 = this.tableList_2.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-				console.log('列表2', this.tableList_2)
-				this.filteredData_2.total = res.data.total
-				this.filteredData_2.page++
-			},
-
-
-			//切换tag列表
-			async segmented(param) {
-				this.segmented_type = param.id //1=我的客户,2=资源分配
-
-				//重置筛选抽屉中的表单数据
-				this.showDrawerForm.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-				this.showDrawerForm.phone_number = '' //客户资源表-手机号
-				this.showDrawerForm.name = '' //客户资源表-用户姓名
-				this.campus_name = ''
-				if (this.segmented_type == 1) {
-					this.filteredData_1.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					this.filteredData_1.phone_number = '' //客户资源表-手机号
-					this.filteredData_1.name = '' //客户资源表-用户姓名
-					this.filteredData_1.campus_name = ''
-
-					//我的客户
-					//重置为第一页
-					await this.resetFilteredData_1()
-					await this.getList_1()
-				} else {
-					this.filteredData_2.shared_at_str = '' //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					this.filteredData_2.phone_number = '' //客户资源表-手机号
-					this.filteredData_2.name = '' //客户资源表-用户姓名
-					this.filteredData_2.campus_name = ''
-					//资源分配
-					//重置为第一页
-					await this.resetFilteredData_2()
-					await this.getList_2()
-				}
-
-			},
-
-			//跳转页面-我的消息
-			openViewMyMessage(item) {
-				let from_id = this.userInfo.id //发送者的id
-				let to_id = item.customerResource.id //接收者ID
-				uni.navigateTo({
-					url: `/pages-common/im_chat_info?from_id=${from_id}&to_id=${to_id}`
-				})
-			},
-
-			//拨打电话
-			async dialTel(item) {
-
-				let tel = item.customerResource.phone_number
-
-				if (!tel) {
-					uni.showToast({
-						title: '电话号码为空',
-						icon: 'none'
-					});
-					return;
-				}
-
-				uni.makePhoneCall({
-					phoneNumber: tel,
-					success: () => {
-						let param = {
-							staff_id: this.userInfo.id, //员工id
-							resource_id: item.customerResource.id, //资源ID
-							resource_type: '', //资源类型（如设备、文件、系统等）
-							communication_type: 'phone', //沟通类型: phone-电话, email-邮件, meeting-会议, other-其他
-							communication_result: 'success', //沟通结果: success-成功, failure-失败, pending-待定
-							remarks: null, //备注
-							tag: null, //标签
-						}
-						apiRoute.xs_communicationRecordsAdd(param).then(ressuccess=>{
-							if(ressuccess.code != 1){
-								uni.showToast({
-									title: res.msg,
-									icon: 'none'
-								})
-							}
-						})
-					}
-				})
-			},
-
-			//客户详情
-			clue_info(item) {
-				let resource_sharing_id = item.id ///共享资源表id
-				uni.navigateTo({
-					url: `/pages-market/clue/clue_info?resource_sharing_id=${resource_sharing_id}`
-				})
-			},
-
-			//公海-分配客户给员工相关
-			//打开分配列表
-			openAssign(item) {
-				console.log(item)
-				this.getPersonnelAll(item.customerResource.campus)
-				this.select_item = item
-				this.select_show = true
-			},
-			//关闭分配列表
-			closeAssign(item) {
-				this.select_item = {}
-				this.select_show = false
-				this.select_options = this.select_options.map(v => ({
-					...v,
-					checked: false
-				}));
-			},
-			//公海-分配客户给员工（支持单个和批量）
-			async getSales(e) {
-				let select_item = {
-					...this.select_item
-				}
-				console.log('选中', e, select_item)
-				this.closeAssign() //关闭选择窗
-
-				// 检查是否为批量操作
-				if (select_item.isBatch && select_item.selectedIds) {
-					// 批量分配
-					await this.batchAssignResources(select_item.selectedIds, e.options.value)
-				} else {
-					// 单个分配
-					let param = {
-						resource_sharing_id: select_item.id, //共享资源表id
-						shared_by: e.options.value, //分给员工的id
-					}
-					let res = await apiRoute.xs_resourceSharingAssign(param)
-					if (res.code != 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						return
-					}
-					uni.showToast({
-						title: res.msg,
-						icon: 'success'
-					})
-					//延迟1s执行
-					setTimeout(() => {
-						let param = {
-							id: 2,
-							index: 1,
-							name: "资源分配",
-						}
-						this.segmented(param)
-					}, 1000)
-				}
-			},
-
-			// 批量分配资源
-			async batchAssignResources(selectedIds, assigneeId) {
-				let successCount = 0
-				let failCount = 0
-
-				for (let resourceId of selectedIds) {
-					try {
-						let param = {
-							resource_sharing_id: resourceId,
-							shared_by: assigneeId
-						}
-						let res = await apiRoute.xs_resourceSharingAssign(param)
-						if (res.code == 1) {
-							successCount++
-						} else {
-							failCount++
-						}
-					} catch (error) {
-						failCount++
-					}
-				}
-
-				// 显示批量操作结果
-				if (failCount === 0) {
-					uni.showToast({
-						title: `成功分配 ${successCount} 个资源`,
-						icon: 'success'
-					})
-				} else {
-					uni.showToast({
-						title: `成功分配 ${successCount} 个，失败 ${failCount} 个`,
-						icon: 'none'
-					})
-				}
-
-				// 退出批量模式并刷新列表
-				this.exitBatchMode()
-				setTimeout(() => {
-					let param = {
-						id: 2,
-						index: 1,
-						name: "资源分配",
-					}
-					this.segmented(param)
-				}, 1000)
-			},
-
-			//时间选择器相关
-			//监听-时间选择器结果
-			changeDatePicker(e) {
-				console.log('时间', e)
-				let time_range = `${e.startDate.result} ~ ${e.endDate.result}`
-				this.searchForm.time_range = time_range
-				this.showDrawerForm.shared_at_str = time_range
-				this.cancelDatePicker()
-			},
-			//打开时间选择器
-			openDatePicker() {
-				console.log('打开时间选择器')
-				this.date_picker_show = true
-				// 临时隐藏搜索弹窗，避免层级冲突
-				this.tempHideSearchPopup = this.showSearchPopup
-				this.showSearchPopup = false
-			},
-			//关闭时间选择
-			cancelDatePicker() {
-				this.date_picker_show = false
-				// 恢复搜索弹窗显示状态
-				if (this.tempHideSearchPopup) {
-					this.showSearchPopup = true
-					this.tempHideSearchPopup = false
-				}
-			},
-
-			//检索数据
-			async searchData() {
-				if (this.segmented_type == 1) {
-					this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					this.filteredData_1.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
-					this.filteredData_1.name = this.showDrawerForm.name //客户资源表-用户姓名
-					this.filteredData_1.campus_name = this.showDrawerForm.campus_name //客户资源表-用户姓名
-					//我的客户
-					await this.resetFilteredData_1()
-					await this.getList_1()
-				} else {
-					this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str //共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
-					this.filteredData_2.phone_number = this.showDrawerForm.phone_number //客户资源表-手机号
-					this.filteredData_2.name = this.showDrawerForm.name //客户资源表-用户姓名
-					this.filteredData_2.campus_name = this.showDrawerForm.campus_name //客户资源表-用户姓名
-					//资源分配
-					await this.resetFilteredData_2()
-					await this.getList_2()
-				}
-				this.closeShowDrawer()
-			},
-
-			//打开抽屉筛选弹窗
-			openShowDrawer() {
-				this.showDrawer = true
-			},
-			//关闭抽屉筛选弹窗
-			closeShowDrawer() {
-				this.showDrawer = false
-			},
-
-			// 新增筛选方法
-			// 打开搜索弹窗
-			openSearchPopup() {
-				console.log('打开搜索弹窗', this.showSearchPopup)
-				this.showSearchPopup = true
-				console.log('设置后的状态', this.showSearchPopup)
-			},
-
-			// 搜索并关闭弹窗
-			searchDataAndClose() {
-				console.log('执行搜索，表单数据:', this.searchForm)
-				this.searchDataFromPopup()
-				this.showSearchPopup = false
-			},
-
-			// 从弹窗搜索数据
-			async searchDataFromPopup() {
-				// 根据当前标签页选择对应的筛选数据对象
-				const currentFilterData = this.segmented_type == 1 ? this.filteredData_1 : this.filteredData_2
-
-				// 将弹窗搜索表单数据映射到筛选数据
-				currentFilterData.campus_name = this.searchForm.campus_name
-				currentFilterData.name = this.searchForm.name
-				currentFilterData.phone_number = this.searchForm.phone_number
-
-				// 处理时间范围：转换为后端需要的shared_at_arr格式
-				if (this.searchForm.time_range && this.searchForm.time_range.includes(' ~ ')) {
-					const timeArray = this.searchForm.time_range.split(' ~ ')
-					currentFilterData.shared_at_arr = timeArray
-					currentFilterData.shared_at_str = this.searchForm.time_range
-				} else {
-					currentFilterData.shared_at_arr = []
-					currentFilterData.shared_at_str = ''
-				}
-
-				// 处理其他搜索条件（如果后端支持）
-				if (this.searchForm.source && this.searchForm.source !== '全部') {
-					currentFilterData.source = this.searchForm.source
-				}
-				if (this.searchForm.source_channel) {
-					currentFilterData.source_channel = this.searchForm.source_channel
-				}
-				if (this.searchForm.attendance_type && this.searchForm.attendance_type !== '全部') {
-					currentFilterData.attendance_type = this.searchForm.attendance_type
-				}
-				if (this.searchForm.deal_type && this.searchForm.deal_type !== '全部') {
-					currentFilterData.deal_type = this.searchForm.deal_type
-				}
-				if (this.searchForm.valid_type && this.searchForm.valid_type !== '全部') {
-					currentFilterData.valid_type = this.searchForm.valid_type
-				}
-
-				console.log('映射后的筛选数据:', currentFilterData)
-
-				// 根据当前标签页重置数据并获取列表
-				if (this.segmented_type == 1) {
-					// 我的客户
-					await this.resetFilteredData_1()
-					await this.getList_1()
-				} else {
-					// 资源分配
-					await this.resetFilteredData_2()
-					await this.getList_2()
-				}
-			},
-
-			// 重置搜索并关闭弹窗
-			resetSearchAndClose() {
-				this.resetSearch()
-				this.showSearchPopup = false
-			},
-
-			// 仅重置搜索（不关闭弹窗）
-			resetSearchOnly() {
-				this.resetSearch()
-			},
-
-			// 关闭搜索弹窗
-			closeSearchPopup() {
-				this.showSearchPopup = false
-			},
-
-			// 来源选择器变化
-			onSourceChange(e) {
-				this.sourceIndex = e.detail.value
-				this.searchForm.source = this.sourceOptions[this.sourceIndex]
-				// 如果不是线上，清空来源渠道
-				if (this.sourceIndex !== 1) {
-					this.searchForm.source_channel = ''
-				}
-			},
-
-			// 到课类型选择器变化
-			onAttendanceChange(e) {
-				this.attendanceIndex = e.detail.value
-				this.searchForm.attendance_type = this.attendanceOptions[this.attendanceIndex]
-			},
-
-			// 成交类型选择器变化
-			onDealChange(e) {
-				this.dealIndex = e.detail.value
-				this.searchForm.deal_type = this.dealOptions[this.dealIndex]
-			},
-
-			// 资源有效类型选择器变化
-			onValidChange(e) {
-				this.validIndex = e.detail.value
-				this.searchForm.valid_type = this.validOptions[this.validIndex]
-			},
-
-			// 沟通情况选择器变化
-			onCommunicationChange(e) {
-				this.communicationIndex = e.detail.value
-				this.searchForm.communication_status = this.communicationOptions[this.communicationIndex]
-			},
-
-			// 重置搜索
-			async resetSearch() {
-				this.searchForm = {
-					campus_name: '',
-					name: '',
-					phone_number: '',
-					source: '',
-					source_channel: '',
-					course_search: '',
-					attendance_type: '',
-					deal_type: '',
-					valid_type: '',
-					communication_status: '',
-					time_range: ''
-				}
-				this.sourceIndex = 0
-				this.attendanceIndex = 0
-				this.dealIndex = 0
-				this.validIndex = 0
-				this.communicationIndex = 0
-
-				// 重置当前标签页的筛选数据
-				if (this.segmented_type == 1) {
-					// 我的客户
-					await this.resetFilteredData_1()
-					await this.getList_1()
-				} else {
-					// 资源分配
-					await this.resetFilteredData_2()
-					await this.getList_2()
-				}
-			},
-
-			// 获取开单状态样式类
-			getOrderStatusClass(status) {
-				return status === '已开单' ? 'status-closed' : 'status-open'
-			},
-
-			// 获取到访状态样式类
-			getVisitStatusClass(status) {
-				return status === '已到' ? 'visit-arrived' : 'visit-not-arrived'
-			},
-
-			// 批量操作相关方法
-			// 进入批量操作模式
-			enterBatchMode() {
-				this.batchMode = true
-				this.selectedItems = []
-				this.isAllSelected = false
-			},
-
-			// 退出批量操作模式
-			exitBatchMode() {
-				this.batchMode = false
-				this.selectedItems = []
-				this.isAllSelected = false
-			},
-
-			// 切换单个项目的选择状态
-			toggleItemSelection(item) {
-				const index = this.selectedItems.indexOf(item.id)
-				if (index > -1) {
-					this.selectedItems.splice(index, 1)
-				} else {
-					this.selectedItems.push(item.id)
-				}
-				this.updateAllSelectedState()
-			},
-
-			// 切换全选状态
-			toggleSelectAll() {
-				if (this.isAllSelected) {
-					this.selectedItems = []
-					this.isAllSelected = false
-				} else {
-					this.selectedItems = this.tableList_2.map(item => item.id)
-					this.isAllSelected = true
-				}
-			},
-
-			// 更新全选状态
-			updateAllSelectedState() {
-				this.isAllSelected = this.selectedItems.length === this.tableList_2.length && this.tableList_2.length > 0
-			},
-
-			// 批量分配
-			batchAssign() {
-				if (this.selectedItems.length === 0) {
-					uni.showToast({
-						title: '请先选择要分配的资源',
-						icon: 'none'
-					})
-					return
-				}
-				// 获取第一个选择项目的校区信息用于获取员工列表
-				const firstSelectedItem = this.tableList_2.find(item => this.selectedItems.includes(item.id))
-				if (firstSelectedItem) {
-					this.getPersonnelAll(firstSelectedItem.customerResource.campus)
-					this.select_item = { isBatch: true, selectedIds: this.selectedItems }
-					this.select_show = true
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	.assemble {
-		width: 100%;
-		height: 100vh;
-		background-color: #292929;
-		overflow: auto;
-
-		.search_section {
-			margin-top: 20rpx;
-			padding: 10rpx 20rpx;
-			display: flex;
-			flex-direction: column;
-
-			.item {
-				height: 60rpx;
-				display: flex;
-				justify-content: center;
-
-				.input_box {
-					width: 75%;
-
-					.input_box_text {
-						height: 60rpx;
-						line-height: 60rpx;
-						background-color: #fff;
-						padding-left: 20rpx;
-						color: #cccccc;
-						font-size: 28rpx;
-					}
-				}
-			}
-		}
-	}
-
-	// 搜索弹窗样式
-	.search_popup_mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.6);
-		z-index: 999;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.search_popup_content {
-		background: #fff;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-		animation: slideDown 0.3s ease-out;
-		width: 100%;
-		max-height: 80vh;
-		overflow: hidden;
-		display: flex;
-		flex-direction: column;
-	}
-
-	@keyframes slideDown {
-		from {
-			transform: translateY(-100%);
-		}
-		to {
-			transform: translateY(0);
-		}
-	}
-
-	// 弹窗搜索内容样式
-	.popup_search_content {
-		padding: 0;
-		background: #fff;
-		min-height: 60vh;
-		max-height: 80vh;
-		display: flex;
-		flex-direction: column;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-		overflow: hidden;
-	}
-
-	.popup_header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 32rpx;
-		border-bottom: 1px solid #f0f0f0;
-	}
-
-	.popup_title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.popup_close {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.close_text {
-			font-size: 32rpx;
-			color: #999;
-		}
-	}
-
-	.popup_scroll_view {
-		flex: 1;
-		padding: 32rpx;
-		overflow-y: auto;
-	}
-
-	.popup_filter_section {
-		margin-bottom: 32rpx;
-
-		&:last-child {
-			margin-bottom: 0;
-		}
-	}
-
-	.popup_filter_row {
-		display: flex;
-		gap: 20rpx;
-		margin-bottom: 24rpx;
-
-		&:last-child {
-			margin-bottom: 0;
-		}
-	}
-
-	.popup_filter_item {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		gap: 12rpx;
-
-		&.full_width {
-			flex: 1;
-		}
-
-		.popup_filter_label {
-			font-size: 26rpx;
-			color: #666;
-			font-weight: 500;
-		}
-
-		.popup_filter_input {
-			height: 72rpx;
-			line-height: 72rpx;
-			padding: 0 16rpx;
-			border: 1px solid #ddd;
-			border-radius: 8rpx;
-			font-size: 28rpx;
-			color: #333;
-			background: #fff;
-
-			&::placeholder {
-				color: #999;
-			}
-		}
-
-		.popup_filter_picker {
-			height: 72rpx;
-			line-height: 72rpx;
-			padding: 0 16rpx;
-			border: 1px solid #ddd;
-			border-radius: 8rpx;
-			font-size: 28rpx;
-			color: #333;
-			background: #fff;
-			position: relative;
-
-			&::after {
-				content: '▼';
-				position: absolute;
-				right: 16rpx;
-				font-size: 20rpx;
-				color: #999;
-			}
-		}
-	}
-
-	.popup_filter_buttons {
-		display: flex;
-		gap: 20rpx;
-		padding: 32rpx;
-		margin-top: auto;
-		border-top: 1px solid #f0f0f0;
-		background: #fff;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-	}
-
-	.popup_filter_btn {
-		flex: 1;
-		height: 72rpx;
-		line-height: 72rpx;
-		text-align: center;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-
-		&.search_btn {
-			background: #29d3b4;
-			color: #fff;
-		}
-
-		&.reset_btn {
-			background: #f5f5f5;
-			color: #666;
-			border: 1px solid #ddd;
-		}
-
-		&.close_btn {
-			background: #666;
-			color: #fff;
-		}
-	}
-
-	.search {
-		width: 92%;
-		margin: auto;
-		display: flex;
-		margin-top: 20rpx;
-	}
-
-	.selected {
-		background: #294e48;
-		border-radius: 16rpx;
-		padding: 12rpx 8rpx;
-		text-align: center;
-		color: #29d3b4;
-		margin-left: 5rpx;
-	}
-
-	.not-selected {
-		margin-left: 5rpx;
-		background: #ffffff;
-		border: 4rpx #959595 solid;
-		border-radius: 16rpx;
-		padding: 12rpx 8rpx;
-		text-align: center;
-	}
-
-	.card {
-		width: 92%;
-		margin: 8rpx auto;
-		background: #434544;
-		border-radius: 16rpx;
-		display: flex;
-		flex-direction: column;
-
-		.card-content {
-			display: flex;
-			justify-content: space-between;
-
-			.card-left {
-				flex: 1;
-				padding-right: 10rpx;
-			}
-
-			.card-right {
-				min-width: 120rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: flex-start;
-				padding: 12rpx;
-
-				// 开单状态标签
-				.status-tag {
-					font-size: 20rpx;
-					padding: 8rpx 16rpx;
-					border-radius: 16rpx;
-					color: #fff;
-					margin-bottom: 8rpx;
-					text-align: center;
-					min-width: 60rpx;
-
-					&.status-closed {
-						background-color: #52c41a; // 绿色-已开单
-					}
-
-					&.status-open {
-						background-color: #ff4d4f; // 红色-未开单
-					}
-				}
-
-				// 到访状态容器
-				.visit-status {
-					display: flex;
-					flex-direction: column;
-					gap: 6rpx;
-					margin-bottom: 12rpx;
-
-					.visit-tag {
-						font-size: 18rpx;
-						padding: 6rpx 12rpx;
-						border-radius: 12rpx;
-						color: #fff;
-						text-align: center;
-						min-width: 60rpx;
-
-						&.visit-arrived {
-							background-color: #1890ff; // 蓝色-已到
-						}
-
-						&.visit-not-arrived {
-							background-color: #8c8c8c; // 灰色-未到
-						}
-					}
-				}
-
-				.btn-item {
-					margin-bottom: 12rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 80rpx;
-					height: 80rpx;
-					background-color: rgba(255, 255, 255, 0.1);
-					border-radius: 50%;
-
-					&:last-child {
-						margin-bottom: 0;
-					}
-
-					.image {
-						width: 60rpx;
-						height: 60rpx;
-					}
-				}
-			}
-		}
-
-		.card-footer {
-			width: 100%;
-			border-top: 1rpx solid rgba(255, 255, 255, 0.1);
-			padding: 12rpx;
-			box-sizing: border-box;
-			background-color: rgba(0, 0, 0, 0.1);
-			border-radius: 0 0 16rpx 16rpx;
-		}
-	}
-
-	.card-image {
-		width: 60rpx;
-		height: 60rpx;
-	}
-
-	.card-text {
-		font-size: 32rpx;
-		padding-left: 16rpx;
-		color: #fff;
-	}
-
-	.card-label {
-		margin-left: 30rpx;
-		background: #76575a;
-		width: 130rpx;
-		padding: 8rpx 20rpx;
-		color: #c9595a;
-		text-align: center;
-		border-radius: 0 50rpx 50rpx 40rpx;
-	}
-
-	.card-con {
-		font-size: 30rpx;
-		padding: 8rpx 10rpx 8rpx 16rpx;
-		color: #fff;
-	}
-
-	.card-con-span {
-		font-size: 24rpx;
-		color: #a47332;
-		padding-left: 12rpx;
-	}
-
-	.drop-image-x {
-		width: 20rpx;
-		height: 20rpx;
-	}
-
-	.title-x {
-		font-size: 28rpx;
-		color: #fff;
-		padding-left: 10rpx;
-	}
-
-	.card-date {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.image {
-		width: 60rpx;
-		height: 60rpx;
-	}
-
-	.neck {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: #f59a23;
-		color: #fff;
-		line-height: 60rpx;
-		text-align: center;
-	}
-
-	//领取按钮
-	.ling {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 10rpx;
-		color: #fff;
-		width: 100rpx;
-		padding: 10rpx 0;
-		background-color: #F59A23;
-	}
-
-	//抽屉搜索栏
-	.fui-scroll__view {
-		margin-top: 60rpx;
-		width: 520rpx;
-		flex: 1;
-		overflow: hidden;
-
-		.fui-title {
-			padding: 40rpx 32rpx;
-			padding-bottom: 20rpx;
-			box-sizing: border-box;
-			font-weight: bold;
-		}
-
-		.drawer_box {
-			.item {
-				display: flex;
-				flex-direction: column;
-				gap: 15rpx;
-
-				.title {}
-
-				.input_box {
-					border: 1px solid #292929;
-					width: 450rpx;
-
-					::v-deep .fui-input__wrap {
-						padding: 10rpx !important;
-						height: 100%;
-					}
-				}
-			}
-		}
-
-		.fui-btn__box {
-			padding: 40rpx 0;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			gap: 30rpx;
-		}
-
-	}
-
-	.button {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 5rpx;
-		font-size: 24rpx;
-		color: #fff;
-		background-color: #29d3b4;
-		width: 20%;
-		height: 100%;
-
-
-	}
-
-	.clientbtn {
-		width: 200px;
-		height: 40px;
-		font-size: 16px;
-		border-radius: 5px;
-	}
-
-	/* 批量操作样式 - 优化为黑色主题 */
-	.batch_control_bar {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx 24rpx;
-		background: rgba(41, 41, 41, 0.95);
-		border-top: 1px solid #404040;
-		margin-top: 20rpx;
-		border-radius: 12rpx;
-		backdrop-filter: blur(10rpx);
-	}
-
-	.batch_actions_left {
-		display: flex;
-		align-items: center;
-		gap: 24rpx;
-	}
-
-	.batch_toggle_btn {
-		padding: 16rpx 32rpx;
-		border-radius: 24rpx;
-		font-size: 28rpx;
-		background: linear-gradient(135deg, #29d3b4, #26c3a4);
-		color: #fff;
-		box-shadow: 0 4rpx 12rpx rgba(41, 211, 180, 0.3);
-		transition: all 0.3s ease;
-
-		&.cancel {
-			background: linear-gradient(135deg, #666, #555);
-			box-shadow: 0 4rpx 12rpx rgba(102, 102, 102, 0.3);
-		}
-	}
-
-	.batch_select_all {
-		display: flex;
-		align-items: center;
-		gap: 12rpx;
-		padding: 8rpx 0;
-	}
-
-	.checkbox {
-		width: 36rpx;
-		height: 36rpx;
-		border: 2rpx solid #666;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 24rpx;
-		color: transparent;
-		background: #404040;
-		transition: all 0.3s ease;
-
-		&.checked {
-			background: linear-gradient(135deg, #29d3b4, #26c3a4);
-			border-color: #29d3b4;
-			color: #fff;
-			box-shadow: 0 2rpx 8rpx rgba(41, 211, 180, 0.4);
-		}
-	}
-
-	.select_all_text {
-		font-size: 28rpx;
-		color: #fff;
-		font-weight: 500;
-	}
-
-	.batch_actions_right {
-		display: flex;
-		align-items: center;
-	}
-
-	.batch_assign_btn {
-		padding: 16rpx 32rpx;
-		border-radius: 24rpx;
-		font-size: 28rpx;
-		background: linear-gradient(135deg, #ff6b35, #ff5722);
-		color: #fff;
-		box-shadow: 0 4rpx 12rpx rgba(255, 107, 53, 0.3);
-		font-weight: 600;
-		transition: all 0.3s ease;
-	}
-
-	.batch_checkbox {
-		margin-right: 20rpx;
-		padding: 8rpx;
-	}
-
-	/* 分配状态样式 */
-	.assigned-to {
-		font-weight: 600;
-
-		&.unassigned {
-			color: #ff6b35;
-		}
-
-		&.assigned {
-			color: #29d3b4;
-		}
-	}
-</style>
diff --git a/uniapp/pages/market/data/statistics.vue b/uniapp/pages/market/data/statistics.vue
deleted file mode 100644
index 4767e7b1..00000000
--- a/uniapp/pages/market/data/statistics.vue
+++ /dev/null
@@ -1,343 +0,0 @@
-<!--市场数据统计页面-->
-<template>
-  <view class="main_box" :class="{'has-safe-area': hasSafeArea}">
-    <!--自定义导航栏-->
-    <view class="navbar_section">
-      <view class="title">市场数据统计</view>
-    </view>
-
-    <!-- 顶部筛选 -->
-    <view class="filter-section">
-      <view class="filter-item">
-        <view class="label">统计时间：</view>
-        <picker mode="date" fields="month" :value="currentDate" @change="dateChange">
-          <view class="picker-value">{{currentDate}}</view>
-        </picker>
-      </view>
-    </view>
-
-    <!-- 市场人员资源量统计 -->
-    <view class="table-section">
-      <view class="table-title">市场人员资源量统计</view>
-      <view class="table-container">
-        <view class="table-header">
-          <view class="th th-person">人员</view>
-          <view class="th th-week">周数量</view>
-          <view class="th th-month">月数量</view>
-          <view class="th th-year">年数量</view>
-        </view>
-        <view class="table-body">
-          <view class="table-row" v-for="(item, index) in staffData" :key="index">
-            <view class="td td-person">{{item.name}}</view>
-            <view class="td td-week">{{item.weekCount}}</view>
-            <view class="td td-month">{{item.monthCount}}</view>
-            <view class="td td-year">{{item.yearCount}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 校区人员资源渠道量 -->
-    <view class="table-section">
-      <view class="table-title">{{currentMonth}}月 - 年度校区人员资源渠道量</view>
-      <view class="table-container">
-        <view class="table-header">
-          <view class="th th-channel" style="width: 100px;">渠道</view>
-          <view class="th" v-for="(school, index) in schoolList" :key="index">{{school.campus_name}}</view>
-          <view class="th th-total">渠道合计</view>
-        </view>
-        <view class="table-body">
-          <view class="table-row" v-for="(channel, index) in channelList" :key="index">
-            <view class="td td-channel" style="width: 100px;">{{channel.name}}</view>
-            <view class="td" v-for="(school, sIndex) in schoolList" :key="sIndex">
-              {{channel[school.id] || 0}}
-            </view>
-            <view class="td td-total">{{channel.total}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 市场人员资源渠道统计 -->
-    <view class="table-section">
-      <view class="table-title">{{currentMonth}}月 - 年度市场人员资源渠道统计</view>
-      <view class="table-container">
-        <view class="table-header">
-          <view class="th th-channel" style="width: 100px;">渠道</view>
-          <view class="th" v-for="(staff, index) in staffData" :key="index">市场{{staff.name}}</view>
-          <view class="th th-total">资源合计</view>
-        </view>
-        <view class="table-body">
-          <view class="table-row" v-for="(channel, index) in channelList" :key="index">
-            <view class="td td-channel" style="width: 100px;">{{channel.name}}</view>
-            <view class="td" v-for="(staff, sIndex) in staffData" :key="sIndex">
-              {{staff['channel'][channel.value] || 0}}
-            </view>
-            <view class="td td-total">{{channel.total}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    		<AQTabber />
-  </view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-import AQTabber from "@/components/AQ/AQTabber.vue"
-
-export default {
-  		components: {
-			AQTabber,
-		},
-  data() {
-    return {
-      currentDate: this.formatDate(new Date()),
-      currentMonth: new Date().getMonth() + 1,
-      // 市场人员资源量统计
-      staffData: [],
-      // 校区列表
-      schoolList: [],
-      // 是否有安全区域
-      hasSafeArea: false,
-      // 渠道列表
-      channelList: [],
-      // 市场人员列表
-      marketStaffList: [
-        { id: 'A', name: 'A' },
-        { id: 'B', name: 'B' },
-        { id: 'C', name: 'C' },
-        { id: 'D', name: 'D' }
-      ],
-      // 校区渠道数据
-      channelSchoolData: [],
-      // 人员渠道数据
-      channelStaffData: []
-    }
-  },
-  onLoad() {
-    this.initData();
-    this.checkSafeArea();
-  },
-  methods: {
-    // 格式化日期为 YYYY-MM
-    formatDate(date) {
-      const year = date.getFullYear();
-      const month = (date.getMonth() + 1).toString().padStart(2, '0');
-      return `${year}-${month}`;
-    },
-    
-    // 日期选择器变更
-    dateChange(e) {
-      this.currentDate = e.detail.value;
-      const [year, month] = this.currentDate.split('-');
-      this.currentMonth = parseInt(month);
-      this.initData();
-    },
-    
-    // 初始化数据
-    async initData() {
-      // 模拟获取数据，实际项目中应该调用API
-      await this.getStaffStatistics();
-      // await this.getChannelSchoolStatistics();
-      // this.getChannelStaffStatistics();
-    },
-    
-    // 获取人员资源量统计
-    async getStaffStatistics() {
-      // 模拟数据，实际项目中应该调用API
-      let res = await apiRoute.getStaffStatistics({date: this.currentDate})
-	  
-	  console.log(res.data.staffData,"================");
-      this.staffData = res.data.staffData
-	  this.schoolList = res.data.schoolList
-	  this.channelList = res.data.channelList
-	  
-    },
-    
-    // 获取校区渠道统计
-    getChannelSchoolStatistics() {
-      // 模拟数据，实际项目中应该调用API
-      this.channelSchoolData = this.channelList.map(channel => {
-        const schools = {};
-        let total = 0;
-        
-        this.schoolList.forEach(school => {
-          const count = Math.floor(Math.random() * 50);
-          schools[school.id] = count;
-          total += count;
-        });
-        
-        return {
-          id: channel.id,
-          name: channel.name,
-          schools,
-          total
-        }
-      });
-    },
-    
-    // 获取人员渠道统计
-    getChannelStaffStatistics() {
-      // 模拟数据，实际项目中应该调用API
-      this.channelStaffData = this.channelList.map(channel => {
-        const staffs = {};
-        let total = 0;
-        
-        this.marketStaffList.forEach(staff => {
-          const count = Math.floor(Math.random() * 40);
-          staffs[staff.id] = count;
-          total += count;
-        });
-        
-        return {
-          id: channel.id,
-          name: channel.name,
-          staffs,
-          total
-        }
-      });
-    },
-    
-    // 检测设备是否有安全区域
-    checkSafeArea() {
-      try {
-        const systemInfo = uni.getSystemInfoSync();
-        // 检测是否为iPhone X及以上机型或其他有安全区域的设备
-        if (systemInfo.safeAreaInsets && systemInfo.safeAreaInsets.bottom > 0) {
-          this.hasSafeArea = true;
-        }
-      } catch (e) {
-        console.error('获取系统信息失败', e);
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.main_box {
-  min-height: 100vh;
-  background-color: #1a1a1a;
-  color: #ffffff;
-  padding-bottom: 150rpx; /* 增加底部内边距，防止内容被底部导航栏遮挡 */
-}
-
-/* 适配有安全区域的设备（如iPhone X及以上机型） */
-.has-safe-area {
-  padding-bottom: calc(150rpx + constant(safe-area-inset-bottom)); /* iOS 11.0-11.2 */
-  padding-bottom: calc(150rpx + env(safe-area-inset-bottom)); /* iOS 11.2+ */
-}
-
-.navbar_section {
-  background-color: #1a1a1a;
-  height: 88rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  
-  .title {
-    font-size: 36rpx;
-    font-weight: bold;
-  }
-}
-
-.filter-section {
-  padding: 20rpx;
-  background-color: #222222;
-  margin: 20rpx;
-  border-radius: 10rpx;
-  
-  .filter-item {
-    display: flex;
-    align-items: center;
-    
-    .label {
-      font-size: 28rpx;
-      margin-right: 10rpx;
-    }
-    
-    .picker-value {
-      padding: 10rpx 20rpx;
-      background-color: #333333;
-      border-radius: 6rpx;
-      font-size: 28rpx;
-    }
-  }
-}
-
-.table-section {
-  margin: 30rpx 20rpx;
-  background-color: #222222;
-  border-radius: 10rpx;
-  overflow: hidden;
-  
-  .table-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    padding: 20rpx;
-    border-bottom: 1px solid #333333;
-  }
-  
-  .table-container {
-    width: 100%;
-    overflow-x: auto;
-  }
-  
-  .table-header {
-    display: flex;
-    background-color: #333333;
-    
-    .th {
-      padding: 15rpx 10rpx;
-      font-size: 26rpx;
-      text-align: center;
-      flex: 1;
-      min-width: 100rpx;
-      font-weight: bold;
-    }
-  }
-  
-  .table-body {
-    .table-row {
-      display: flex;
-      border-bottom: 1px solid #333333;
-      
-      &:last-child {
-        border-bottom: none;
-      }
-      
-      .td {
-        padding: 15rpx 10rpx;
-        font-size: 26rpx;
-        text-align: center;
-        flex: 1;
-        min-width: 100rpx;
-      }
-    }
-  }
-  
-  .th-person, .td-person {
-    min-width: 80rpx;
-    flex: 0.8;
-  }
-  
-  .th-week, .td-week,
-  .th-month, .td-month,
-  .th-year, .td-year {
-    flex: 1;
-  }
-  
-  .th-channel, .td-channel {
-    flex: 1.2;
-    text-align: left;
-    padding-left: 20rpx;
-  }
-  
-  .th-total, .td-total {
-    flex: 1.2;
-    font-weight: bold;
-  }
-}
-</style>
diff --git a/uniapp/pages/market/index/index.vue b/uniapp/pages/market/index/index.vue
deleted file mode 100644
index 0b355e81..00000000
--- a/uniapp/pages/market/index/index.vue
+++ /dev/null
@@ -1,427 +0,0 @@
-<template>
-	<view class="assemble">
-		<view style="height: 20rpx;"></view>
-		<!-- 时间筛选 -->
-		<view class="filter-section">
-			<picker mode="date" fields="month" :value="currentDate" @change="onDateChange">
-				<view class="date-picker">
-					<text>{{currentDate}}</text>
-					<image class="drop-image" :src="$util.img('/static/images/drop.png')" mode="aspectFit"></image>
-				</view>
-			</picker>
-		</view>
-		
-		<!-- 本月提成卡片 -->
-		<view class="commission-card">
-			<view class="card-title">本月提成</view>
-			<view class="commission-amount">¥{{totalCommission}}</view>
-		</view>
-		
-		<!-- 续费提成记录 -->
-		<view class="record-card">
-			<view class="card-title">续费提成</view>
-			<view class="table">
-				<view class="table-header">
-					<view class="th">时间</view>
-					<view class="th">到期数</view>
-					<view class="th">续费数</view>
-					<view class="th">续费率</view>
-					<view class="th">提成</view>
-				</view>
-				<view class="table-body">
-					<view class="tr" v-for="(item, index) in renewalRecords" :key="index">
-						<view class="td">{{item.time}}</view>
-						<view class="td">{{item.expireCount}}</view>
-						<view class="td">{{item.renewCount}}</view>
-						<view class="td">{{item.renewRate}}%</view>
-						<view class="td">¥{{item.commission}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 新招课包 -->
-		<view class="record-card">
-			<view class="card-title">新招课包</view>
-			<view class="table">
-				<view class="table-header">
-					<view class="th">成交数</view>
-					<view class="th">提成</view>
-					<view class="th">合计</view>
-				</view>
-				<view class="table-body">
-					<view class="tr">
-						<view class="td">{{newPackageCount}}</view>
-						<view class="td">¥{{newPackageCommission}}</view>
-						<view class="td">¥{{newPackageTotal}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 私教课包 -->
-		<view class="record-card">
-			<view class="card-title">私教课包</view>
-			<view class="table">
-				<view class="table-header">
-					<view class="th">数量</view>
-					<view class="th">提成</view>
-				</view>
-				<view class="table-body">
-					<view class="tr">
-						<view class="td">{{privatePackageCount}}</view>
-						<view class="td">¥{{privatePackageCommission}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 时间卡 -->
-		<view class="record-card">
-			<view class="card-title">时间卡</view>
-			<view class="table">
-				<view class="table-header">
-					<view class="th">时间卡</view>
-					<view class="th">数量</view>
-					<view class="th">提成</view>
-				</view>
-				<view class="table-body">
-					<view class="tr">
-						<view class="td">{{timeCardCount}}</view>
-						<view class="td">{{timeCardAmount}}</view>
-						<view class="td">¥{{timeCardCommission}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 其他提成 -->
-		<view class="record-card">
-			<view class="card-title">其他提成</view>
-			<view class="table">
-				<view class="table-header">
-					<view class="th">项目</view>
-					<view class="th">金额</view>
-				</view>
-				<view class="table-body">
-					<view class="tr" v-for="(item, index) in otherCommissions" :key="index">
-						<view class="td">{{item.project}}</view>
-						<view class="td">¥{{item.amount}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js'
-
-	export default {
-		data() {
-			return {
-				currentDate: this.formatDate(new Date()),
-				totalCommission: 0,
-				renewalRecords: [],
-				newPackageCount: 0,
-				newPackageCommission: 0,
-				newPackageTotal: 0,
-				privatePackageCount: 0,
-				privatePackageCommission: 0,
-				timeCardCount: 0,
-				timeCardAmount: 0,
-				timeCardCommission: 0,
-				otherCommissions: []
-			}
-		},
-		onShow() {
-			this.getStatisticsData()
-		},
-		methods: {
-			formatDate(date) {
-				const year = date.getFullYear()
-				const month = String(date.getMonth() + 1).padStart(2, '0')
-				return `${year}-${month}`
-			},
-			onDateChange(e) {
-				this.currentDate = e.detail.value
-				this.getStatisticsData()
-			},
-			async getStatisticsData() {
-				try {
-					const res = await apiRoute.xs_statisticsMarketData({
-						date: this.currentDate
-					})
-					if (res && res.code === 1) {
-						const data = res.data
-						this.totalCommission = data.totalCommission || 0
-						this.renewalRecords = data.renewalRecords || []
-						this.newPackageCount = data.newPackageCount || 0
-						this.newPackageCommission = data.newPackageCommission || 0
-						this.newPackageTotal = data.newPackageTotal || 0
-						this.privatePackageCount = data.privatePackageCount || 0
-						this.privatePackageCommission = data.privatePackageCommission || 0
-						this.timeCardCount = data.timeCardCount || 0
-						this.timeCardAmount = data.timeCardAmount || 0
-						this.timeCardCommission = data.timeCardCommission || 0
-						this.otherCommissions = data.otherCommissions || []
-					}
-				} catch (error) {
-					console.error('获取统计数据失败:', error)
-					uni.showToast({
-						title: '获取数据失败',
-						icon: 'none'
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	//自定义导航栏
-	.navbar_section {
-		border: 1px solid #23262F;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #23262F;
-		box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.18);
-
-		.title {
-			padding: 40rpx 0rpx;
-			// #ifdef MP-WEIXIN
-			padding: 80rpx 0rpx;
-			// #endif
-			font-size: 30rpx;
-			color: #F5F6FA;
-			font-weight: bold;
-			letter-spacing: 2rpx;
-		}
-	}
-
-	.assemble {
-		width: 100%;
-		min-height: 100vh;
-		background: #181A20;
-		padding-bottom: 100rpx;
-	}
-
-	.div-style {
-		width: 92%;
-		height: 85vh;
-		background: #fff;
-		border-radius: 16rpx;
-		margin: auto;
-	}
-
-	.coach-message {
-		width: 92%;
-		margin: 10rpx auto;
-		display: flex;
-		align-items: center;
-		padding-top: 20rpx;
-	}
-
-	.drop-image {
-		width: 50rpx;
-		height: 50rpx;
-		filter: brightness(0.8);
-	}
-
-	.title {
-		font-size: 30rpx;
-		color: #F5F6FA;
-		padding-left: 20rpx;
-	}
-
-	.left1 {
-		width: 48%;
-		height: 95%;
-		margin: auto;
-	}
-
-	.right1 {
-		width: 48%;
-		height: 95%;
-		margin: auto;
-
-		.statistics_box {
-			margin: auto;
-			margin-top: 10rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.item {
-				width: 90rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				.box {
-					width: 100%;
-					height: 328rpx;
-					border: 1px solid #ddd;
-					border-radius: 6rpx;
-					background: #f5f5f5;
-					position: relative;
-
-					.progress-bar {
-						width: 100%;
-						height: 0;
-						transition: height 0.3s ease;
-						position: absolute;
-						bottom: 0;
-					}
-
-					.ratio {
-						width: 100%;
-						position: absolute;
-						bottom: -0rpx;
-						font-size: 26rpx;
-						text-align: center;
-					}
-				}
-
-				.title {
-					margin-top: 5rpx;
-					padding: 0;
-					font-size: 26rpx;
-					color: #999999;
-					;
-					text-align: center;
-				}
-			}
-		}
-	}
-
-	.this_month {
-		width: 100%;
-		height: 95%;
-		margin: auto;
-	}
-
-	.drop-image-x {
-		width: 20rpx;
-		height: 20rpx;
-	}
-
-	.title-x {
-		font-size: 28rpx;
-		color: #7F7F7F;
-		padding-left: 20rpx;
-	}
-
-	.title-x1 {
-		font-size: 28rpx;
-		color: #333333;
-		padding-left: 60rpx;
-	}
-
-	.filter-section {
-		padding: 20rpx 30rpx;
-		background: #23262F;
-		margin-bottom: 20rpx;
-		border-radius: 12rpx;
-		box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.2);
-
-		.date-picker {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-size: 32rpx;
-			color: #F5F6FA;
-
-			.drop-image {
-				width: 30rpx;
-				height: 30rpx;
-				margin-left: 10rpx;
-				filter: brightness(0.8);
-			}
-		}
-	}
-	
-	.commission-card {
-		background: linear-gradient(135deg, #FF6B6B, #FF8E8E);
-		margin: 20rpx;
-		padding: 30rpx;
-		border-radius: 16rpx;
-		color: #fff;
-		box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.25);
-
-		.card-title {
-			font-size: 28rpx;
-			margin-bottom: 20rpx;
-			color: #fff;
-		}
-		
-		.commission-amount {
-			font-size: 48rpx;
-			font-weight: bold;
-			color: #fff;
-		}
-	}
-	
-	.record-card {
-		background: #23262F;
-		margin: 20rpx;
-		padding: 20rpx;
-		border-radius: 16rpx;
-		box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.18);
-		
-		.card-title {
-			font-size: 30rpx;
-			color: #F5F6FA;
-			margin-bottom: 20rpx;
-			font-weight: bold;
-		}
-		
-		.table {
-			width: 100%;
-			
-			.table-header {
-				display: flex;
-				background: #181A20;
-				padding: 20rpx 0;
-				border-radius: 8rpx 8rpx 0 0;
-
-				.th {
-					flex: 1;
-					text-align: center;
-					font-size: 26rpx;
-					color: #A0A3B1;
-					font-weight: 500;
-				}
-			}
-			
-			.table-body {
-				.tr {
-					display: flex;
-					padding: 20rpx 0;
-					border-bottom: 1px solid #33343A;
-					transition: background 0.2s;
-					
-					&:last-child {
-						border-bottom: none;
-					}
-					
-					.td {
-						flex: 1;
-						text-align: center;
-						font-size: 26rpx;
-						color: #F5F6FA;
-						font-weight: 400;
-					}
-					&:hover {
-						background: #23262F;
-					}
-				}
-			}
-		}
-	}
-
-	// 其他细节样式
-	::-webkit-scrollbar {
-		display: none;
-	}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/campus_data.vue b/uniapp/pages/market/my/campus_data.vue
deleted file mode 100644
index bba0c6e3..00000000
--- a/uniapp/pages/market/my/campus_data.vue
+++ /dev/null
@@ -1,495 +0,0 @@
-<!--校区数据-->
-<template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-    <view class="navbar_section">
-      <view class="navbar_content">
-        <view class="back_btn" @click="goBack">
-          <fui-icon name="arrowleft" size="32" color="#fff"></fui-icon>
-        </view>
-        <view class="title">校区数据</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
-    <view class="content_section">
-      <!-- 校区选择器 -->
-      <view class="campus_selector">
-        <view class="selector_label">选择校区：</view>
-        <view class="selector_box">
-          <view class="selected_campus">请选择校区</view>
-          <fui-icon name="dropdown" size="24" color="#999"></fui-icon>
-        </view>
-      </view>
-
-      <!-- 数据概览卡片 -->
-      <view class="overview_cards">
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="home" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">部门数量</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="addressbook" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">员工总数</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="star" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">客户总数</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="wallet" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">校区业绩</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 部门对比 -->
-      <view class="dept_comparison">
-        <view class="section_title">部门业绩对比</view>
-        <view class="comparison_list">
-          <view class="comparison_item">
-            <view class="dept_info">
-              <view class="dept_name">销售部</view>
-              <view class="dept_score">￥120000</view>
-            </view>
-            <view class="progress_bar">
-              <view class="progress_fill" style="width: 80%"></view>
-            </view>
-            <view class="dept_percent">80%</view>
-          </view>
-
-          <view class="comparison_item">
-            <view class="dept_info">
-              <view class="dept_name">市场部</view>
-              <view class="dept_score">￥100000</view>
-            </view>
-            <view class="progress_bar">
-              <view class="progress_fill" style="width: 67%"></view>
-            </view>
-            <view class="dept_percent">67%</view>
-          </view>
-
-          <view class="comparison_item">
-            <view class="dept_info">
-              <view class="dept_name">运营部</view>
-              <view class="dept_score">￥80000</view>
-            </view>
-            <view class="progress_bar">
-              <view class="progress_fill" style="width: 53%"></view>
-            </view>
-            <view class="dept_percent">53%</view>
-          </view>
-
-          <view class="comparison_item">
-            <view class="dept_info">
-              <view class="dept_name">客服部</view>
-              <view class="dept_score">￥60000</view>
-            </view>
-            <view class="progress_bar">
-              <view class="progress_fill" style="width: 40%"></view>
-            </view>
-            <view class="dept_percent">40%</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 月度趋势 -->
-      <view class="trend_section">
-        <view class="section_title">月度趋势</view>
-        <view class="trend_chart">
-          <view class="chart_placeholder">
-            <fui-icon name="linechart" size="80" color="#ddd"></fui-icon>
-            <view class="placeholder_text">图表功能待开发</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 功能按钮区域 -->
-      <view class="function_section">
-        <view class="section_title">数据分析</view>
-        <view class="function_grid">
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="barchart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">校区对比</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="piechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">部门分析</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="linechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">趋势分析</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="list" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">详细报表</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 提示信息 -->
-      <view class="tips_section">
-        <view class="tips_title">功能说明</view>
-        <view class="tips_content">
-          这里将显示校区的各项数据统计，包括部门数量、员工总数、客户数量、校区业绩等。
-          具体功能待后续开发实现。
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import fuiIcon from "@/components/firstui/fui-icon/fui-icon.vue"
-
-export default {
-  components: {
-    fuiIcon,
-  },
-  data() {
-    return {
-      
-    }
-  },
-  onLoad() {
-    
-  },
-  methods: {
-    // 返回上一页
-    goBack() {
-      uni.navigateBack()
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.main_box {
-  background: #f5f5f5;
-  min-height: 100vh;
-}
-
-// 自定义导航栏
-.navbar_section {
-  background: #29D3B4;
-  padding-top: 20rpx;
-  
-  // 小程序端样式
-  // #ifdef MP-WEIXIN
-  padding-top: 90rpx;
-  // #endif
-  
-  .navbar_content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 24rpx 40rpx 24rpx;
-    
-    .back_btn {
-      width: 60rpx;
-      height: 60rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    
-    .title {
-      font-size: 32rpx;
-      color: #fff;
-      font-weight: 500;
-    }
-    
-    .placeholder {
-      width: 60rpx;
-    }
-  }
-}
-
-// 内容区域
-.content_section {
-  padding: 40rpx 24rpx;
-  
-  // 校区选择器
-  .campus_selector {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    margin-bottom: 32rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    
-    .selector_label {
-      font-size: 28rpx;
-      color: #333;
-      margin-bottom: 16rpx;
-      font-weight: 500;
-    }
-    
-    .selector_box {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 20rpx 24rpx;
-      background: #f8f8f8;
-      border-radius: 12rpx;
-      
-      .selected_campus {
-        font-size: 26rpx;
-        color: #666;
-      }
-    }
-  }
-  
-  // 概览卡片
-  .overview_cards {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 24rpx;
-    margin-bottom: 40rpx;
-    
-    .card_item {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: flex;
-      align-items: center;
-      gap: 20rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .card_icon {
-        width: 64rpx;
-        height: 64rpx;
-        background: rgba(41, 211, 180, 0.1);
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      
-      .card_content {
-        flex: 1;
-        
-        .card_title {
-          font-size: 24rpx;
-          color: #999;
-          margin-bottom: 8rpx;
-        }
-        
-        .card_value {
-          font-size: 32rpx;
-          color: #333;
-          font-weight: 600;
-        }
-      }
-    }
-  }
-  
-  // 部门对比
-  .dept_comparison {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .comparison_list {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .comparison_item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 32rpx;
-        
-        &:last-child {
-          margin-bottom: 0;
-        }
-        
-        .dept_info {
-          width: 150rpx;
-          
-          .dept_name {
-            font-size: 26rpx;
-            color: #333;
-            margin-bottom: 8rpx;
-            font-weight: 500;
-          }
-          
-          .dept_score {
-            font-size: 22rpx;
-            color: #29D3B4;
-            font-weight: 600;
-          }
-        }
-        
-        .progress_bar {
-          flex: 1;
-          height: 16rpx;
-          background: #f0f0f0;
-          border-radius: 8rpx;
-          margin: 0 20rpx;
-          overflow: hidden;
-          
-          .progress_fill {
-            height: 100%;
-            background: linear-gradient(90deg, #29D3B4, #5CE1E6);
-            border-radius: 8rpx;
-            transition: width 0.3s ease;
-          }
-        }
-        
-        .dept_percent {
-          width: 60rpx;
-          text-align: right;
-          font-size: 24rpx;
-          color: #29D3B4;
-          font-weight: 600;
-        }
-      }
-    }
-  }
-  
-  // 月度趋势
-  .trend_section {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .trend_chart {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 40rpx 24rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .chart_placeholder {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        height: 200rpx;
-        
-        .placeholder_text {
-          font-size: 24rpx;
-          color: #999;
-          margin-top: 16rpx;
-        }
-      }
-    }
-  }
-  
-  // 功能区域
-  .function_section {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .function_grid {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 32rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .function_item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: 24rpx 16rpx;
-        border-radius: 12rpx;
-        transition: all 0.3s ease;
-        
-        &:active {
-          background-color: #f5f5f5;
-          transform: scale(0.95);
-        }
-        
-        .function_icon {
-          width: 64rpx;
-          height: 64rpx;
-          background: rgba(41, 211, 180, 0.1);
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-bottom: 16rpx;
-        }
-        
-        .function_text {
-          font-size: 24rpx;
-          color: #333;
-        }
-      }
-    }
-  }
-  
-  // 提示信息
-  .tips_section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    
-    .tips_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 16rpx;
-    }
-    
-    .tips_content {
-      font-size: 24rpx;
-      color: #666;
-      line-height: 1.6;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/dept_data.vue b/uniapp/pages/market/my/dept_data.vue
deleted file mode 100644
index fdda74bc..00000000
--- a/uniapp/pages/market/my/dept_data.vue
+++ /dev/null
@@ -1,445 +0,0 @@
-<!--部门数据-->
-<template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-    <view class="navbar_section">
-      <view class="navbar_content">
-        <view class="back_btn" @click="goBack">
-          <fui-icon name="arrowleft" size="32" color="#fff"></fui-icon>
-        </view>
-        <view class="title">部门数据</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
-    <view class="content_section">
-      <!-- 部门选择器 -->
-      <view class="dept_selector">
-        <view class="selector_label">选择部门：</view>
-        <view class="selector_box">
-          <view class="selected_dept">请选择部门</view>
-          <fui-icon name="dropdown" size="24" color="#999"></fui-icon>
-        </view>
-      </view>
-
-      <!-- 数据概览卡片 -->
-      <view class="overview_cards">
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="addressbook" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">部门人数</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="star" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">总客户数</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="wallet" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">部门业绩</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="check" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">完成率</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 排行榜 -->
-      <view class="ranking_section">
-        <view class="section_title">部门排行榜</view>
-        <view class="ranking_list">
-          <view class="ranking_item">
-            <view class="rank_number first">1</view>
-            <view class="member_info">
-              <view class="member_name">张三</view>
-              <view class="member_score">业绩：￥50000</view>
-            </view>
-            <view class="medal">
-              <fui-icon name="star-fill" size="24" color="#FFD700"></fui-icon>
-            </view>
-          </view>
-
-          <view class="ranking_item">
-            <view class="rank_number second">2</view>
-            <view class="member_info">
-              <view class="member_name">李四</view>
-              <view class="member_score">业绩：￥45000</view>
-            </view>
-            <view class="medal">
-              <fui-icon name="star-fill" size="24" color="#C0C0C0"></fui-icon>
-            </view>
-          </view>
-
-          <view class="ranking_item">
-            <view class="rank_number third">3</view>
-            <view class="member_info">
-              <view class="member_name">王五</view>
-              <view class="member_score">业绩：￥40000</view>
-            </view>
-            <view class="medal">
-              <fui-icon name="star-fill" size="24" color="#CD7F32"></fui-icon>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 功能按钮区域 -->
-      <view class="function_section">
-        <view class="section_title">数据分析</view>
-        <view class="function_grid">
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="barchart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">业绩对比</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="piechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">人员分布</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="linechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">趋势分析</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="list" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">详细报表</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 提示信息 -->
-      <view class="tips_section">
-        <view class="tips_title">功能说明</view>
-        <view class="tips_content">
-          这里将显示部门的各项数据统计，包括部门人员、客户数量、销售业绩、排行榜等。
-          具体功能待后续开发实现。
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import fuiIcon from "@/components/firstui/fui-icon/fui-icon.vue"
-
-export default {
-  components: {
-    fuiIcon,
-  },
-  data() {
-    return {
-      
-    }
-  },
-  onLoad() {
-    
-  },
-  methods: {
-    // 返回上一页
-    goBack() {
-      uni.navigateBack()
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.main_box {
-  background: #f5f5f5;
-  min-height: 100vh;
-}
-
-// 自定义导航栏
-.navbar_section {
-  background: #29D3B4;
-  padding-top: 20rpx;
-  
-  // 小程序端样式
-  // #ifdef MP-WEIXIN
-  padding-top: 90rpx;
-  // #endif
-  
-  .navbar_content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 24rpx 40rpx 24rpx;
-    
-    .back_btn {
-      width: 60rpx;
-      height: 60rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    
-    .title {
-      font-size: 32rpx;
-      color: #fff;
-      font-weight: 500;
-    }
-    
-    .placeholder {
-      width: 60rpx;
-    }
-  }
-}
-
-// 内容区域
-.content_section {
-  padding: 40rpx 24rpx;
-  
-  // 部门选择器
-  .dept_selector {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    margin-bottom: 32rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    
-    .selector_label {
-      font-size: 28rpx;
-      color: #333;
-      margin-bottom: 16rpx;
-      font-weight: 500;
-    }
-    
-    .selector_box {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 20rpx 24rpx;
-      background: #f8f8f8;
-      border-radius: 12rpx;
-      
-      .selected_dept {
-        font-size: 26rpx;
-        color: #666;
-      }
-    }
-  }
-  
-  // 概览卡片
-  .overview_cards {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 24rpx;
-    margin-bottom: 40rpx;
-    
-    .card_item {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: flex;
-      align-items: center;
-      gap: 20rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .card_icon {
-        width: 64rpx;
-        height: 64rpx;
-        background: rgba(41, 211, 180, 0.1);
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      
-      .card_content {
-        flex: 1;
-        
-        .card_title {
-          font-size: 24rpx;
-          color: #999;
-          margin-bottom: 8rpx;
-        }
-        
-        .card_value {
-          font-size: 32rpx;
-          color: #333;
-          font-weight: 600;
-        }
-      }
-    }
-  }
-  
-  // 排行榜
-  .ranking_section {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .ranking_list {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 24rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .ranking_item {
-        display: flex;
-        align-items: center;
-        padding: 20rpx 16rpx;
-        border-bottom: 1px solid #f0f0f0;
-        
-        &:last-child {
-          border-bottom: none;
-        }
-        
-        .rank_number {
-          width: 48rpx;
-          height: 48rpx;
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 24rpx;
-          font-weight: 600;
-          color: #fff;
-          margin-right: 24rpx;
-          
-          &.first {
-            background: #FFD700;
-          }
-          
-          &.second {
-            background: #C0C0C0;
-          }
-          
-          &.third {
-            background: #CD7F32;
-          }
-        }
-        
-        .member_info {
-          flex: 1;
-          
-          .member_name {
-            font-size: 28rpx;
-            color: #333;
-            margin-bottom: 8rpx;
-            font-weight: 500;
-          }
-          
-          .member_score {
-            font-size: 24rpx;
-            color: #666;
-          }
-        }
-        
-        .medal {
-          margin-left: 16rpx;
-        }
-      }
-    }
-  }
-  
-  // 功能区域
-  .function_section {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .function_grid {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 32rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .function_item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: 24rpx 16rpx;
-        border-radius: 12rpx;
-        transition: all 0.3s ease;
-        
-        &:active {
-          background-color: #f5f5f5;
-          transform: scale(0.95);
-        }
-        
-        .function_icon {
-          width: 64rpx;
-          height: 64rpx;
-          background: rgba(41, 211, 180, 0.1);
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-bottom: 16rpx;
-        }
-        
-        .function_text {
-          font-size: 24rpx;
-          color: #333;
-        }
-      }
-    }
-  }
-  
-  // 提示信息
-  .tips_section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    
-    .tips_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 16rpx;
-    }
-    
-    .tips_content {
-      font-size: 24rpx;
-      color: #666;
-      line-height: 1.6;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/index.vue b/uniapp/pages/market/my/index.vue
deleted file mode 100644
index b18d5915..00000000
--- a/uniapp/pages/market/my/index.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-<!--销售我的-首页-->
-<template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-    <view class="navbar_section">
-      <view class="title">我的</view>
-    </view>
-
-    <view style="background:#29D3B4;">
-      <!--用户信息-->
-      <view class="user_section">
-        <view class="box">
-          <view class="left" @click="openViewMyInfo()">
-            <image class="pic" :src="userInfo.head_img"></image>
-            <view class="name">{{userInfo.name}}</view>
-          </view>
-          <view class="right">
-            <view class="btn"></view>
-<!--            <view class="btn">切换身份</view>-->
-            <view class="btn"></view>
-          </view>
-        </view>
-        <view class="bottom" v-for="(v,k) in userInfo.cameus_dept_arr">
-          <view class="left">
-            <view class="title">校区：</view>
-            <view class="title">{{v.campus_id_name || ''}}</view>
-          </view>
-          <view class="division"></view>
-          <view class="right">
-            <view class="title">部门：</view>
-            <view class="title dept">{{v.dept_name_str || ''}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-
-
-    <view class="main_section">
-      <view class="grid_container">
-        <view class="grid_item" @click="openViewReimbursementList()">
-          <view class="icon_wrapper">
-            <fui-icon name="bankcard" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">报销记录</view>
-        </view>
-
-        <view class="grid_item" @click="openViewMyAttendance()">
-          <view class="icon_wrapper">
-            <fui-icon name="calendar" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">我的考勤</view>
-        </view>
-
-        <view class="grid_item" @click="goCourseSchedule()">
-          <view class="icon_wrapper">
-            <fui-icon name="list" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">课程安排</view>
-        </view>
-        
-        <view class="grid_item" @click="openViewMyMessage()">
-          <view class="icon_wrapper">
-            <fui-icon name="message" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">我的消息</view>
-        </view>
-
-        <view class="grid_item" @click="my_contract()">
-          <view class="icon_wrapper">
-            <fui-icon name="order" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">我的合同</view>
-        </view>
-
-        <view class="grid_item" @click="openMyData()">
-          <view class="icon_wrapper">
-            <fui-icon name="barchart" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">我的数据</view>
-        </view>
-
-        <view class="grid_item" @click="openDeptData()">
-          <view class="icon_wrapper">
-            <fui-icon name="piechart" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">部门数据</view>
-        </view>
-
-        <view class="grid_item" @click="openCampusData()">
-          <view class="icon_wrapper">
-            <fui-icon name="linechart" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">校区数据</view>
-        </view>
-
-        <view class="grid_item" @click="openViewSetUp()">
-          <view class="icon_wrapper">
-            <fui-icon name="setup" size="48" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="item_text">设置</view>
-        </view>
-      </view>
-    </view>
-
-<!--    底部导航-->
-    <AQTabber/>
-  </view>
-</template>
-
-<script>
-import marketApi from '@/api/market.js';
-import apiRoute from '@/api/apiRoute.js';
-import {
-  Api_url
-} from "@/common/config.js";
-import AQTabber from "@/components/AQ/AQTabber.vue"
-import fuiIcon from "@/components/firstui/fui-icon/fui-icon.vue"
-
-
-export default {
-  components: {
-    AQTabber,
-    fuiIcon,
-  },
-  data() {
-    return {
-      formData:{},
-      userInfo:{},//用户信息
-      //上传图片APi路径
-      uploadUrl: `${Api_url}/file/image`,
-
-      signedClientListCount:0,//已签客户数量
-    }
-  },
-  onLoad() {
-  },
-  onShow() {
-    this.init();
-  },
-  methods: {
-
-    //初始化
-    async init(){
-      await this.getUserInfo()//获取用户详情
-      // await this.getSignedClientListCount()//获取已签客户数量
-    },
-
-    //获取已签客户数量
-    async getSignedClientListCount(){
-      let data = {
-        page:1,
-        limit:1,
-      }
-      let res = await marketApi.signClient(data);
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      this.signedClientListCount = res.data.total
-    },
-
-    //获取用户详情
-    async getUserInfo(){
-      let data = {}
-      let res = await apiRoute.getPersonnelInfo(data);
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      res.data.cameus_dept_arr.forEach((v,k)=>{
-        let d_arr = []
-        v.dept_arr.forEach((dv,dk)=>{
-          d_arr.push(dv.dept_name)
-        })
-        //数组转字符串
-        v.dept_name_str = d_arr.join('，')
-      })
-
-      this.userInfo = res.data
-    },
-
-
-    //打开到课率统计
-    openViewArrivalStatistics(){
-      uni.navigateTo({
-        url: '/pages-market/my/arrival_statistics'
-      })
-    },
-
-    //打开即将到期
-    openViewDueSoon(){
-      uni.navigateTo({
-        url: '/pages-market/my/due_soon'
-      })
-    },
-
-    //打开授课统计
-    openViewSchoolingStatistics(){
-      uni.navigateTo({
-        url: '/pages-market/my/schooling_statistics'
-      })
-    },
-
-    //打开意见反馈
-    openViewFeedback(){
-      uni.navigateTo({
-        url: '/pages-common/feedback'
-      })
-    },
-
-    //打开个人资料
-    openViewMyInfo(){
-      uni.navigateTo({
-        url: '/pages-market/my/info'
-      })
-    },
-
-
-    //跳转页面-已签客户
-    openViewSignedClientList(){
-      uni.navigateTo({
-        url: '/pages-market/my/signed_client_list'
-      })
-    },
-
-    //跳转页面-我的考勤
-    openViewMyAttendance(){
-      uni.navigateTo({
-        url: '/pages-common/my_attendance'
-      })
-    },
-
-
-    //打开企业信息
-    openViewFirmInfo(){
-      uni.navigateTo({
-        url: '/pages-market/my/firm_info'
-      })
-    },
-
-
-    //打开设置
-    openViewSetUp(){
-      uni.navigateTo({
-        url: '/pages-market/my/set_up'
-      })
-    },
-
-    //跳转页面-我的消息
-    openViewMyMessage(){
-      uni.navigateTo({
-        url: '/pages-common/my_message'
-      })
-    },
-
-    //跳转页面-报销记录
-    openViewReimbursementList(){
-      uni.navigateTo({
-        url: '/pages-market/reimbursement/list'
-      })
-    },
-
-
-			goCourseSchedule(){
-				uni.navigateTo({
-					url: '/pages-coach/coach/schedule/schedule_table'
-				})
-			},
-      my_contract(){
-        uni.navigateTo({
-					url: '/pages-common/contract/my_contract'
-				})
-      },
-
-      //打开我的数据
-      openMyData(){
-        uni.navigateTo({
-          url: '/pages-market/my/my_data'
-        })
-      },
-
-      //打开部门数据
-      openDeptData(){
-        uni.navigateTo({
-          url: '/pages-market/my/dept_data'
-        })
-      },
-
-      //打开校区数据
-      openCampusData(){
-        uni.navigateTo({
-          url: '/pages-market/my/campus_data'
-        })
-      },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-.main_box{
-  background: #292929;
-  //min-height: 28vh;
-  min-height: 100%;
-}
-
-//自定义导航栏
-.navbar_section{
-  border: 1px solid #29D3B4;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #29D3B4;
-  .title{
-    padding: 40rpx 0rpx;
-
-    /* 小程序端样式 */
-    // #ifdef MP-WEIXIN
-    padding-top: 110rpx;
-    padding-bottom: 40rpx;
-    // #endif
-
-    font-size: 30rpx;
-    color: #fff;
-  }
-}
-
-//用户信息
-.user_section {
-  background-color: #29D3B4;
-  padding-top: 10rpx;
-  padding-bottom: 42rpx;
-  color: #fff;
-  font-size: 28rpx;
-  .box{
-    padding-left: 19rpx;
-    padding-right: 29rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 15rpx;
-    .left{
-      display: flex;
-      align-items: center;
-      gap: 20rpx;
-      .pic{
-        width: 144rpx;
-        height: 144rpx;
-        border-radius: 50%;
-      }
-      .name{
-        font-size: 28rpx;
-      }
-    }
-    .right{
-      display: flex;
-      flex-direction: column;
-      gap: 20rpx;
-      .btn{
-        min-height: 28rpx;
-        font-size: 28rpx;
-      }
-    }
-  }
-  .bottom{
-    margin-top: 30rpx;
-    padding: 0rpx 40rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    .title{
-      font-size: 28rpx;
-    }
-    //分割线段
-    .division{
-      width: 2px;
-      height: 35rpx;
-      background-color: #fff;
-    }
-    .left{
-      width: 48%;
-      display: flex;
-    }
-    .right{
-      width: 48%;
-      display: flex;
-      .dept{
-        width: 70%;
-      }
-    }
-  }
-}
-
-//统计信息
-.count_section{
-  position: relative;
-  .main{
-    position: relative;
-    z-index: 2;
-    padding: 0rpx 24rpx;
-    display: flex;
-    justify-content: center;
-    .course_box{
-      padding: 42rpx 28rpx;
-      width: 692rpx;
-      border-radius: 20rpx;
-      background-color: #fff;
-      display: flex;
-      flex-direction: column;
-      gap: 32rpx;
-      .top{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .item{
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          gap: 12rpx;
-          .num{
-            color: #29D3B4;
-            font-size: 56rpx;
-          }
-          .intro{
-            color: #AAAAAA;
-            font-size: 24rpx;
-          }
-        }
-      }
-      .bottom{
-        font-size: 24rpx;
-        color: #333333;
-        text{
-          margin-left: 10rpx;
-          color: #29D3B4;
-        }
-        .reduce{
-          color: #ef95a0;
-        }
-      }
-
-  }
-}
-  .bg_box{
-    z-index: 1;
-    width: 100%;
-    height: 150rpx;
-  }
-
-  .bg_top{
-    position: absolute;
-    top: 0;
-    background-color: #29D3B4;
-  }
-  .bg_bottom{
-    top: 50%;
-    position: absolute;
-    background-color: #292929;
-  }
-}
-
-.main_section{
-  background: #292929 100%;
-  padding: 0 24rpx;
-  padding-top: 40rpx;
-  padding-bottom: 150rpx;
-  font-size: 24rpx;
-  color: #333333;
-
-  .grid_container {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 40rpx 24rpx;
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 40rpx 20rpx;
-    
-    .grid_item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      padding: 20rpx 10rpx;
-      border-radius: 12rpx;
-      transition: all 0.3s ease;
-      
-      &:active {
-        background-color: #f5f5f5;
-        transform: scale(0.95);
-      }
-      
-      .icon_wrapper {
-        width: 80rpx;
-        height: 80rpx;
-        background: rgba(41, 211, 180, 0.1);
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-bottom: 16rpx;
-      }
-      
-      .item_text {
-        font-size: 24rpx;
-        color: #333333;
-        text-align: center;
-        font-weight: 400;
-        line-height: 1.2;
-      }
-    }
-  }
-}
-
-
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/info.vue b/uniapp/pages/market/my/info.vue
deleted file mode 100644
index fefbe9c5..00000000
--- a/uniapp/pages/market/my/info.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-<!--销售-个人资料-详情-->
-<template>
-  <view class="main_box">
-
-    <view class="main_section">
-      <view class="section">
-        <view class="item">
-          <image
-              @click="changeAvatar()"
-              class="pic"
-              :src="$util.img(formData.head_img)"
-          ></image>
-
-          <view class="btn" @click="changeAvatar()">修改头像</view>
-        </view>
-      </view>
-
-      <view class="section">
-        <view class="item">
-          <view class="title">
-            姓名 <text class="required">*</text>
-          </view>
-          <view class="input">
-            <input v-model="formData.name" placeholder="请输入姓名" />
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            账号 <text class="required"></text>
-          </view>
-          <view class="input">
-            <input v-model="formData.username" disabled placeholder="暂无" />
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            部门 <text class="required"></text>
-          </view>
-          <view class="input">
-<!--            <input disabled :placeholder="formData.department_name_str" />-->
-            <view class="dept disabled">{{formData.department_name_str || '暂无'}}</view>
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            等级 <text class="required"></text>
-          </view>
-          <view class="input">
-            <input v-model="formData.member_level_name" disabled placeholder="暂无" />
-          </view>
-        </view>
-      </view>
-
-      <view class="section">
-        <view class="item">
-          <view class="title">
-            性别 <text class="required">*</text>
-          </view>
-          <view class="input">
-            <input placeholder="请选择性别" v-model="formData.gender_str" @click="picker_show_sex=true"/>
-            <fui-picker
-                layer="1"
-                :linkage="true"
-                :options="options_sex_arr"
-                :show="picker_show_sex"
-                @change="changePickerSex"
-                @cancel="picker_show_sex=false"
-            ></fui-picker>
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            生日 <text class="required">*</text>
-          </view>
-          <view class="input">
-            <input  placeholder="请选择生日" @click="picker_show_birthday=true" v-model="formData.birthday"/>
-            <fui-date-picker
-                :minDate="minDate"
-                :maxDate="maxDate"
-                :show="picker_show_birthday"
-                type="3"
-                @change="changePickerBirthday"
-                @cancel="picker_show_birthday=false"
-            ></fui-date-picker>
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            邮箱 <text class="required">*</text>
-          </view>
-          <view class="input">
-            <input v-model="formData.email" placeholder="请输入邮箱" />
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            手机 <text class="required">*</text>
-          </view>
-          <view class="input">
-            <input v-model="formData.phone" placeholder="请输入手机" />
-          </view>
-        </view>
-
-        <view class="item">
-          <view class="title">
-            微信 <text class="required"></text>
-          </view>
-          <view class="input">
-            <input v-model="formData.wx" placeholder="请输入微信" />
-          </view>
-        </view>
-      </view>
-
-      <view class="submet_btn" @click="submit">提交</view>
-    </view>
-  </view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-import marketApi from '@/api/market.js';
-import {
-  Api_url
-} from "@/common/config.js";
-import AQTabber from "@/components/AQ/AQTabber"
-
-
-export default {
-  components: {
-    AQTabber,
-  },
-  data() {
-    return {
-      formData:{
-        head_img:'',//头像地址
-        name:'',//姓名
-        username:'',//账号
-        address:'',//住址
-        gender:'',//性别|1男,2女
-        gender_str:'',
-        birthday:'',//生日
-        email:'',//邮箱
-        phone:'',//手机
-        wx:'',//微信号
-      },
-
-      userInfo: {},
-
-      //上传图片APi路径
-      uploadUrl: `${Api_url}/uploadImage`,
-
-      //性别选择器 相关
-      picker_show_sex: false,
-      sex_name:'请选择',
-      options_sex_arr: [
-        {
-          value: 1,
-          text: '男'
-        },
-        {
-          value: 2,
-          text: '女'
-        },
-      ],
-
-      //生日选择器相关
-      minDate: '',
-      maxDate: '',
-      picker_show_birthday: false,
-      upload_type: 1,
-      uploadHeadimg: '',
-      editHeadimg: '',
-    }
-  },
-  onLoad() {
-  },
-  onShow() {
-    this.init()
-  },
-  methods: {
-
-    async init(){
-      // this.getBirthday()
-      this.setDateYear()
-      await this.getUserInfo()
-    },
-
-    //设置年份
-    setDateYear() {
-      let currentYear = new Date().getFullYear();
-      this.minDate = String(currentYear - 100);
-      this.maxDate = String(currentYear + 1);
-    },
-
-    //获取用户详情
-    async getUserInfo(){
-      let res = await apiRoute.getPersonnelInfo({})
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      let gender_str = ''
-      if(res.data.gender == 1){
-        gender_str = '男'
-      }else if(res.data.gender == 2){
-        gender_str = '女'
-      }
-
-      //用户表单
-      this.formData = {
-        head_img: res.data.head_img,//头像地址
-        name: res.data.name,//姓名
-        username: res.data.phone,//账号
-        address: res.data.address,//住址
-        gender: res.data.gender,//性别|1男,2女
-        gender_str:gender_str,
-        birthday: res.data.birthday,//生日
-        email: res.data.email || '',//邮箱
-        phone: res.data.phone,//手机
-        wx: res.data.wx || '',//微信号
-        member_level_name: res.data.member_level_name || '',//等级名称
-        department_name_str:res.data.department_name_str || '暂无',//部门名称
-      }
-    },
-
-    // 修改头像按钮
-    changeAvatar() {
-      uni.chooseImage({
-        count: 1,
-        sizeType: ['compressed'],
-        sourceType: ['album', 'camera'],
-        success: (res) => {
-          const tempFilePath = res.tempFilePaths[0]
-          // 这里可以调用上传接口
-          this.uploadFilePromise(tempFilePath)
-        }
-      })
-    },
-    uploadFilePromise(url) {
-      let token = uni.getStorageSync('token') || ''
-      let a = uni.uploadFile({
-        url: this.uploadUrl, //仅为示例，非真实的接口地址
-        filePath: url,
-        name: 'file',
-        header: {
-          'token': `${token}`, //请求头设置token
-        },
-        success: (e) => {
-          let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
-          console.log('上传成功2', res)
-          if (res.code == 1) {
-            this.upload_type = 2
-            this.formData.head_img = res.data.url
-            // this.editHeadimg = res.data.path
-            // this.uploadHeadimg = res.data.url
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none'
-            })
-          }
-        },
-      });
-    },
-
-    //性别选择相关
-    changePickerSex(e) {
-      console.log('监听选择', e)
-      this.formData.gender = e.value
-      this.formData.gender_str = e.text
-      this.picker_show_sex = false
-    },
-
-    //生日选择相关
-    //获取当前年月日+获取30年前的日期
-    getBirthday() {
-      let date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
-      let year_30 = year - 30;
-      let month_30 = month;
-      let day_30 = day;
-      if (month_30 == 2 && day_30 > 28) {
-        month_30 = 3;
-        day_30 = 1;
-      }
-      if (month_30 == 4 && day_30 > 30) {
-        month_30 = 5;
-        day_30 = 1;
-      }
-      if (month_30 == 6 && day_30 > 30) {
-        month_30 = 7;
-        day_30 = 1;
-      }
-      if (month_30 == 9 && day_30 > 30) {
-        month_30 = 10;
-        day_30 = 1;
-      }
-      if (month_30 == 11 && day_30 > 30) {
-        month_30 = 12;
-        day_30 = 1;
-      }
-      if (month_30 > 12) {
-        month_30 = month_30 - 12;
-        year_30 = year_30 + 1;
-      }
-      let minDate = year_30 + "-" + month_30 + "-" + day_30
-      let maxDate = year + "-" + month + "-" + day
-      this.minDate = minDate
-      this.maxDate = maxDate
-    },
-
-    //监听生日选择
-    changePickerBirthday(e) {
-      console.log('监听生日选择', e)
-      this.formData.birthday = e.result
-      this.picker_show_birthday = false
-    },
-
-    //提交信息
-    async submit() {
-      let data = {...this.formData}
-
-      if(!data.head_img){
-        uni.showToast({
-          title: '请上传头像',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(!data.name){
-        uni.showToast({
-          title: '请填写',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(!data.gender){
-        uni.showToast({
-          title: '请选择性别',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(!data.birthday){
-        uni.showToast({
-          title: '请选择生日',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(!data.email){
-        uni.showToast({
-          title: '请填写邮箱',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(!data.phone){
-        uni.showToast({
-          title: '请填写手机',
-          icon: 'none'
-        })
-        return
-      }
-
-
-      let res = await apiRoute.editPersonnelInfo(data)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      uni.showToast({
-        title: res.msg,
-        icon: 'success'
-      })
-      //延迟1s执行
-      setTimeout(() => {
-        this.getUserInfo()
-      }, 1000)
-    },
-
-
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-.main_box{
-  background: #292929 ;
-}
-
-//自定义导航栏
-.navbar_section{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #29d3b4;
-  .title{
-    padding: 40rpx 0rpx;
-
-    /* 小程序端样式 */
-    // #ifdef MP-WEIXIN
-    padding: 80rpx 0rpx;
-    // #endif
-
-    font-size: 30rpx;
-    color: #315d55;
-  }
-}
-
-.main_section{
-  min-height: 100vh;
-  background: #292929 100%;
-  padding: 0 0rpx;
-  padding-top: 32rpx;
-  padding-bottom: 150rpx;
-  font-size: 28rpx;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  gap: 20rpx;
-
-  .section{
-    background-color: #434544;
-    .item{
-      padding: 20rpx 40rpx;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .pic{
-        width: 82rpx;
-        height: 82rpx;
-        border-radius: 50%;
-      }
-      .btn{}
-
-      .title{
-        min-width: 100rpx;
-        display: flex;
-        align-items: center;
-        font-size: 26rpx;
-        color: #D7D7D7;
-        .required{
-          margin-left: 10rpx;
-          color: red;
-        }
-      }
-      .input{
-        display: flex;
-        justify-content: flex-end;
-        input{
-          text-align: right;
-        }
-        .dept{
-          width: 50%;
-        }
-        .disabled{
-          color: #808080;
-          //禁止图标
-          cursor: not-allowed;
-        }
-      }
-    }
-  }
-
-  .submet_btn{
-    margin: 0 auto;
-    margin-top: 40rpx;
-    border: 2px solid #25a18b;
-    color: #25a18b;
-    width: 80%;
-    height: 80rpx;
-    font-size: 30rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-
-
-}
-
-
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/my_data.vue b/uniapp/pages/market/my/my_data.vue
deleted file mode 100644
index cefe0c5e..00000000
--- a/uniapp/pages/market/my/my_data.vue
+++ /dev/null
@@ -1,292 +0,0 @@
-<!--我的数据-->
-<template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-    <view class="navbar_section">
-      <view class="navbar_content">
-        <view class="back_btn" @click="goBack">
-          <fui-icon name="arrowleft" size="32" color="#fff"></fui-icon>
-        </view>
-        <view class="title">我的数据</view>
-        <view class="placeholder"></view>
-      </view>
-    </view>
-
-    <view class="content_section">
-      <!-- 数据概览卡片 -->
-      <view class="overview_cards">
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="star" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">总客户数</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="check" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">已签客户</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="wallet" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">销售业绩</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-
-        <view class="card_item">
-          <view class="card_icon">
-            <fui-icon name="calendar" size="40" color="#29D3B4"></fui-icon>
-          </view>
-          <view class="card_content">
-            <view class="card_title">本月任务</view>
-            <view class="card_value">--</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 功能按钮区域 -->
-      <view class="function_section">
-        <view class="section_title">数据统计</view>
-        <view class="function_grid">
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="barchart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">客户统计</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="piechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">业绩统计</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="linechart" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">趋势分析</view>
-          </view>
-
-          <view class="function_item">
-            <view class="function_icon">
-              <fui-icon name="list" size="32" color="#29D3B4"></fui-icon>
-            </view>
-            <view class="function_text">详细报表</view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 提示信息 -->
-      <view class="tips_section">
-        <view class="tips_title">功能说明</view>
-        <view class="tips_content">
-          这里将显示您个人的各项数据统计，包括客户数量、销售业绩、任务完成情况等。
-          具体功能待后续开发实现。
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import fuiIcon from "@/components/firstui/fui-icon/fui-icon.vue"
-
-export default {
-  components: {
-    fuiIcon,
-  },
-  data() {
-    return {
-      
-    }
-  },
-  onLoad() {
-    
-  },
-  methods: {
-    // 返回上一页
-    goBack() {
-      uni.navigateBack()
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.main_box {
-  background: #f5f5f5;
-  min-height: 100vh;
-}
-
-// 自定义导航栏
-.navbar_section {
-  background: #29D3B4;
-  padding-top: 20rpx;
-  
-  // 小程序端样式
-  // #ifdef MP-WEIXIN
-  padding-top: 90rpx;
-  // #endif
-  
-  .navbar_content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 24rpx 40rpx 24rpx;
-    
-    .back_btn {
-      width: 60rpx;
-      height: 60rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    
-    .title {
-      font-size: 32rpx;
-      color: #fff;
-      font-weight: 500;
-    }
-    
-    .placeholder {
-      width: 60rpx;
-    }
-  }
-}
-
-// 内容区域
-.content_section {
-  padding: 40rpx 24rpx;
-  
-  // 概览卡片
-  .overview_cards {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 24rpx;
-    margin-bottom: 40rpx;
-    
-    .card_item {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: flex;
-      align-items: center;
-      gap: 20rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .card_icon {
-        width: 64rpx;
-        height: 64rpx;
-        background: rgba(41, 211, 180, 0.1);
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      
-      .card_content {
-        flex: 1;
-        
-        .card_title {
-          font-size: 24rpx;
-          color: #999;
-          margin-bottom: 8rpx;
-        }
-        
-        .card_value {
-          font-size: 32rpx;
-          color: #333;
-          font-weight: 600;
-        }
-      }
-    }
-  }
-  
-  // 功能区域
-  .function_section {
-    margin-bottom: 40rpx;
-    
-    .section_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 24rpx;
-    }
-    
-    .function_grid {
-      background: #fff;
-      border-radius: 16rpx;
-      padding: 32rpx 24rpx;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 32rpx;
-      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-      
-      .function_item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: 24rpx 16rpx;
-        border-radius: 12rpx;
-        transition: all 0.3s ease;
-        
-        &:active {
-          background-color: #f5f5f5;
-          transform: scale(0.95);
-        }
-        
-        .function_icon {
-          width: 64rpx;
-          height: 64rpx;
-          background: rgba(41, 211, 180, 0.1);
-          border-radius: 50%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-bottom: 16rpx;
-        }
-        
-        .function_text {
-          font-size: 24rpx;
-          color: #333;
-        }
-      }
-    }
-  }
-  
-  // 提示信息
-  .tips_section {
-    background: #fff;
-    border-radius: 16rpx;
-    padding: 32rpx 24rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    
-    .tips_title {
-      font-size: 28rpx;
-      color: #333;
-      font-weight: 600;
-      margin-bottom: 16rpx;
-    }
-    
-    .tips_content {
-      font-size: 24rpx;
-      color: #666;
-      line-height: 1.6;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/set_up.vue b/uniapp/pages/market/my/set_up.vue
deleted file mode 100644
index 9e17258b..00000000
--- a/uniapp/pages/market/my/set_up.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--设置页-->
-<template>
-	<view class="assemble">
-		<view style="height: 30rpx;"></view>
-		<view class="option" @click="update_pass()">修改密码</view>
-		<view class="option" @click="privacy_agreement(1)">用户协议</view>
-		<view class="option" @click="privacy_agreement(2)">隐私策略</view>
-		<view class="option" @click="clearCache()">清空缓存</view>
-		
-		<view style="width:90%;margin: 60rpx auto;">
-			<fui-button background="#29d3b4" @click="loginOut()">退出账号</fui-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-      //退出登陆
-      loginOut(){
-        this.$util.loginOut()
-      },
-
-			privacy_agreement(type){
-				uni.navigateTo({
-					url: '/pages-common/privacy_agreement?type='+type
-				})
-			},
-			update_pass(){
-				uni.navigateTo({
-					url: '/pages-market/my/update_pass'
-				})
-			},
-			
-			// 清空缓存
-			clearCache() {
-				uni.showModal({
-					title: '清空缓存',
-					content: '确定要清空所有字典缓存吗？',
-					success: (res) => {
-						if (res.confirm) {
-							this.performClearCache();
-						}
-					}
-				});
-			},
-			
-			// 执行清空缓存操作
-			performClearCache() {
-				try {
-					// 获取本地存储的所有键
-					const storageInfo = uni.getStorageInfoSync();
-					const keys = storageInfo.keys;
-					
-					// 筛选出dict_开头的键并删除
-					let clearCount = 0;
-					keys.forEach(key => {
-						if (key.startsWith('dict_')) {
-							uni.removeStorageSync(key);
-							clearCount++;
-						}
-					});
-					
-					// 显示清理结果
-					uni.showToast({
-						title: `已清空${clearCount}个字典缓存`,
-						icon: 'success',
-						duration: 2000
-					});
-					
-					console.log(`清空缓存完成，共清理${clearCount}个dict_开头的缓存项`);
-				} catch (error) {
-					console.error('清空缓存失败：', error);
-					uni.showToast({
-						title: '清空缓存失败',
-						icon: 'none',
-						duration: 2000
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	.assemble{
-		width: 100%;
-		height: 100vh;
-		background: #333333; 
-	}
-	.option{
-		margin-bottom: 20rpx;
-		background: #404045;
-		width: 100%;
-		font-size: 28rpx;
-		color: #fff;
-		line-height: 56rpx;
-		padding: 20rpx 0 20rpx 100rpx;
-	}
-</style>
diff --git a/uniapp/pages/market/my/signed_client_list.vue b/uniapp/pages/market/my/signed_client_list.vue
deleted file mode 100644
index d5525f1b..00000000
--- a/uniapp/pages/market/my/signed_client_list.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--已签客户-列表-->
-<template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-<!--    <view class="navbar_section">-->
-<!--      <view class="title">班级详情</view>-->
-<!--    </view>-->
-
-    <view class="main_section">
-      <!-- 班级成员列表-->
-      <scroll-view
-          class="section_4"
-          scroll-y="true"
-          :lower-threshold="lowerThreshold"
-          @scrolltolower="loadMoreData"
-          style="height: 83vh;"
-      >
-        <view class="ul">
-          <view class="li"
-                v-for="(v,k) in tableList"
-                :key="k"
-                @click="openViewStudentInfo(v)">
-            <view class="left">
-              <view class="box_1">
-                <image class="pic"
-                       v-if="v.header" :src="$util.img(v.header)"></image>
-                <image v-else class="pic" :src="$util.img('/uniapp_src/static/images/index/myk.png')"></image>
-<!--                <view class="tag_box">-->
-<!--                  即将到期-->
-<!--                </view>-->
-              </view>
-              <view class="box_2">
-                <view class="name">{{v.name}}</view>
-                <view class="date">课程截止时间：{{v.end_time}}</view>
-              </view>
-            </view>
-            <view class="right">
-              <view class="item">
-                <view>{{v.have_study_time}}</view>
-                <view>已上课时</view>
-              </view>
-              <view class="item">
-                <view>{{v.end_study_time ? v.end_study_time:0}}</view>
-                <view>剩余课时</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-
-    <!--    底部导航-->
-    <!--    <AQTabber/>-->
-  </view>
-</template>
-
-<script>
-import marketApi from '@/api/market.js';
-import AQTabber from "@/components/AQ/AQTabber.vue"
-
-
-export default {
-  components: {
-    AQTabber,
-  },
-  data() {
-    return {
-      loading:false,//加载状态
-      lowerThreshold: 100,//距离底部多远触发
-      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
-
-      //筛选条件
-      filteredData:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        name: '',//班级名称
-      },
-      tableList:[],//聊天数据列表
-    }
-  },
-  onLoad() {
-  },
-  onShow() {
-    this.init();
-  },
-  methods: {
-    //初始化
-    async init(){
-      await this.getList()//获取已签客户
-    },
-
-    //加载更多(下一页)
-    loadMoreData() {
-      //判断是否加载
-      if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getList();
-      }
-    },
-    //重置为第一页
-    async resetFilteredData() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-
-      this.filteredData.page = 1//当前页码
-      this.filteredData.limit = 10//每页返回数据条数
-      this.filteredData.total = 10//数据总条数
-    },
-    //获取列表
-    async getList(){
-      this.loading = true
-
-      let data = {...this.filteredData}
-
-      //判断是否还有数据
-      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
-        this.loading = false
-        uni.showToast({
-          title: '暂无更多',
-          icon: 'none'
-        })
-        return
-      }
-
-      if(data.page == 1){
-        this.tableList = []
-      }
-
-      let res = await marketApi.signClient(data)
-      this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-      this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
-
-      console.log('列表',this.tableList)
-      this.filteredData.total = res.data.total
-      this.filteredData.page++
-    },
-
-    //打开学员详情页
-    openViewStudentInfo(item){
-      let students_id= item.id
-      uni.navigateTo({
-        url: `/pages-coach/coach/student/info?students_id=${students_id}`
-      })
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-.main_box{
-  background: #292929 ;
-}
-
-//自定义导航栏
-.navbar_section{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #292929;
-  .title{
-    padding: 40rpx 0rpx;
-
-    /* 小程序端样式 */
-    // #ifdef MP-WEIXIN
-    padding: 80rpx 0rpx;
-    // #endif
-
-    font-size: 30rpx;
-    color: #fff;
-  }
-}
-
-.main_section{
-  min-height: 95vh;
-  background: #292929 100%;
-  padding: 0 24rpx;
-  padding-top: 40rpx;
-  padding-bottom: 150rpx;
-  font-size: 24rpx;
-  color: #FFFFFF;
-  //班级成员列表
-  .section_4{
-    .ul{
-      display: flex;
-      flex-direction: column;
-      gap: 10rpx;
-      .li{
-        padding: 20rpx 0;
-        padding-bottom: 40rpx;
-        border-bottom: 2px solid #D7D7D7;
-        display: flex;
-        justify-content: space-between;
-        .left{
-          display: flex;
-          align-items: center;
-          gap: 30rpx;
-          .box_1{
-            padding-left: 20rpx;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            position: relative;
-            .pic{
-              width: 84rpx;
-              height: 84rpx;
-              border-radius: 50%;
-            }
-            .tag_box{
-              position: absolute;
-              bottom: -30rpx;
-              width: 120rpx;
-              height: 38rpx;
-              background-color: #F59A23;
-              border-radius: 4rpx;
-              line-height: 35rpx;
-              text-align: center;
-              font-size: 20rpx;
-            }
-          }
-          .box_2{
-            display: flex;
-            flex-direction: column;
-            gap: 20rpx;
-            .name{
-              font-size: 28rpx;
-            }
-            .date{
-              font-size: 24rpx;
-            }
-          }
-        }
-        .right{
-          display: flex;
-          align-items: center;
-          gap: 14rpx;
-          .item{
-            border: 1px solid #00E5BB;
-            border-radius: 10rpx;
-            width: 102rpx;
-            display: flex;
-            flex-direction: column;
-            view{
-              text-align: center;
-              height: 50rpx;
-              line-height: 50rpx;
-            }
-            view:nth-child(1){
-              font-size: 32rpx;
-              background-color: #fff;
-              color: #00e5bb;
-            }
-            view:nth-child(2){
-              font-size: 20rpx;
-              background-color: #00e5bb;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/my/update_pass.vue b/uniapp/pages/market/my/update_pass.vue
deleted file mode 100644
index 7092c673..00000000
--- a/uniapp/pages/market/my/update_pass.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--修改密码-->
-<template>
-	<view>
-		<view class="title">
-			<view :class="{'green-text': tset_style === 1}">1.验证旧密码</view>
-			<view :class="{'green-text': tset_style === 2}">2.设置新密码</view>
-		</view>
-		<view :style="{'background-color':'#fff','width':'100%','height':'100vh' }">
-			<view style="width: 95%;height: 30rpx;"></view>
-			<view v-if="tset_style == 1">
-				<view class="describe">
-					为保障您的账号安全，修改密码前请填写原密码
-				</view>
-				<view style="width: 95%;margin:30rpx auto;">
-					<fui-input borderTop placeholder="请输入原登录密码" v-model="old_password"
-						backgroundColor="#f2f2f2"></fui-input>
-				</view>
-			</view>
-			<view v-if="tset_style == 2">
-				<view style="width: 95%;margin:30rpx auto;">
-					<fui-input borderTop placeholder="请设置6-20位新的登录密码" v-model="formData.new_password" @input="input"
-						backgroundColor="#f2f2f2"></fui-input>
-				</view>
-				<view style="width: 95%;margin: auto;">
-					<fui-input borderTop :padding="['20rpx','32rpx']" v-model="formData.new_password_2" placeholder="请再次输入新的登录密码" @input="input"
-						backgroundColor="#f2f2f2">
-					</fui-input>
-				</view>
-			</view>
-			<view style="width: 95%;margin:60rpx auto;">
-        <view class="btn_box">
-          <fui-button
-              background="#465cff"
-              radius="5rpx"
-              @click="nextStep(1)"
-              v-if="tset_style != 1">上一步
-          </fui-button>
-
-          <fui-button background="#00be8c" radius="5rpx" @click="nextStep(2)" v-if="tset_style == 1">下一步</fui-button>
-
-          <fui-button background="#00be8c" radius="5rpx" @click="submit" v-if="tset_style == 2">提交</fui-button>
-        </view>
-
-
-				<view style="width: 95%;margin:60rpx auto;">
-					<fui-button background="#fff" radius="5rpx" @click="forgot" color="#999999" v-if="tset_style == 1">忘记原密码</fui-button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-
-	export default {
-		data() {
-			return {
-				code: '',
-				user: '',
-				tset_style: 1,//tab栏目|1=验证旧密码页,2=设置新密码页
-
-        old_password:'',//旧密码
-
-
-        formData:{
-          phone:'',//当前登录用户的手机号
-          new_password:'',//新密码
-          new_password_2:'',//二次新密码
-          key_value:'',//修改密码的key_value
-        },
-			}
-		},
-		onLoad() {},
-    onShow() {
-      this.init()//初始化
-    },
-		methods: {
-      //初始化
-		  async init(){
-		    await this.getUserInfo()
-      },
-      //获取用户信息
-      async getUserInfo() {
-        let res = await apiRoute.getPersonnelInfo({})
-        if (res.code != 1) {
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-          return
-        }
-        this.formData.phone = res.data.phone//用户手机号
-      },
-
-      //上/下一步切换
-			async nextStep(tset_style){
-			  //tset_style|1=第一页,2=第二页
-        if(tset_style == 2){
-          if(!this.old_password){
-            uni.showToast({
-              title: '请输入原登录密码',
-              icon: 'none'
-            })
-            return
-          }
-          //验证旧密码
-          let params = {
-            old_password: this.old_password
-          }
-          //验证旧密码是否正确
-          let res = await apiRoute.common_personnelCheckOldPwd(params)
-          if(!res.code){
-            uni.showToast({
-              title: res.msg,
-              icon: 'none'
-            })
-            return
-          }
-          this.formData.key_value = res.data.key_value
-        }
-				this.tset_style = Number(tset_style)
-			},
-      //忘记密码
-			forgot() {
-				uni.navigateTo({
-					url: '/pages/student/login/forgot'
-				})
-			},
-
-      //提交
-      async submit() {
-        //验证数据
-        if (!this.formData.new_password) {
-          uni.showToast({
-            title: '请输入新密码',
-            icon: 'none'
-          })
-          return
-        }
-
-        if (this.formData.new_password.length < 6 || this.formData.new_password.length > 20) {
-          uni.showToast({
-            title: '新密码长度为6-20位',
-            icon: 'none'
-          })
-          return
-        }
-
-        if (!this.formData.new_password) {
-          uni.showToast({
-            title: '请输入新密码',
-            icon: 'none'
-          })
-          return
-        }
-        //验证两次密码是否一致
-        if (this.formData.new_password != this.formData.new_password_2) {
-          uni.showToast({
-            title: '两次密码不一致',
-            icon: 'none'
-          })
-          return
-        }
-
-        let res = await apiRoute.common_personnelEdidPassword(this.formData)
-        if(!res.code){
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-          return
-        }
-        uni.showToast({
-          title: res.msg,
-          icon: 'success'
-        })
-        //延迟1s执行
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1000)
-      },
-    }
-	}
-</script>
-
-<style lang="less" scoped>
-	page {
-		font-weight: normal;
-	}
-
-	.fui-section__title {
-		margin-left: 32rpx;
-	}
-
-	.fui-left__icon {
-		padding-right: 24rpx;
-	}
-
-	.title {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 100rpx;
-		width: 100%;
-		background-color: #fff;
-		font-size: 26rpx;
-		border: 4rpx #f5f5f5 solid;
-	}
-	
-	.green-text{
-		color: #36d6b9;
-	}
-	
-	.describe{
-		color: #999999;
-		padding-left: 30rpx;
-	}
-
-  .btn_box{
-    display: flex;
-    flex-direction: column;
-    gap: 40rpx;
-  }
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/reimbursement/add.vue b/uniapp/pages/market/reimbursement/add.vue
deleted file mode 100644
index 6b330df9..00000000
--- a/uniapp/pages/market/reimbursement/add.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-	<view class="reim-add-page">
-		<view class="header-bar">
-			<view class="title">{{ pageTitle }}</view>
-		</view>
-		<view class="form-box">
-			<!-- 金额 -->
-			<view class="form-row">
-				<view class="label">报销金额</view>
-				<input class="input-amount" type="number" v-model="form.amount" placeholder="0.00"
-					:disabled="disabled" />
-			</view>
-			<!-- 描述 -->
-			<view class="form-row-top">
-				<view class="label">报销描述</view>
-				<textarea class="textarea" v-model="form.description" placeholder="请输入报销事由" :disabled="disabled" />
-			</view>
-			<!-- 附件 -->
-			<view class="form-row">
-				<view class="label">发票/收据</view>
-				<view class="file-upload-wrapper">
-					<view v-if="form.receipt_url" class="preview-box" @click="previewImage">
-						<image v-if="isImage(form.receipt_url)" :src="form.receipt_url" class="preview-img"
-							mode="aspectFit" />
-						<view v-else class="file-link">{{ getFileName(form.receipt_url) }}</view>
-					</view>
-					<button class="upload-btn" @click="chooseFile" :disabled="disabled">
-						{{ form.receipt_url ? '重新选择' : '选择附件' }}
-					</button>
-				</view>
-			</view>
-		</view>
-		<view class="save-btn-box" v-if="!disabled">
-			<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="submit">提交</fui-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import apiRoute from '@/api/apiRoute.js';
-	import {
-		Api_url
-	} from "@/common/config.js";
-	export default {
-		data() {
-			return {
-				uploadUrl: `${Api_url}/uploadImage`,
-				pageTitle: '新增报销',
-				disabled: false,
-				form: {
-					id: null,
-					amount: '',
-					description: '',
-					receipt_url: '',
-				}
-			}
-		},
-		onLoad(options) {
-			if (options.id) {
-				this.form.id = options.id;
-				this.fetchDetail(options.id);
-			}
-		},
-		methods: {
-			async fetchDetail(id) {
-				uni.showLoading({
-					title: '加载中...'
-				});
-				
-				let res = await apiRoute.reimbursement_info({id:id})
-				let mockData = res.data
-				
-				if (mockData.status !== 'pending') {
-					this.disabled = true;
-					this.pageTitle = '查看报销';
-				} else {
-					this.pageTitle = '编辑报销';
-				}
-
-				this.form.amount = mockData.amount;
-				this.form.description = mockData.description;
-				this.form.receipt_url = mockData.receipt_url;
-				uni.hideLoading();
-			},
-			chooseFile() {
-
-				uni.chooseImage({
-					count: 1,
-					success: (res) => {
-						const tempFilePath = res.tempFilePaths[0]
-						// 这里可以调用上传接口
-						this.uploadFilePromise(tempFilePath)
-					}
-				})
-			},
-			uploadFilePromise(url) {
-				let token = uni.getStorageSync('token') || ''
-				let a = uni.uploadFile({
-					url: this.uploadUrl, //仅为示例，非真实的接口地址
-					filePath: url,
-					name: 'file',
-					header: {
-						'token': `${token}`, //请求头设置token
-					},
-					success: (e) => {
-						let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
-
-						if (res.code == 1) {
-							this.form.receipt_url = res.data.url
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
-						}
-					},
-				});
-			},
-			isImage(url) {
-				if (!url) return false;
-				return /\.(jpg|jpeg|png|gif|bmp)$/i.test(url);
-			},
-			getFileName(path) {
-				if (!path) return '';
-				return path.split('/').pop();
-			},
-			previewImage() {
-				if (this.form.receipt_url && this.isImage(this.form.receipt_url)) {
-					uni.previewImage({
-						urls: [this.form.receipt_url]
-					});
-				}
-			},
-			submit() {
-				if (!this.form.amount || !this.form.description) {
-					uni.showToast({
-						title: '请填写完整',
-						icon: 'none'
-					});
-					return;
-				}
-				let res = apiRoute.reimbursement_add(this.form)
-
-				if (res['code'] == 1) {
-					uni.showToast({
-						title: '提交成功',
-						icon: 'success'
-					});
-				}
-
-				setTimeout(() => {
-					uni.navigateBack();
-				}, 1000);
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	.reim-add-page {
-		min-height: 100vh;
-		background: #292929;
-		padding-bottom: 120rpx;
-	}
-
-	.header-bar {
-		padding: 32rpx;
-
-		.title {
-			font-size: 44rpx;
-			color: #fff;
-			font-weight: bold;
-		}
-	}
-
-	.form-box {
-		margin: 0 32rpx;
-		background: #434544;
-		border-radius: 18rpx;
-		padding: 0 24rpx;
-	}
-
-	.form-row,
-	.form-row-top {
-		display: flex;
-		padding: 32rpx 0;
-		border-bottom: 1rpx solid #3a3a3a;
-
-		&:last-of-type {
-			border-bottom: none;
-		}
-	}
-
-	.form-row {
-		align-items: center;
-	}
-
-	.form-row-top {
-		align-items: flex-start;
-	}
-
-	.label {
-		color: #aaa;
-		font-size: 28rpx;
-		width: 180rpx;
-		flex-shrink: 0;
-	}
-
-	.input-amount {
-		flex: 1;
-		color: #fff;
-		font-size: 28rpx;
-		text-align: right;
-	}
-
-	.textarea {
-		flex: 1;
-		height: 180rpx;
-		color: #fff;
-		font-size: 28rpx;
-		background-color: transparent;
-		padding: 0;
-		width: 100%;
-	}
-
-	.file-upload-wrapper {
-		flex: 1;
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		gap: 20rpx;
-	}
-
-	.upload-btn {
-		background: #24BA9F;
-		color: #fff;
-		border: none;
-		border-radius: 8rpx;
-		padding: 0 32rpx;
-		line-height: 64rpx;
-		height: 64rpx;
-		font-size: 26rpx;
-		margin: 0;
-	}
-
-	.preview-box {
-		.preview-img {
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 8rpx;
-			background: #222;
-			border: 1rpx solid #333;
-		}
-
-		.file-link {
-			color: #24BA9F;
-			font-size: 26rpx;
-			word-break: break-all;
-		}
-	}
-
-	.save-btn-box {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 100;
-		background: #292929;
-		padding: 20rpx 40rpx 40rpx 40rpx;
-		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.12);
-	}
-</style>
\ No newline at end of file
diff --git a/uniapp/pages/market/reimbursement/detail.vue b/uniapp/pages/market/reimbursement/detail.vue
deleted file mode 100644
index 62f14af5..00000000
--- a/uniapp/pages/market/reimbursement/detail.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <view class="reim-detail-page">
-    <view class="header-bar">
-      <view class="title">报销详情</view>
-    </view>
-    <view class="detail-box">
-      <view class="row">
-        <view class="label">报销金额</view>
-        <view class="value">￥{{ detail.amount }}</view>
-      </view>
-      <view class="row">
-        <view class="label">报销描述</view>
-        <view class="value">{{ detail.description }}</view>
-      </view>
-      <view class="row">
-        <view class="label">发票/收据</view>
-        <view class="value">
-          <image v-if="detail.receipt_url && isImage(detail.receipt_url)" :src="detail.receipt_url" class="receipt-img" mode="aspectFit" />
-          <view v-else-if="detail.receipt_url" class="file-link">{{ detail.receipt_url }}</view>
-          <text v-else>无附件</text>
-        </view>
-      </view>
-      <view class="row">
-        <view class="label">状态</view>
-        <view :class="['value', 'status-' + detail.status]">{{ statusMap[detail.status] || detail.status }}</view>
-      </view>
-      <view class="row">
-        <view class="label">创建时间</view>
-        <view class="value">{{ detail.created_at }}</view>
-      </view>
-      <view class="row">
-        <view class="label">修改时间</view>
-        <view class="value">{{ detail.updated_at }}</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      detail: {},
-      statusMap: {
-        pending: '待审批',
-        approved: '已批准',
-        rejected: '已拒绝',
-      },
-    }
-  },
-  onLoad(options) {
-    if (options.id) {
-      this.fetchDetail(options.id);
-    } else {
-      uni.showToast({ title: '缺少报销ID', icon: 'none' });
-      uni.navigateBack();
-    }
-  },
-  methods: {
-    fetchDetail(id) {
-      // 模拟接口获取详情
-      uni.showLoading({ title: '加载中...' });
-      setTimeout(() => {
-         const mockData = {
-          id: id,
-          amount: 300.00,
-          description: '办公用品采购（已批准）',
-          receipt_url: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-          status: 'approved',
-          created_at: '2024-06-02 09:30',
-          updated_at: '2024-06-03 12:00',
-        };
-        this.detail = mockData;
-        uni.hideLoading();
-      }, 500);
-    },
-    isImage(url) {
-      if (!url) return false;
-      return /\.(jpg|jpeg|png|gif|bmp)$/i.test(url)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.reim-detail-page {
-  min-height: 100vh;
-  background: #292929;
-}
-.header-bar {
-  padding: 32rpx 32rpx 0 32rpx;
-  .title {
-    font-size: 36rpx;
-    color: #24BA9F;
-    font-weight: bold;
-  }
-}
-.detail-box {
-  margin: 32rpx;
-  background: #434544;
-  border-radius: 18rpx;
-  padding: 32rpx 24rpx 24rpx 24rpx;
-}
-.row {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 32rpx;
-  .label {
-    color: #aaa;
-    font-size: 28rpx;
-    width: 180rpx;
-    flex-shrink: 0;
-    margin-top: 10rpx;
-  }
-  .value {
-    color: #fff;
-    font-size: 28rpx;
-    word-break: break-all;
-  }
-  .status-pending { color: #f0ad4e; }
-  .status-approved { color: #24BA9F; }
-  .status-rejected { color: #e74c3c; }
-  .receipt-img {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 8rpx;
-    background: #222;
-    border: 1rpx solid #333;
-  }
-  .file-link {
-    color: #24BA9F;
-    font-size: 26rpx;
-    word-break: break-all;
-  }
-}
-</style> 
\ No newline at end of file
diff --git a/uniapp/pages/market/reimbursement/list.vue b/uniapp/pages/market/reimbursement/list.vue
deleted file mode 100644
index f5eb4d60..00000000
--- a/uniapp/pages/market/reimbursement/list.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <view class="reim-list-page">
-    <view class="header-bar">
-      <view class="title">报销列表</view>
-      <fui-button
-        background="transparent"
-        color="#24BA9F"
-        borderColor="#24BA9F"
-        width="180rpx"
-        height="64rpx"
-        radius="32rpx"
-        @click="goAdd">
-        新增报销
-      </fui-button>
-    </view>
-    <view v-if="list.length === 0" class="empty-tip">暂无报销记录</view>
-    <view v-for="item in list" :key="item.id" class="reim-card" @click="goDetail(item)">
-      <view class="row">
-        <view class="label">金额：</view>
-        <view class="value">￥{{ item.amount }}</view>
-      </view>
-      <view class="row">
-        <view class="label">描述：</view>
-        <view class="value">{{ item.description }}</view>
-      </view>
-      <view class="row">
-        <view class="label">发票/收据：</view>
-        <view class="value">
-          <image v-if="item.receipt_url" :src="item.receipt_url" class="receipt-img" mode="aspectFit" />
-          <text v-else>无附件</text>
-        </view>
-      </view>
-      <view class="row">
-        <view class="label">状态：</view>
-        <view :class="['value', 'status-' + item.status]">{{ statusMap[item.status] || item.status }}</view>
-      </view>
-      <view class="row">
-        <view class="label">创建时间：</view>
-        <view class="value">{{ item.created_at }}</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import apiRoute from '@/api/apiRoute.js';
-export default {
-  data() {
-    return {
-      list: [],
-      statusMap: {
-        pending: '待审批',
-        approved: '已批准',
-        rejected: '已拒绝',
-      },
-    }
-  },
-  async onShow() {
-    await this.reimbursementList();
-  },
-  methods: {
-	async reimbursementList(){
-		let res = await apiRoute.reimbursement_list({})
-		this.list = res.data;
-		
-	},
-    goAdd() {
-      uni.navigateTo({
-        url: '/pages-market/reimbursement/add'
-      });
-    },
-    goDetail(item) {
-      // 待审批状态可编辑，否则只能查看
-      if (item.status === 'pending') {
-        this.$navigateToPage(`/pages-market/reimbursement/add`, {
-          id: item.id
-        });
-      } else {
-        this.$navigateToPage(`/pages-market/reimbursement/detail`, {
-          id: item.id
-        });
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.reim-list-page {
-  min-height: 100vh;
-  background: #292929;
-  padding-bottom: 120rpx;
-}
-.header-bar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx 32rpx 0 32rpx;
-  .title {
-    font-size: 36rpx;
-    color: #fff;
-    font-weight: bold;
-  }
-}
-.empty-tip {
-  color: #888;
-  text-align: center;
-  margin: 80rpx 0;
-}
-.reim-card {
-  background: #434544;
-  border-radius: 18rpx;
-  margin: 32rpx;
-  margin-bottom: 0;
-  padding: 32rpx 24rpx 24rpx 24rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
-  .row {
-    display: flex;
-    align-items: center;
-    margin-bottom: 18rpx;
-    .label {
-      color: #aaa;
-      font-size: 26rpx;
-      width: 140rpx;
-      flex-shrink: 0;
-    }
-    .value {
-      color: #fff;
-      font-size: 28rpx;
-      word-break: break-all;
-    }
-    .status-pending { color: #f0ad4e; }
-    .status-approved { color: #24BA9F; }
-    .status-rejected { color: #e74c3c; }
-    .receipt-img {
-      width: 120rpx;
-      height: 120rpx;
-      border-radius: 8rpx;
-      background: #222;
-      border: 1rpx solid #333;
-    }
-  }
-}
-</style> 
\ No newline at end of file

From 2324c324586831269673c4ee3413fde651e60f62 Mon Sep 17 00:00:00 2001
From: zeyan <258785420@qq.com>
Date: Wed, 29 Oct 2025 18:10:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiController/StudentManager.php          |   45 +-
 niucloud/app/api/route/route.php              |    1 +
 .../service/api/apiService/StudentService.php |   27 +-
 .../service/api/student/StudentService.php    |    1 +
 uniapp/api/apiRoute.js                        | 1614 +----------------
 .../client-info-card/client-info-card.vue     |   46 +-
 uniapp/components/order-list-card/index.vue   |  911 ++++++++--
 .../order-list-card/qrcode-payment-dialog.vue |  207 +++
 uniapp/components/schedule/ScheduleDetail.vue |  274 ++-
 .../student-edit-popup.less                   |   49 +-
 .../student-edit-popup/student-edit-popup.vue |   70 +-
 .../student-info-card/student-info-card.vue   |   24 +-
 .../coach/schedule/schedule_table.vue         |   62 +-
 .../clue/class_arrangement_detail.vue         |    1 +
 uniapp/pages-market/clue/clue_info.vue        |  718 +-------
 uniapp/pages-market/clue/edit_clues.vue       |  201 +-
 16 files changed, 1588 insertions(+), 2663 deletions(-)
 create mode 100644 uniapp/components/order-list-card/qrcode-payment-dialog.vue

diff --git a/niucloud/app/api/controller/apiController/StudentManager.php b/niucloud/app/api/controller/apiController/StudentManager.php
index fc983a89..7ddb4c67 100644
--- 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/route/route.php b/niucloud/app/api/route/route.php
index a546e51d..2efb4a03 100644
--- 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');
diff --git a/niucloud/app/service/api/apiService/StudentService.php b/niucloud/app/service/api/apiService/StudentService.php
index 8efa76a8..9a00827f 100644
--- 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 100644
--- 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..7b098c89 100644
--- 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
   },
   //学生详情
@@ -730,370 +528,101 @@ export default {
   //↓↓↓↓↓↓↓↓↓↓↓↓-----课程预约相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
   // 获取可预约课程列表
   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 +656,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 +753,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 +917,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 +966,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 +974,7 @@ export default {
 
   // 获取知识文章列表
   async getKnowledgeList(data = {}) {
-    try {
-      const params = {
+    const params = {
         category: data.category,
         page: data.page || 1,
         limit: data.limit || 10,
@@ -1837,110 +982,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 +1018,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 +1040,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 +1071,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 100644
--- 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/order-list-card/index.vue b/uniapp/components/order-list-card/index.vue
index b3f4dda1..ec422d77 100644
--- a/uniapp/components/order-list-card/index.vue
+++ b/uniapp/components/order-list-card/index.vue
@@ -1,150 +1,760 @@
-<!--订单列表内容组件-->
+<!--订单列表组件 - 独立业务组件-->
 <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>
   </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
+  },
+
   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,
+
+      // 当前操作的订单
+      currentOrder: 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':
+          this.processCashPayment(order)
+          break
+        case 'scan_code':
+          this.processQRCodePayment(order)
+          break
+        case 'subscription':
+          this.processSubscriptionPayment(order)
+          break
+        case 'wxpay_online':
+          this.processWechatPayment(order)
+          break
+        default:
+          uni.showToast({ title: '不支持的支付方式', icon: 'none' })
+      }
+    },
+
+    /**
+     * 现金支付处理
+     */
+    async processCashPayment(order) {
+      uni.showModal({
+        title: '现金支付确认',
+        content: `确认已收到现金支付 ¥${order.total_amount}？`,
+        success: async (res) => {
+          if (res.confirm) {
+            await this.updateOrderPaymentStatus(order, 'paid', `CASH${Date.now()}`)
+          }
+        }
+      })
+    },
+
+    /**
+     * 二维码支付处理
+     */
+    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()
+        } else {
+          uni.showToast({ title: res.msg || '获取支付二维码失败', icon: 'none' })
+        }
+      } catch (error) {
+        uni.hideLoading()
+        console.error('获取支付二维码失败:', error)
+        uni.showToast({ title: '获取支付二维码失败', icon: 'none' })
+      }
+    },
+
+    /**
+     * 订阅支付处理
+     */
+    processSubscriptionPayment(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.updateOrderPaymentStatus(order, 'partial', `SUB${Date.now()}`)
+                }
+              }
+            })
+          }
+        }
+      })
+    },
+
+    /**
+     * 微信支付处理
+     */
+    processWechatPayment(order) {
+      uni.showModal({
+        title: '微信支付',
+        content: `将调用微信支付 ¥${order.total_amount}`,
+        confirmText: '确认支付',
+        cancelText: '取消',
+        success: async (res) => {
+          if (res.confirm) {
+            uni.showLoading({ title: '正在调用微信支付...' })
+
+            setTimeout(async () => {
+              uni.hideLoading()
+
+              uni.showModal({
+                title: '支付结果',
+                content: '微信支付完成,请确认是否已收到款项？',
+                success: async (confirmRes) => {
+                  if (confirmRes.confirm) {
+                    await this.updateOrderPaymentStatus(order, 'paid', `WX${Date.now()}`)
+                  }
+                }
+              })
+            }, 1500)
+          }
+        }
+      })
+    },
+
+    /**
+     * 更新订单支付状态
+     */
+    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.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)
+            }
+          }
+        }
+      })
+    },
+
+    /**
+     * 查看订单详情
+     */
+    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 +765,11 @@ export default {
       }
       return statusMap[status] || 'status-default'
     },
-    
-    // 获取状态文本
+
+    /**
+     * 获取状态文本
+     */
     getStatusText(status) {
-      if (!status) return '未知状态'
-      
       const statusMap = {
         'pending': '待支付',
         'paid': '已支付',
@@ -170,8 +780,10 @@ export default {
       }
       return statusMap[status] || '未知状态'
     },
-    
-    // 格式化时间
+
+    /**
+     * 格式化时间
+     */
     formatTime(timeStr) {
       if (!timeStr) return ''
       try {
@@ -190,6 +802,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 +833,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 +874,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 +959,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 +1032,7 @@ export default {
   font-size: 28rpx;
   font-weight: 500;
   transition: all 0.3s ease;
-  
+
   &:active {
     background: #1fb396;
   }
@@ -437,7 +1054,7 @@ export default {
   font-size: 26rpx;
   font-weight: 500;
   transition: all 0.3s ease;
-  
+
   &:active {
     background: #1fb396;
   }
@@ -453,4 +1070,4 @@ export default {
 .add-text {
   font-size: 26rpx;
 }
-</style>
\ No newline at end of file
+</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 100644
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 4b2246cd..5271bf7f 100644
--- 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>
@@ -186,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">
@@ -226,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>
@@ -250,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>
@@ -275,7 +291,7 @@
 				</view>
 			</view>
 		</fui-modal>
-	</fui-modal>
+	</view>
 </template>
 
 <script>
@@ -296,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 = {
@@ -369,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;
@@ -410,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获取
@@ -433,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),
 									// 确保包含课程进度数据
@@ -446,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',
@@ -455,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,
@@ -485,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
 							};
 						}
@@ -562,7 +589,11 @@
 
 			// 学员点击处理
 			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({
@@ -575,13 +606,18 @@
 
 				// 检查是否是等待位学员
 				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);
 				}
 			},
 
@@ -796,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);
+								}
 							}
 
 							// 发射事件给父组件
@@ -949,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;
@@ -957,6 +1031,7 @@
 		padding: 20rpx 30rpx;
 		background: #2a2a2a;
 		border-bottom: 1px solid #3a3a3a;
+		flex-shrink: 0;
 	}
 
 	.modal-title {
@@ -994,7 +1069,7 @@
 
 	.schedule-detail {
 		padding: 20rpx;
-		max-height: 80vh;
+		flex: 1;
 		overflow-y: auto;
 		position: relative;
 	}
@@ -1724,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 100644
--- 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 100644
--- 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 100644
--- 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/pages-coach/coach/schedule/schedule_table.vue b/uniapp/pages-coach/coach/schedule/schedule_table.vue
index 5aaac5a6..81d42e8a 100644
--- 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 100644
--- 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 6fc434a1..d9735454 100644
--- a/uniapp/pages-market/clue/clue_info.vue
+++ b/uniapp/pages-market/clue/clue_info.vue
@@ -138,8 +138,12 @@
 			<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" />
@@ -170,57 +174,11 @@
 			@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>
 
 <script>
 	import apiRoute from '@/api/apiRoute.js'
-	import dictUtilSimple from '@/common/dictUtilSimple.js'
 	// 组件导入
 	import ClientInfoCard from '@/components/client-info-card/client-info-card.vue'
 	import StudentInfoCard from '@/components/student-info-card/student-info-card.vue'
@@ -234,7 +192,6 @@
 	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'
@@ -253,7 +210,6 @@
 			CourseInfoCard,
 			OrderListCard,
 			ServiceListCard,
-			OrderFormPopup,
 			StudentEditPopup,
 			FitnessRecordPopup,
 			StudyPlanPopup
@@ -281,19 +237,8 @@
 				// 底部弹窗相关
 				currentPopup: null,
 				studyPlanList: [],
-				orderList: [],
 				serviceList: [],
 
-				// 订单表单弹窗
-				showOrderForm: false,
-
-				// 二维码支付弹窗
-				showQRCodeModal: false,
-				qrCodePaymentData: null,
-
-				// 字典数据
-				paymentTypeDict: [], // 支付方式字典
-
 				// 编辑相关
 				remark_content: '',
 				currentRecord: null,
@@ -412,82 +357,8 @@
 		},
 		methods: {
 
-			/**
-			 * 加载字典数据
-			 */
-			async loadDictData() {
-				try {
-					console.log('开始加载支付方式字典数据')
-					const dictResult = await dictUtilSimple.getBatchDict(['payment_type'])
-
-					if (dictResult.payment_type && Array.isArray(dictResult.payment_type)) {
-						this.paymentTypeDict = dictResult.payment_type
-						console.log('支付方式字典加载成功:', this.paymentTypeDict)
-					} else {
-						console.warn('支付方式字典数据格式不正确:', dictResult.payment_type)
-						// 使用备用数据
-						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'
-						}
-					]
-				}
-			},
-
 			async init() {
 				try {
-					// 加载字典数据
-					await this.loadDictData()
-
 					await this.getInfo()
 					await Promise.all([
 						this.getUserInfo(),
@@ -673,7 +544,7 @@
 						this.currentPopup = 'study_plan'
 						break
 					case 'order_list':
-						await this.getOrderList(student.id)
+						// 订单列表由组件内部自动加载,只需打开弹窗
 						this.currentPopup = 'order_list'
 						break
 					case 'service_list':
@@ -688,7 +559,6 @@
 				this.currentPopup = null
 				// 重置相关数据
 				this.studyPlanList = []
-				this.orderList = []
 				this.serviceList = []
 				this.courseInfo = []
 				this.fitnessRecords = []
@@ -1295,574 +1165,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) {
-				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'
-			},
-
-			// 获取服务列表
-			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)
+				// 可以在这里添加支付成功后的业务逻辑,例如刷新其他相关数据
 			},
 
 			// 获取赠品记录列表
diff --git a/uniapp/pages-market/clue/edit_clues.vue b/uniapp/pages-market/clue/edit_clues.vue
index d8ac24f7..ff389036 100644
--- 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>

From 51987f8b1006e554fde2e47901a8d467c79ac96a Mon Sep 17 00:00:00 2001
From: zeyan <258785420@qq.com>
Date: Wed, 29 Oct 2025 21:07:05 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
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 +-
 .../controller/order_table/OrderTable.php     |   9 +
 niucloud/app/adminapi/route/order_table.php   |   3 +
 .../controller/apiController/OrderTable.php   |  16 +
 niucloud/app/api/route/file.php               |   1 +
 niucloud/app/api/route/route.php              |   3 +-
 .../app/job/schedule/HandleCourseSchedule.php | 122 ++---
 niucloud/app/model/order_table/OrderTable.php |  14 +
 .../admin/order_table/OrderTableService.php   |  39 ++
 .../api/apiService/OrderTableService.php      |  69 +++
 uniapp/api/apiRoute.js                        |   3 +
 .../fitness-record-list-popup/index.vue       | 225 ++++++++
 .../fitness-record-popup.less                 |  27 +
 .../fitness-record-popup.vue                  |  56 +-
 uniapp/components/order-form-popup/index.vue  | 299 ++++++++++-
 uniapp/components/order-list-card/index.vue   | 184 +++++--
 .../order-list-card/payment-voucher-popup.vue | 505 ++++++++++++++++++
 .../study-plan-popup/study-plan-popup.vue     |  87 ++-
 uniapp/pages-market/clue/clue_info.vue        |  76 +--
 21 files changed, 1906 insertions(+), 258 deletions(-)
 create mode 100644 admin/src/app/views/order_table/components/order-detail-dialog.vue
 create mode 100644 uniapp/components/fitness-record-list-popup/index.vue
 create mode 100644 uniapp/components/order-list-card/payment-voucher-popup.vue

diff --git a/admin/src/app/api/order_table.ts b/admin/src/app/api/order_table.ts
index 1f14815f..7960f279 100644
--- 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 100644
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 100644
--- 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/niucloud/app/adminapi/controller/order_table/OrderTable.php b/niucloud/app/adminapi/controller/order_table/OrderTable.php
index 6a4a1de3..8ba7ccfa 100644
--- 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/route/order_table.php b/niucloud/app/adminapi/route/order_table.php
index 831b1170..f24512fb 100644
--- 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 100644
--- 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/route/file.php b/niucloud/app/api/route/file.php
index 64b01813..19acfaff 100644
--- 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 2efb4a03..3f885643 100644
--- a/niucloud/app/api/route/route.php
+++ b/niucloud/app/api/route/route.php
@@ -317,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 100644
--- 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 100644
--- 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/order_table/OrderTableService.php b/niucloud/app/service/admin/order_table/OrderTableService.php
index ccb9d9a5..2d53f797 100644
--- 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 100644
--- 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/uniapp/api/apiRoute.js b/uniapp/api/apiRoute.js
index 7b098c89..33ccf058 100644
--- a/uniapp/api/apiRoute.js
+++ b/uniapp/api/apiRoute.js
@@ -525,6 +525,9 @@ export default {
     return await http.get('/checkOrderPaymentStatus', data)
   },
 
+  async updateOrderPaymentVoucher(data = {}) {
+    return await http.post('/updateOrderPaymentVoucher', data)
+  },
   //↓↓↓↓↓↓↓↓↓↓↓↓-----课程预约相关接口-----↓↓↓↓↓↓↓↓↓↓↓↓
   // 获取可预约课程列表
   async getAvailableCourses(data = {}) {
diff --git a/uniapp/components/fitness-record-list-popup/index.vue b/uniapp/components/fitness-record-list-popup/index.vue
new file mode 100644
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 100644
--- 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 100644
--- 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 0c1bfa6f..46224b03 100644
--- 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">
@@ -127,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',
@@ -148,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: '',
@@ -168,14 +209,16 @@ export default {
       selectedIndex: 0,
       
       // 为每个选择器维护独立的索引状态
+      campusSelectedIndex: -1,
       courseSelectedIndex: -1,
       paymentSelectedIndex: -1,
       orderTypeSelectedIndex: -1,
       giftSelectedIndex: -1,
       giftTypeSelectedIndex: -1,
       classSelectedIndex: -1,
-      
+
       // 数据选项
+      campusList: [],   // 校区列表
       courseList: [],
       paymentTypes: [], // 从字典接口获取
       orderTypes: [],   // 从字典接口获取
@@ -184,10 +227,17 @@ export default {
       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)
     },
@@ -205,6 +255,12 @@ export default {
     },
     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: {
@@ -213,6 +269,7 @@ export default {
       if (newVal) {
         console.log('开始初始化表单和加载数据')
         this.initForm()
+        this.loadCampusList() // 加载校区列表
         this.loadCourseList()
         this.loadDictionaries() // 加载字典数据
         this.loadGiftList() // 加载可用赠品列表
@@ -223,8 +280,10 @@ export default {
       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()
           }
         }
@@ -238,6 +297,7 @@ export default {
     // 如果组件挂载时 visible 为 true，主动加载数据
     if (this.visible) {
       console.log('组件挂载时 visible 为 true，开始加载数据')
+      this.loadCampusList()
       this.loadCourseList()
       this.loadDictionaries()
       this.loadGiftList()
@@ -248,8 +308,10 @@ export default {
     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: '',
@@ -259,16 +321,49 @@ export default {
         remark: '',
         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 {
@@ -413,18 +508,20 @@ export default {
 
     /**
      * 加载班级列表
+     * @param {Number} campusId - 校区ID，如果不传则使用formData.campus_id
      */
-    async loadClassList() {
-      console.log('开始加载班级列表，校区ID:', this.studentInfo?.campus_id)
+    async loadClassList(campusId) {
+      const targetCampusId = campusId || this.formData.campus_id
+      console.log('开始加载班级列表，校区ID:', targetCampusId)
       try {
-        if (!this.studentInfo?.campus_id) {
+        if (!targetCampusId) {
           console.warn('缺少校区ID，无法加载班级列表')
           this.classList = []
           return
         }
 
         const res = await apiRoute.getClassListForSchedule({
-          campus_id: this.studentInfo.campus_id
+          campus_id: targetCampusId
         })
         console.log('班级列表API响应:', res)
 
@@ -445,7 +542,25 @@ export default {
         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 = '选择课程'
@@ -571,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
@@ -591,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
@@ -625,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
@@ -827,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 ec422d77..00acb74e 100644
--- a/uniapp/components/order-list-card/index.vue
+++ b/uniapp/components/order-list-card/index.vue
@@ -127,6 +127,16 @@
         @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>
 
@@ -140,7 +150,8 @@ export default {
   name: 'OrderListCard',
   components: {
     OrderFormPopup,
-    QRCodePaymentDialog
+    QRCodePaymentDialog,
+    PaymentVoucherPopup: () => import('./payment-voucher-popup.vue')
   },
 
   props: {
@@ -180,10 +191,14 @@ export default {
       // 弹窗状态
       showOrderForm: false,
       showQRCodeModal: false,
+      showPaymentVoucherPopup: false,
 
       // 当前操作的订单
       currentOrder: null,
 
+      // 二维码支付轮询定时器
+      paymentPollingTimer: null,
+
       // 二维码支付数据
       qrCodePaymentData: null,
 
@@ -422,7 +437,9 @@ export default {
 
       switch(paymentType) {
         case 'cash':
-          this.processCashPayment(order)
+        case 'client_wxpay':
+        case 'deposit':
+          this.processVoucherPayment(order)
           break
         case 'scan_code':
           this.processQRCodePayment(order)
@@ -431,7 +448,7 @@ export default {
           this.processSubscriptionPayment(order)
           break
         case 'wxpay_online':
-          this.processWechatPayment(order)
+          this.processWechatOnlinePayment(order)
           break
         default:
           uni.showToast({ title: '不支持的支付方式', icon: 'none' })
@@ -439,18 +456,12 @@ export default {
     },
 
     /**
-     * 现金支付处理
+     * 上传支付凭证的支付方式处理(cash, client_wxpay, deposit)
      */
-    async processCashPayment(order) {
-      uni.showModal({
-        title: '现金支付确认',
-        content: `确认已收到现金支付 ¥${order.total_amount}？`,
-        success: async (res) => {
-          if (res.confirm) {
-            await this.updateOrderPaymentStatus(order, 'paid', `CASH${Date.now()}`)
-          }
-        }
-      })
+    processVoucherPayment(order) {
+      this.currentOrder = order
+      this.showPaymentVoucherPopup = true
+      this.$refs.paymentVoucherPopup.open()
     },
 
     /**
@@ -474,6 +485,9 @@ export default {
           }
           this.showQRCodeModal = true
           this.$refs.qrCodePopup.open()
+
+          // 开始轮询支付状态
+          this.startPaymentPolling(order.order_no)
         } else {
           uni.showToast({ title: res.msg || '获取支付二维码失败', icon: 'none' })
         }
@@ -485,55 +499,67 @@ export default {
     },
 
     /**
-     * 订阅支付处理
+     * 开始轮询支付状态
      */
-    processSubscriptionPayment(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.updateOrderPaymentStatus(order, 'partial', `SUB${Date.now()}`)
-                }
-              }
-            })
+    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
+      }
     },
 
     /**
-     * 微信支付处理
+     * 订阅支付处理
      */
-    processWechatPayment(order) {
+    processSubscriptionPayment(order) {
       uni.showModal({
-        title: '微信支付',
-        content: `将调用微信支付 ¥${order.total_amount}`,
-        confirmText: '确认支付',
-        cancelText: '取消',
-        success: async (res) => {
-          if (res.confirm) {
-            uni.showLoading({ title: '正在调用微信支付...' })
-
-            setTimeout(async () => {
-              uni.hideLoading()
-
-              uni.showModal({
-                title: '支付结果',
-                content: '微信支付完成,请确认是否已收到款项？',
-                success: async (confirmRes) => {
-                  if (confirmRes.confirm) {
-                    await this.updateOrderPaymentStatus(order, 'paid', `WX${Date.now()}`)
-                  }
-                }
-              })
-            }, 1500)
-          }
-        }
+        title: '订阅服务说明',
+        content: '每日支付超过3000笔后解锁订阅服务',
+        showCancel: false,
+        confirmText: '知道了'
+      })
+    },
+
+    /**
+     * 微信在线代付处理(本阶段只定义函数)
+     */
+    processWechatOnlinePayment(order) {
+      // TODO: 后续实现微信在线代付功能
+      uni.showToast({
+        title: '微信在线代付功能开发中',
+        icon: 'none'
       })
     },
 
@@ -580,6 +606,9 @@ export default {
      * 关闭二维码支付弹窗
      */
     closeQRCodeModal() {
+      // 停止轮询
+      this.stopPaymentPolling()
+
       this.showQRCodeModal = false
       this.qrCodePaymentData = null
       this.$refs.qrCodePopup.close()
@@ -609,6 +638,51 @@ export default {
       })
     },
 
+    /**
+     * 关闭支付凭证弹窗
+     */
+    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 })
+      }
+    },
+
     /**
      * 查看订单详情
      */
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 100644
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/study-plan-popup/study-plan-popup.vue b/uniapp/components/study-plan-popup/study-plan-popup.vue
index 37278209..2ca2d498 100644
--- 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-market/clue/clue_info.vue b/uniapp/pages-market/clue/clue_info.vue
index d9735454..f0d7964c 100644
--- a/uniapp/pages-market/clue/clue_info.vue
+++ b/uniapp/pages-market/clue/clue_info.vue
@@ -120,20 +120,6 @@
 			<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" />
 
@@ -168,6 +154,16 @@
 			</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"
@@ -196,6 +192,8 @@
 	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: {
@@ -212,7 +210,8 @@
 			ServiceListCard,
 			StudentEditPopup,
 			FitnessRecordPopup,
-			StudyPlanPopup
+			StudyPlanPopup,
+			FitnessRecordListPopup
 		},
 		data() {
 			return {
@@ -238,6 +237,9 @@
 				currentPopup: null,
 				studyPlanList: [],
 				serviceList: [],
+				
+				// 体测记录列表弹窗
+				showFitnessListPopup: false,
 
 				// 编辑相关
 				remark_content: '',
@@ -335,8 +337,8 @@
 			},
 
 			showAddButton() {
-				// 只有体测记录和学习计划弹窗显示新增按钮
-				return ['fitness_record', 'study_plan'].includes(this.currentPopup)
+				// 只有学习计划弹窗显示新增按钮
+				return ['study_plan'].includes(this.currentPopup)
 			},
 
 		},
@@ -536,9 +538,10 @@
 						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'
@@ -561,13 +564,15 @@
 				this.studyPlanList = []
 				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()
 				}
 			},
@@ -1198,28 +1203,5 @@
 </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>

From a580c2580a28884b4c26cb6e8929dbac5a3999ac Mon Sep 17 00:00:00 2001
From: zeyan <258785420@qq.com>
Date: Thu, 30 Oct 2025 13:37:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../campus_person_role/CampusPersonRole.php       |  5 ++++-
 .../adminapi/controller/personnel/Personnel.php   |  2 ++
 .../CampusPersonRoleService.php                   | 15 ++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

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 100644
--- 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/personnel/Personnel.php b/niucloud/app/adminapi/controller/personnel/Personnel.php
index e82ff02c..021b808a 100644
--- 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/service/admin/campus_person_role/CampusPersonRoleService.php b/niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php
index d7a1a6a1..c9d9ea63 100644
--- 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();
     }