From f149bfebc54d05f12adbe1d3d5c2ccbc5efc4df6 Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Wed, 25 Jun 2025 12:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-popup/uni-popup-dialog.vue |   8 +-
 config.js                                 |  15 -
 pages/market/clue/add_clues.vue           |  13 +-
 pages/market/clue/clue_info.vue           | 344 +++++-----
 pages/market/clue/edit_clues.vue          |  28 +-
 pages/market/clue/index.vue               |  10 +-
 pages/market/clue/order_list.vue          | 350 ++++++----
 pages/market/data/index.vue               |   9 -
 pages/market/data/statistics.vue          | 737 ++++++++++++----------
 pages/student/login/login.vue             |   2 +-
 10 files changed, 891 insertions(+), 625 deletions(-)
 delete mode 100644 config.js

diff --git a/components/uni-popup/uni-popup-dialog.vue b/components/uni-popup/uni-popup-dialog.vue
index c91123c..ac8e755 100644
--- a/components/uni-popup/uni-popup-dialog.vue
+++ b/components/uni-popup/uni-popup-dialog.vue
@@ -217,7 +217,7 @@
 	}
 
 	.uni-button-color {
-		color: $uni-color-primary;
+		color: $color-primary;
 	}
 
 	.uni-dialog-input {
@@ -226,15 +226,15 @@
 	}
 
 	.uni-popup__success {
-		color: $uni-color-success;
+		color: $color-success;
 	}
 
 	.uni-popup__warn {
-		color: $uni-color-warning;
+		color: $color-warning;
 	}
 
 	.uni-popup__error {
-		color: $uni-color-error;
+		color: $color-error;
 	}
 
 	.uni-popup__info {
diff --git a/config.js b/config.js
deleted file mode 100644
index 47f214a..0000000
--- a/config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-export default {
-	server: "http://medication.zeyan.wang",
-	appName: "要药提醒",
-	
-	
-	// #ifdef APP-PLUS
-	version: plus.runtime.version,
-	varsionCode: plus.runtime.versionCode,
-	// #endif
-	// #ifndef APP-PLUS
-	version: '1.0.0',
-	// #endif
-}
-
diff --git a/pages/market/clue/add_clues.vue b/pages/market/clue/add_clues.vue
index ec24fce..086b097 100644
--- a/pages/market/clue/add_clues.vue
+++ b/pages/market/clue/add_clues.vue
@@ -74,7 +74,8 @@
 			  <fui-form-item
 			      label="校区"
 			      labelSize='26'
-			      prop=""
+			      prop="campus"
+				  asterisk asteriskPosition="right"
 			      background='#434544'
 			      labelColor='#fff'
 			      :bottomBorder='false'
@@ -1215,6 +1216,16 @@ export default {
         this.nextStep('0')
         return false
       }
+	  //校区必填
+	  if(!data.campus){
+	    uni.showToast({
+	      title: '校区必填',
+	      icon: 'none'
+	    })
+	    this.nextStep('0')
+	    return false
+	  }
+	  
       return true
     },
     //提交
diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue
index 57e0ee8..40a800c 100644
--- a/pages/market/clue/clue_info.vue
+++ b/pages/market/clue/clue_info.vue
@@ -120,145 +120,29 @@
 
 <!--      通话记录-->
       <view class="call-log" v-if="switch_tags_type == 3">
-        <!-- 添加备注按钮 -->
-        <view style="width: 92%; margin: 20rpx auto; display: flex; justify-content: center;">
-          <button type="primary" style="background-color: #29D3B4; color: white;" @click="openAddRemark">添加备注</button>
-        </view>
-        <view style="margin-top: 20rpx" v-for="(v,k) in listCallUp" :key="k">
-<!--          <view class="basic-message">08-23</view>-->
-          <view class="follow-records-list">
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>{{v.name}}</view>
-              <view>{{v.create_time}}</view>
-            </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>呼叫时间：{{v.created_at}}</view>
-              <view>呼叫备注：{{v.remarks}}</view>
-            </view>
-          </view>
-        </view>
-        <view style="height: 200rpx;"></view>
-      </view>
-
-<!--      在籍客户-->
-      <view class="registered-clients" v-if="switch_tags_type == 4">
-        <view class="search">
-          <view :class="{'selected': select_type === 1, 'not-selected': select_type !== 1}" @click="getSelect(1)">
-            全部(320)
-          </view>
-          <view :class="{'selected': select_type === 2, 'not-selected': select_type !== 2}" @click="getSelect(2)">
-            同校(8)
-          </view>
-          <view :class="{'selected': select_type === 3, 'not-selected': select_type !== 3}" @click="getSelect(3)">
-            同班(15)
-          </view>
-          <view :class="{'selected': select_type === 4, 'not-selected': select_type !== 4}" @click="getSelect(4)">
-            同小区(12)
-          </view>
-        </view>
-        <view style="margin: 16rpx;">
-          <view class="follow-records-list">
-            <view class="same-community" v-if="true">
-              同小区
-            </view>
-            <view class="coeducation" v-if="false">
-              同校
-            </view>
-            <view class="coeducation" v-if="false">
-              同班
-            </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>包子皮</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
-              <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
-              <view>课程：课程名称1</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
-          </view>
-        </view>
-        <view style="margin: 16rpx;">
-          <view class="follow-records-list">
-            <view class="same-community" v-if="false">
-              同小区
-            </view>
-            <view class="coeducation" v-if="true">
-              同校
-            </view>
-            <view class="coeducation" v-if="false">
-              同班
-            </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>包子皮</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
-              <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
-              <view>课程：课程名称1</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
-          </view>
-        </view>
-        <view style="margin: 16rpx;">
-          <view class="follow-records-list">
-            <view class="same-community" v-if="false">
-              同小区
-            </view>
-            <view class="coeducation" v-if="false">
-              同校
-            </view>
-            <view class="coeducation" v-if="true">
-              同班
+        <view class="call-record-wrapper" v-for="(v,k) in listCallUp" :key="k">
+          <view class="call-record-item">
+            <view class="call-record-header">
+              <view class="call-name">{{v.name}}</view>
+              <view class="call-time">{{v.create_time}}</view>
             </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>包子皮</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
-              <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
-              <view>课程：课程名称1</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
-          </view>
-        </view>
-        <view style="margin: 16rpx;">
-          <view class="follow-records-list">
-            <view class="same-community" v-if="true">
-              同小区
-            </view>
-            <view class="coeducation" v-if="false">
-              同校
-            </view>
-            <view class="coeducation" v-if="false">
-              同班
-            </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>包子皮</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
-              <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
-              <view>课程：课程名称1</view>
-            </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
-          </view>
-        </view>
-        <view style="margin: 16rpx;">
-          <view class="follow-records-list">
-            <view class="same-community" v-if="true">
-              同小区
-            </view>
-            <view class="coeducation" v-if="false">
-              同校
-            </view>
-            <view class="coeducation" v-if="false">
-              同班
-            </view>
-            <view style="display: flex;justify-content: space-between;padding: 16rpx 16rpx 16rpx 60rpx;">
-              <view>包子皮</view>
+            <view class="call-record-content">
+              <view class="call-detail">
+                <text class="call-label">呼叫时间：</text>
+                <text>{{v.created_at}}</text>
+              </view>
+              <button 
+                type="primary" 
+                size="mini" 
+                class="remark-btn"
+                @click="openAddRemark(v)">
+                添加备注
+              </button>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;display: flex;justify-content: space-between;">
-              <view>合同联系人：包念念<span style="font-size: 20rpx;color: #a47332;padding-left: 12rpx;">妈妈</span></view>
-              <view>课程：课程名称1</view>
+            <view class="call-remark">
+              <text class="call-label">呼叫备注：</text>
+              <text class="call-remark-content">{{v.remarks || '无'}}</text>
             </view>
-            <view style="padding: 16rpx 16rpx 16rpx 60rpx;">2020-08-30 签单</view>
           </view>
         </view>
         <view style="height: 200rpx;"></view>
@@ -275,15 +159,19 @@
       <!-- 添加备注弹窗 -->
       <uni-popup ref="remarkPopup" type="dialog">
         <uni-popup-dialog 
-          title="添加备注" 
+          :title="currentRecord ? `添加备注 (${currentRecord.name || '未知'})` : '添加备注'" 
           :before-close="true" 
           @confirm="confirmRemark" 
           @close="closeRemark">
-          <uni-easyinput 
-            type="textarea" 
-            v-model="remark_content" 
-            placeholder="请输入备注内容">
-          </uni-easyinput>
+          <view class="remark-textarea-container">
+            <textarea 
+              class="remark-textarea"
+              v-model="remark_content" 
+              placeholder="请输入备注内容"
+              maxlength="200"
+            ></textarea>
+            <text class="remark-count">{{remark_content.length}}/200</text>
+          </view>
         </uni-popup-dialog>
       </uni-popup>
     </view>
@@ -294,8 +182,12 @@
 	import apiRoute from '@/api/apiRoute.js';
 	import marketApi from '@/api/market.js';
 
-
 	export default {
+		components: {
+			// 导入组件
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+			uniPopupDialog: () => import('@/components/uni-popup/uni-popup-dialog.vue'),
+		},
 		data() {
 			return {
 				switch_tags_type: 1,
@@ -319,6 +211,8 @@
         
         // 备注相关
         remark_content: '',
+        // 当前选中的通话记录
+        currentRecord: null,
 			}
 		},
     onLoad(options) {
@@ -607,8 +501,9 @@
       },
 
       // 打开添加备注弹窗
-      openAddRemark() {
+      openAddRemark(record) {
         this.remark_content = '';
+        this.currentRecord = record;
         this.$refs.remarkPopup.open();
       },
       
@@ -638,6 +533,12 @@
             tag: null // 标签
           };
           
+          // 如果是针对特定通话记录的备注，添加关联ID
+          if (this.currentRecord && this.currentRecord.id) {
+            params.related_record_id = this.currentRecord.id; // 关联的通话记录ID
+            console.log('添加备注到通话记录:', this.currentRecord);
+          }
+          
           const res = await apiRoute.xs_communicationRecordsAdd(params);
           
           if (res.code !== 1) {
@@ -890,11 +791,50 @@
 		background: #fff;
 		position: fixed;
 		bottom: 0;
+		left: 0;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		padding: 0 30rpx;
 	}
+	
+	// 备注文本框样式
+	.remark-textarea-container {
+		width: 100%;
+		position: relative;
+		padding: 10rpx 0;
+	}
+	
+	.remark-textarea {
+		width: 100%;
+		height: 200rpx;
+		border: 1px solid #ddd;
+		border-radius: 8rpx;
+		padding: 20rpx;
+		font-size: 28rpx;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+	}
+	
+	.remark-count {
+		position: absolute;
+		bottom: 20rpx;
+		right: 20rpx;
+		font-size: 24rpx;
+		color: #999;
+	}
+	
+	// 备注按钮样式
+	.remark-btn {
+		background-color: #29D3B4 !important; 
+		color: white !important; 
+		margin: 0 !important; 
+		padding: 0 20rpx !important; 
+		height: 60rpx !important; 
+		line-height: 60rpx !important;
+		font-size: 24rpx !important;
+		border-radius: 30rpx !important;
+	}
 	.follow-records-list{
 		width: 92%;
 		background: #434544;
@@ -959,4 +899,120 @@
 		padding: 12rpx 8rpx;
 		text-align: center;
 	}
+	.call-record-item {
+		width: 100%;
+		background: #434544;
+		border-radius: 16rpx;
+		margin: auto;
+		padding: 16rpx;
+		color: #fff;
+		position: relative;
+	}
+	.call-record-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.call-name {
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+	.call-time {
+		font-size: 24rpx;
+		color: #999;
+	}
+	.call-record-content {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.call-detail {
+		display: flex;
+		align-items: center;
+	}
+	.call-label {
+		font-size: 24rpx;
+		color: #999;
+		margin-right: 10rpx;
+	}
+	.call-remark {
+		margin-top: 10rpx;
+	}
+	.call-remark-content {
+		font-size: 24rpx;
+		color: #fff;
+	}
+	
+	// 通话记录样式
+	.call-log {
+		width: 100%;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.call-record-wrapper {
+		margin-bottom: 20rpx;
+	}
+	
+	.call-record-item {
+		width: 100%;
+		background: #3D3D3D;
+		border-radius: 16rpx;
+		padding: 20rpx;
+		color: #fff;
+		box-sizing: border-box;
+	}
+	
+	.call-record-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 15rpx;
+		border-bottom: 1px solid #4A4A4A;
+		padding-bottom: 10rpx;
+	}
+	
+	.call-name {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #fff;
+	}
+	
+	.call-time {
+		font-size: 24rpx;
+		color: #999;
+	}
+	
+	.call-record-content {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 10rpx;
+	}
+	
+	.call-detail {
+		display: flex;
+		align-items: center;
+	}
+	
+	.call-label {
+		font-size: 24rpx;
+		color: #999;
+		margin-right: 10rpx;
+	}
+	
+	.call-remark {
+		margin-top: 10rpx;
+		padding-top: 10rpx;
+		border-top: 1px solid #4A4A4A;
+	}
+	
+	.call-remark-content {
+		font-size: 24rpx;
+		color: #fff;
+		word-break: break-all;
+		display: inline-block;
+		width: 90%;
+		vertical-align: top;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/market/clue/edit_clues.vue b/pages/market/clue/edit_clues.vue
index 7ce1aff..722edfb 100644
--- a/pages/market/clue/edit_clues.vue
+++ b/pages/market/clue/edit_clues.vue
@@ -1237,7 +1237,33 @@
 			},
 			//表单验证
 			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
 			},
 			//提交
diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue
index 2d0c71b..749a1a1 100644
--- a/pages/market/clue/index.vue
+++ b/pages/market/clue/index.vue
@@ -63,7 +63,7 @@
 									是否有效：{{ v.sixSpeed && v.sixSpeed.efficacious === 1 ? '有效' : '无效' }}
 								</view>
 								<view style="padding: 12rpx;">
-									<image v-if="v.sixSpeed.efficacious === 1"
+									<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')"
@@ -667,18 +667,18 @@
 			//检索数据
 			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.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.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()
diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue
index 8566f5f..608f14f 100644
--- a/pages/market/clue/order_list.vue
+++ b/pages/market/clue/order_list.vue
@@ -291,14 +291,23 @@ export default {
     }
   },
   onLoad(options) {
-    this.filteredData.resource_id = options.resource_id//客户资源表id
+    console.log('页面加载参数:', options)
+    // 确保options中有必要的参数
+    if (!options || !options.resource_id) {
+      uni.showToast({
+        title: '缺少必要参数',
+        icon: 'none'
+      })
+      return
+    }
 
-    this.formData.resource_id = options.resource_id//客户资源表id
-    this.formData.resource_id_name = options.resource_name//客户资源表id姓名
+    this.filteredData.resource_id = options.resource_id // 客户资源表id
 
+    this.formData.resource_id = options.resource_id // 客户资源表id
+    this.formData.resource_id_name = options.resource_name || '' // 客户资源表id姓名
 
-    this.formData.staff_id = options.staff_id//员工资源表id姓名
-    this.formData.staff_id_name = options.staff_id_name//员工资源表id姓名
+    this.formData.staff_id = options.staff_id || '' // 员工资源表id
+    this.formData.staff_id_name = options.staff_id_name || '' // 员工资源表id姓名
   },
   onShow(){
     this.init()
@@ -312,15 +321,23 @@ export default {
   methods: {
 //初始化
     async init(){
-      //获取付款类型
-      await this.getPaymentTypeList()
-      //获取课程列表
-      await this.getCourseList()
-      //获取班级列表
-      await this.getClassList()
-
-      //获取列表
-      await this.getList();
+      try {
+        //获取付款类型
+        await this.getPaymentTypeList()
+        //获取课程列表
+        await this.getCourseList()
+        //获取班级列表
+        await this.getClassList()
+
+        //获取列表
+        await this.getList();
+      } catch (error) {
+        console.error('初始化失败:', error)
+        uni.showToast({
+          title: '初始化数据失败',
+          icon: 'none'
+        })
+      }
     },
 
     //加载更多(下一页)
@@ -381,75 +398,96 @@ export default {
 
     //获取付款类型
     async getPaymentTypeList(){
-      let res = await apiRoute.common_Dictionary({key:'payment_type'})
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
+      try {
+        let res = await apiRoute.common_Dictionary({key:'payment_type'})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg || '获取付款类型失败',
+            icon: 'none'
+          })
+          return
+        }
 
-      let dictionary =  res.data.dictionary
-      let arr = []
-      dictionary.forEach((v,k)=>{
-        arr.push({
-          text: v.name,
-          value: v.value,
+        let dictionary = res.data
+        let arr = []
+        dictionary.forEach((v,k) => {
+          arr.push({
+            text: v.name,
+            value: v.value,
+          })
         })
-      })
-      this.payment_type_options = arr
-      console.log('付款类型',this.payment_type_options)
+        this.payment_type_options = arr
+        console.log('付款类型', this.payment_type_options)
+      } catch (error) {
+        console.error('获取付款类型失败:', error)
+      }
     },
+    
     //获取课程列表
     async getCourseList(){
-      let params = {}
-
-      let res = await apiRoute.common_getCourseAll(params)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
+      try {
+        let params = {}
+        let res = await apiRoute.common_getCourseAll(params)
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg || '获取课程列表失败',
+            icon: 'none'
+          })
+          return
+        }
 
+        if (!res.data || !Array.isArray(res.data)) {
+          console.error('课程列表数据格式错误:', res.data)
+          return
+        }
 
-      let arr = []
-      res.data.forEach((v,k)=>{
-        arr.push({
-          text: `${v.course_name}`,
-          value: v.id,
-          price: v.price,
+        let arr = []
+        res.data.forEach((v,k) => {
+          arr.push({
+            text: `${v.course_name}`,
+            value: v.id,
+            price: v.price,
+          })
         })
-      })
-      this.course_id_options = arr
-      console.log('课程列表',this.course_id_options)
-
+        this.course_id_options = arr
+        console.log('课程列表', this.course_id_options)
+      } catch (error) {
+        console.error('获取课程列表失败:', error)
+      }
     },
+    
     //获取班级列表
     async getClassList(){
-      let params = {
-        status:1,//班级状态(1开启  2关闭)
-      }
+      try {
+        let params = {
+          status: 1, //班级状态(1开启  2关闭)
+        }
+        let res = await apiRoute.common_getClassAll(params)
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg || '获取班级列表失败',
+            icon: 'none'
+          })
+          return
+        }
 
-      let res = await apiRoute.common_getClassAll(params)
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
+        if (!res.data || !Array.isArray(res.data)) {
+          console.error('班级列表数据格式错误:', res.data)
+          return
+        }
+
+        let arr = []
+        res.data.forEach((v,k) => {
+          arr.push({
+            text: `${v.campus_name}-${v.class_name}`,
+            value: v.id,
+          })
         })
-        return
+        this.class_id_options = arr
+        console.log('班级列表', this.class_id_options)
+      } catch (error) {
+        console.error('获取班级列表失败:', error)
       }
-      console.log('班级列表',res.data)
-      let arr = []
-      res.data.forEach((v,k)=>{
-        arr.push({
-          text: `${v.campus_name}-${v.class_name}`,
-          value: v.id,
-        })
-      })
-      this.class_id_options = arr
     },
 
 
@@ -488,67 +526,116 @@ export default {
     },
     //提交表单
     async submitFormData() {
-      let param = {...this.formData}
-      //表单验证
-      //...
-      if(!param.class_id){
-        uni.showToast({
-          title: '请选择班级',
-          icon: 'none'
-        })
-        return
-      }
-      if(!param.course_id){
-        uni.showToast({
-          title: '请选择课程',
-          icon: 'none'
-        })
-        return
-      }
-      if(!param.payment_type){
-        uni.showToast({
-          title: '请选择付款类型',
-          icon: 'none'
-        })
-        return
-      }
+      try {
+        let param = {...this.formData}
+        //表单验证
+        if(!param.resource_id){
+          uni.showToast({
+            title: '客户信息缺失',
+            icon: 'none'
+          })
+          return
+        }
+        if(!param.class_id){
+          uni.showToast({
+            title: '请选择班级',
+            icon: 'none'
+          })
+          return
+        }
+        if(!param.course_id){
+          uni.showToast({
+            title: '请选择课程',
+            icon: 'none'
+          })
+          return
+        }
+        if(!param.payment_type){
+          uni.showToast({
+            title: '请选择付款类型',
+            icon: 'none'
+          })
+          return
+        }
+        if(!param.staff_id){
+          uni.showToast({
+            title: '员工信息缺失',
+            icon: 'none'
+          })
+          return
+        }
+        if(!param.money){
+          uni.showToast({
+            title: '订单金额为空',
+            icon: 'none'
+          })
+          return
+        }
 
-      console.log('提交xxx',param)
-      this.closeOrderShow()
+        console.log('提交订单数据:', param)
+        this.closeOrderShow()
 
+        uni.showLoading({
+          title: '提交中...'
+        })
 
+        let res = await apiRoute.xs_orderTableAdd(param)
+        uni.hideLoading()
+        
+        if (res.code != 1) {
+          uni.showToast({
+            title: res.msg || '创建订单失败',
+            icon: 'none'
+          })
+          return
+        }
 
-      let res = await apiRoute.xs_orderTableAdd(param)
-      if (res.code != 1) {
         uni.showToast({
-          title: res.msg,
+          title: '创建订单成功',
+          icon: 'success'
+        })
+
+        //延迟1s执行
+        setTimeout(() => {
+          this.resetFilteredData()//重置表单
+          this.getList();//刷新列表
+        }, 1500)
+      } catch (error) {
+        uni.hideLoading()
+        console.error('提交订单失败:', error)
+        uni.showToast({
+          title: '创建订单失败，请重试',
           icon: 'none'
         })
-        return
       }
-
-      uni.showToast({
-        title: '操作成功',
-        icon: 'success'
-      })
-
-      //延迟1s执行
-      setTimeout(() => {
-        this.resetFilteredData()//重置表单
-        this.getList();//刷新列表
-      }, 1500)
     },
 
 
     //下拉选择器相关-付款类型
     //监听-付款类型
     changePaymentType(e){
+      console.log('选择的付款类型:', e)
+      if (!e || !e.value) {
+        uni.showToast({
+          title: '请选择有效的付款类型',
+          icon: 'none'
+        })
+        return
+      }
       this.formData.payment_type = e.value
       this.formData.payment_type_name = e.text
       this.cancelPaymentType()
     },
     //打开选择器-付款类型
     openPaymentType(){
+      if (!this.payment_type_options || this.payment_type_options.length === 0) {
+        uni.showToast({
+          title: '付款类型数据加载中，请稍后再试',
+          icon: 'none'
+        })
+        this.getPaymentTypeList() // 尝试重新加载
+        return
+      }
       this.payment_type_show = true
     },
     //关闭选择器-付款类型
@@ -559,17 +646,38 @@ export default {
     //下拉选择器相关-课程
     //监听-课程
     changeCourseId(e){
-      console.log('课程',e)
+      console.log('选择的课程:', e)
+      if (!e || !e.value) {
+        uni.showToast({
+          title: '请选择有效的课程',
+          icon: 'none'
+        })
+        return
+      }
       this.formData.course_id = e.value
       this.formData.course_id_name = e.text
 
-      this.formData.money = this.course_id_options.find(v=>v.value == e.value).price
+      // 查找对应课程的价格
+      const selectedCourse = this.course_id_options.find(v => v.value == e.value)
+      if (selectedCourse && selectedCourse.price) {
+        this.formData.money = selectedCourse.price
+      } else {
+        this.formData.money = ''
+        console.warn('未找到所选课程的价格信息')
+      }
 
-      // console.log('课程formData',this.formData)
       this.cancelCourseId()
     },
     //打开选择器-课程
     openCourseId(){
+      if (!this.course_id_options || this.course_id_options.length === 0) {
+        uni.showToast({
+          title: '课程数据加载中，请稍后再试',
+          icon: 'none'
+        })
+        this.getCourseList() // 尝试重新加载
+        return
+      }
       this.course_id_show = true
     },
     //关闭选择器-课程
@@ -580,12 +688,28 @@ export default {
     //下拉选择器相关-班级
     //监听-班级
     changeClassId(e){
+      console.log('选择的班级:', e)
+      if (!e || !e.value) {
+        uni.showToast({
+          title: '请选择有效的班级',
+          icon: 'none'
+        })
+        return
+      }
       this.formData.class_id = e.value
       this.formData.class_id_name = e.text
       this.cancelClassId()
     },
     //打开选择器-班级
     openClassId(){
+      if (!this.class_id_options || this.class_id_options.length === 0) {
+        uni.showToast({
+          title: '班级数据加载中，请稍后再试',
+          icon: 'none'
+        })
+        this.getClassList() // 尝试重新加载
+        return
+      }
       this.class_id_show = true
     },
     //关闭选择器-班级
diff --git a/pages/market/data/index.vue b/pages/market/data/index.vue
index 35a5299..f118eb4 100644
--- a/pages/market/data/index.vue
+++ b/pages/market/data/index.vue
@@ -4,9 +4,6 @@
     <!--自定义导航栏-->
     <view class="navbar_section">
       <view class="title">数据</view>
-      <view class="statistics-btn" @click="goToStatistics">
-        <text>统计表格</text>
-      </view>
     </view>
 
 <!--    市场人员展示-->
@@ -337,12 +334,6 @@ export default {
     this.init()
   },
   methods: {
-    // 跳转到统计页面
-    goToStatistics() {
-      uni.navigateTo({
-        url: '/pages/market/data/statistics'
-      });
-    },
     
     async init(){
       await this.getUserInfo()
diff --git a/pages/market/data/statistics.vue b/pages/market/data/statistics.vue
index b37b0e9..d450bed 100644
--- a/pages/market/data/statistics.vue
+++ b/pages/market/data/statistics.vue
@@ -1,340 +1,413 @@
 <!--市场数据统计页面-->
 <template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-    <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.name}}</view>
-          <view class="th th-total">渠道合计</view>
-        </view>
-        <view class="table-body">
-          <view class="table-row" v-for="(channel, index) in channelSchoolData" :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.schools[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 marketStaffList" :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 channelStaffData" :key="index">
-            <view class="td td-channel" style="width: 100px;">{{channel.name}}</view>
-            <view class="td" v-for="(staff, sIndex) in marketStaffList" :key="sIndex">
-              {{channel.staffs[staff.id] || 0}}
-            </view>
-            <view class="td td-total">{{channel.total}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="main_box">
+		<!--自定义导航栏-->
+		<view class="navbar_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.name}}</view>
+					<view class="th th-total">渠道合计</view>
+				</view>
+				<view class="table-body">
+					<view class="table-row" v-for="(channel, index) in channelSchoolData" :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.schools[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 marketStaffList" :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 channelStaffData" :key="index">
+						<view class="td td-channel" style="width: 100px;">{{channel.name}}</view>
+						<view class="td" v-for="(staff, sIndex) in marketStaffList" :key="sIndex">
+							{{channel.staffs[staff.id] || 0}}
+						</view>
+						<view class="td td-total">{{channel.total}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!--    底部导航-->
+		<AQTabber />
+	</view>
 </template>
 
 <script>
-import apiRoute from '@/api/apiRoute.js';
-
-export default {
-  data() {
-    return {
-      currentDate: this.formatDate(new Date()),
-      currentMonth: new Date().getMonth() + 1,
-      // 市场人员资源量统计
-      staffData: [
-        { name: 'A', weekCount: 0, monthCount: 0, yearCount: 0 },
-        { name: 'B', weekCount: 0, monthCount: 0, yearCount: 0 },
-        { name: 'C', weekCount: 0, monthCount: 0, yearCount: 0 },
-        { name: 'D', weekCount: 0, monthCount: 0, yearCount: 0 },
-        { name: 'E', weekCount: 0, monthCount: 0, yearCount: 0 }
-      ],
-      // 校区列表
-      schoolList: [
-        { id: 1, name: '校区1' },
-        { id: 2, name: '校区2' },
-        { id: 3, name: '校区3' },
-        { id: 4, name: '校区4' },
-        { id: 5, name: '校区5' }
-      ],
-      // 渠道列表
-      channelList: [
-        { id: 1, name: '地推' },
-        { id: 2, name: '转介绍' },
-        { id: 3, name: '美团/大众' },
-        { id: 4, name: '抖音' },
-        { id: 5, name: '小红书' },
-        { id: 6, name: '其他' }
-      ],
-      // 市场人员列表
-      marketStaffList: [
-        { id: 'A', name: 'A' },
-        { id: 'B', name: 'B' },
-        { id: 'C', name: 'C' },
-        { id: 'D', name: 'D' }
-      ],
-      // 校区渠道数据
-      channelSchoolData: [],
-      // 人员渠道数据
-      channelStaffData: []
-    }
-  },
-  onLoad() {
-    this.initData();
-  },
-  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();
-    },
-    
-    // 初始化数据
-    initData() {
-      // 模拟获取数据，实际项目中应该调用API
-      this.getStaffStatistics();
-      this.getChannelSchoolStatistics();
-      this.getChannelStaffStatistics();
-    },
-    
-    // 获取人员资源量统计
-    getStaffStatistics() {
-      // 模拟数据，实际项目中应该调用API
-      // 示例：apiRoute.getStaffStatistics({date: this.currentDate}).then(res => {})
-      
-      // 模拟随机数据
-      this.staffData = this.staffData.map(staff => {
-        const monthCount = Math.floor(Math.random() * 100);
-        return {
-          ...staff,
-          weekCount: Math.floor(Math.random() * 30),
-          monthCount: monthCount,
-          yearCount: monthCount + Math.floor(Math.random() * 200)
-        }
-      });
-    },
-    
-    // 获取校区渠道统计
-    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
-        }
-      });
-    }
-  }
-}
+	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: [{
+						name: 'A',
+						weekCount: 0,
+						monthCount: 0,
+						yearCount: 0
+					},
+					{
+						name: 'B',
+						weekCount: 0,
+						monthCount: 0,
+						yearCount: 0
+					},
+					{
+						name: 'C',
+						weekCount: 0,
+						monthCount: 0,
+						yearCount: 0
+					},
+					{
+						name: 'D',
+						weekCount: 0,
+						monthCount: 0,
+						yearCount: 0
+					},
+					{
+						name: 'E',
+						weekCount: 0,
+						monthCount: 0,
+						yearCount: 0
+					}
+				],
+				// 校区列表
+				schoolList: [{
+						id: 1,
+						name: '校区1'
+					},
+					{
+						id: 2,
+						name: '校区2'
+					},
+					{
+						id: 3,
+						name: '校区3'
+					},
+					{
+						id: 4,
+						name: '校区4'
+					},
+					{
+						id: 5,
+						name: '校区5'
+					}
+				],
+				// 渠道列表
+				channelList: [{
+						id: 1,
+						name: '地推'
+					},
+					{
+						id: 2,
+						name: '转介绍'
+					},
+					{
+						id: 3,
+						name: '美团/大众'
+					},
+					{
+						id: 4,
+						name: '抖音'
+					},
+					{
+						id: 5,
+						name: '小红书'
+					},
+					{
+						id: 6,
+						name: '其他'
+					}
+				],
+				// 市场人员列表
+				marketStaffList: [{
+						id: 'A',
+						name: 'A'
+					},
+					{
+						id: 'B',
+						name: 'B'
+					},
+					{
+						id: 'C',
+						name: 'C'
+					},
+					{
+						id: 'D',
+						name: 'D'
+					}
+				],
+				// 校区渠道数据
+				channelSchoolData: [],
+				// 人员渠道数据
+				channelStaffData: []
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		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();
+			},
+
+			// 初始化数据
+			initData() {
+				// 模拟获取数据，实际项目中应该调用API
+				this.getStaffStatistics();
+				this.getChannelSchoolStatistics();
+				this.getChannelStaffStatistics();
+			},
+
+			// 获取人员资源量统计
+			getStaffStatistics() {
+				// 模拟数据，实际项目中应该调用API
+				// 示例：apiRoute.getStaffStatistics({date: this.currentDate}).then(res => {})
+
+				// 模拟随机数据
+				this.staffData = this.staffData.map(staff => {
+					const monthCount = Math.floor(Math.random() * 100);
+					return {
+						...staff,
+						weekCount: Math.floor(Math.random() * 30),
+						monthCount: monthCount,
+						yearCount: monthCount + Math.floor(Math.random() * 200)
+					}
+				});
+			},
+
+			// 获取校区渠道统计
+			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
+					}
+				});
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.main_box {
-  min-height: 100vh;
-  background-color: #1a1a1a;
-  color: #ffffff;
-  padding-bottom: 30rpx;
-}
-
-.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> 
\ No newline at end of file
+	.main_box {
+		min-height: 100vh;
+		background-color: #1a1a1a;
+		color: #ffffff;
+		padding-bottom: 30rpx;
+	}
+
+	.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>
\ No newline at end of file
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index 3bd92fc..e60a92f 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -179,7 +179,7 @@
 						this.openViewHome();
 					} else {
 						uni.showToast({
-							title: res || '登录失败',
+							title: res.msg || '登录失败',
 							icon: 'none'
 						});
 					}