From d05cfe8c30a93e7141a4991f5672ecd006171b20 Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Wed, 3 Dec 2025 09:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=8A=9F=E8=83=BD=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dms/studentDormInfo/index.js              |   17 +
 api/task.js                                   |   48 +-
 config.js                                     |   12 +-
 .../handleTask/rtStuQuitSchool/detail.vue     |   35 +-
 pages/Approval/index.vue                      |   80 +-
 pages/applyleave/applyleave.vue               | 1036 +++++-----
 pages/applyleave/editLeave.vue                |   24 +-
 pages/dormitory/studentDormInfo/index.vue     | 1664 +++++++++--------
 .../studentDormInfo/informationCollection.vue |  894 +++++----
 9 files changed, 2065 insertions(+), 1745 deletions(-)

diff --git a/api/dms/studentDormInfo/index.js b/api/dms/studentDormInfo/index.js
index c1615db..e4ff141 100644
--- a/api/dms/studentDormInfo/index.js
+++ b/api/dms/studentDormInfo/index.js
@@ -18,6 +18,23 @@ export function addStudent(data) {
   })
 }
 
+// 根据关联表id查看详情
+export function getStudentDetail(id) {
+  return request({
+    url: `/dormitory/srs-dormitory-student/${id}`,
+    method: 'get'
+  })
+}
+
+// 修改学生宿舍关联
+export function updateStudent(data) {
+  return request({
+    url: '/dormitory/srs-dormitory-student/update',
+    method: 'post',
+    data
+  })
+}
+
 // 获取校区
 export function listAllCampus() {
   return request({
diff --git a/api/task.js b/api/task.js
index 5ebb085..5ae72bf 100644
--- a/api/task.js
+++ b/api/task.js
@@ -1,33 +1,33 @@
 import request from '@/utils/request'
 
-export function myProcess(data){ 
-	return request({
-	  'url': '/flowable/task/myProcess',
-	  'method': 'get',
-	  data
-	})
+export function myProcess(params){ 
+    return request({
+      url: '/flowable/task/myProcess',
+      method: 'get',
+      params
+    })
 }
-export function todoList(data){ 
-	return request({
-	  'url': '/flowable/task/todoList',
-	  'method': 'get',
-	  data
-	})
+export function todoList(params){ 
+    return request({
+      url: '/flowable/task/todoList',
+      method: 'get',
+      params
+    })
 }
-export function finishedList(data){ 
-	return request({
-	  'url': '/flowable/task/finishedList',
-	  'method': 'get',
-	  data
-	})
+export function finishedList(params){ 
+    return request({
+      url: '/flowable/task/finishedList',
+      method: 'get',
+      params
+    })
 }
 
-export function flowRecord(data){ 
-	return request({
-	  'url': '/flowable/task/flowRecord',
-	  'method': 'get',
-	  data
-	})
+export function flowRecord(params){ 
+    return request({
+      url: '/flowable/task/flowRecord',
+      method: 'get',
+      params
+    })
 }
 export function complete(data){ 
 	return request({
diff --git a/config.js b/config.js
index a52d9d3..c582941 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,12 @@
 // 应用全局配置
 module.exports = {
+	// 统一通过本机 Nginx 反向代理访问后端
+	// 若在同一台机器调试：使用 localhost:8066
+	// 若手机在同一局域网：替换为本机局域网 IP，例如 172.16.96.111:8066
+	// 页面在 https://zhxg.gxsdxy.cn 下访问，接口同域同协议以避免 CORS
 	// baseUrl: 'https://zhxg.gxsdxy.cn/prod_api',
-	// baseUrl: 'http://172.16.96.111:8085',
-	// baseUrl: 'http://192.168.211.22:8085',
+	// baseUrl: 'https://zhxg.gxsdxy.cn/prod_api',
+	// 若本地/内网以 HTTP 访问页面，可改为：
 	baseUrl: 'http://localhost:8085',
 	// 应用信息
 	appInfo: {
@@ -28,7 +32,7 @@ module.exports = {
 	/**
 	 * 开启cas
 	 */
-	casEnable: false,
+	casEnable: true,
 
 	/**
 	 * 单点登录url
@@ -38,5 +42,5 @@ module.exports = {
 	/**
 	 * 单点登出url
 	 */
-	caslogoutUrl: 'https://rsso.gxsdxy.cn/logout?service=http://zhxg.gxsdxy.cn/prod_api_test/getinfo',
+	caslogoutUrl: 'http://rsso.gxsdxy.cn/logout?service=http://zhxg.gxsdxy.cn/prod_api_test/getinfo',
 }
\ No newline at end of file
diff --git a/pages/Approval/handleTask/rtStuQuitSchool/detail.vue b/pages/Approval/handleTask/rtStuQuitSchool/detail.vue
index d85e40d..2c0e1b3 100644
--- a/pages/Approval/handleTask/rtStuQuitSchool/detail.vue
+++ b/pages/Approval/handleTask/rtStuQuitSchool/detail.vue
@@ -371,6 +371,7 @@
 			getRtStuQuitSchoolByProcInsId(procInsId) {
 				getRtStuQuitSchoolByProcInsId(procInsId).then((res) => {
 					this.formData = res.data;
+					console.log(this.formData)
 					this.get_penalty_type(this.formData.quitType);
 					this.get_category(this.formData.quitCategory);
 					if (this.tag == 1) {
@@ -422,9 +423,9 @@
 								const pages = getCurrentPages();
 								if (pages && pages.length > 0) {
 									const prevPage = pages[pages.length - 2] || pages[pages.length - 1];
-                                    if (prevPage && typeof prevPage.handleChange === 'function') {
-                                        prevPage.handleChange(this.tag || 1);
-                                    }
+									if (prevPage && typeof prevPage.handleChange === 'function') {
+										prevPage.handleChange(2);
+									}
 								}
 
 							}
@@ -495,18 +496,18 @@
 						});
 					}
 					uni.hideLoading();
-						uni.navigateBack({
-							success: () => {
-								const pages = getCurrentPages();
-								if (pages && pages.length > 0) {
-									const prevPage = pages[pages.length - 2] || pages[pages.length - 1];
-                                    if (prevPage && typeof prevPage.handleChange === 'function') {
-                                        prevPage.handleChange(this.tag || 1);
-                                    }
+					uni.navigateBack({
+						success: () => {
+							const pages = getCurrentPages();
+							if (pages.length > 0) {
+								const prevPage = pages[pages.length - 2]
+								if (prevPage && typeof prevPage.getList === 'function') {
+									prevPage.handleChange(2);
 								}
-
 							}
-						})
+
+						}
+					})
 				})
 			},
 			rejectDialogConfirm() {
@@ -528,10 +529,10 @@
 									const pages = getCurrentPages();
 									if (pages && pages.length > 0) {
 										const prevPage = pages[pages.length - 2] || pages[pages.length - 1];
-                                        if (prevPage && typeof prevPage.handleChange === 'function') {
-                                            prevPage.handleChange(this.tag || 1);
-                                            console.log('刷新任务数据');
-                                        }
+										if (prevPage && typeof prevPage.handleChange === 'function') {
+											prevPage.handleChange(2);
+											console.log('刷新已办任务数据');
+										}
 									}
 								}
 							})
diff --git a/pages/Approval/index.vue b/pages/Approval/index.vue
index 82c3f59..104acae 100644
--- a/pages/Approval/index.vue
+++ b/pages/Approval/index.vue
@@ -8,6 +8,14 @@
 			</view>
 		</view>
 		<view class="content" v-if="processes.length!==0">
+			<view class="search-bar">
+				<input class="input" placeholder="姓名" v-model="searchName" @confirm="doSearch" />
+				<picker mode="date" :value="searchDate" @change="onDateChange">
+					<view class="picker-text">{{ searchDate || '时间' }}</view>
+				</picker>
+				<button class="primary" @tap="doSearch">搜索</button>
+				<button class="reset" @tap="resetSearch">重置</button>
+			</view>
 			<view class="list">
 				<view class="item" v-for="(process,index) in processes" :key="index">
 					<view class="top">
@@ -75,7 +83,9 @@
 				currentPage: 1,
 				loading: false, // 加载状态标志
 				topLoading: true,
-				role: uni.getStorageSync("roles")
+				role: uni.getStorageSync("roles"),
+				searchName: '',
+				searchDate: ''
 			};
 		},
 		onLoad(option) {
@@ -130,12 +140,42 @@
 				this.topLoading = true;
 				this.getList();
 			},
+			doSearch() {
+				this.currentPage = 1;
+				this.processes = [];
+				this.topLoading = true;
+				this.getList();
+			},
+			resetSearch() {
+				this.searchName = '';
+				this.searchDate = '';
+				this.currentPage = 1;
+				this.processes = [];
+				this.topLoading = true;
+				this.getList();
+			},
+			onDateChange(e) {
+				this.searchDate = e.detail.value;
+			},
 			getList() {
 				this.loading = true;
 				let sdata = {
 					pageNum: this.currentPage,
-					pageSize: 10
+					pageSize: 10,
 				};
+				if (this.searchName) {
+					sdata.startUserName = this.searchName;
+				}
+				if (this.searchDate) {
+					if (this.currentTab === 2) {
+						// 已办任务：PC端使用 startTime/endTime；时间对应“提交时间”
+						sdata.startTime = this.searchDate;
+						sdata.endTime = this.searchDate;
+					} else {
+						// 我发起的、待办任务：PC端使用 deployTime；时间对应“提交时间”
+						sdata.deployTime = this.searchDate;
+					}
+				}
 				console.log(this.processes);
 				if (this.currentTab == 0) {
 					myProcess(sdata).then(res => {
@@ -320,6 +360,41 @@
 			}
 		}
 
+		.search-bar {
+			display: flex;
+			align-items: center;
+			gap: 8px;
+			padding: 8px 10px;
+			background-color: #ffffff;
+			border-bottom: 1px solid #EDEDED;
+			position: sticky;
+			top: 58px;
+			z-index: 998;
+			.input {
+				flex: 1;
+				border: 1px solid #EDEDED;
+				border-radius: 4px;
+				padding: 6px 8px;
+				height: 36px;
+				line-height: 36px;
+				box-sizing: border-box;
+			}
+			.picker-text {
+				border: 1px solid #EDEDED;
+				border-radius: 4px;
+				padding: 6px 8px;
+				color: #555555;
+			}
+			button.primary {
+				border: 1px solid #007aff;
+				color: #007aff;
+			}
+			button.reset {
+				border: 1px solid #909399;
+				color: #909399;
+			}
+		}
+
 		.empty {
 			display: flex;
 			flex-direction: column;
@@ -337,6 +412,7 @@
 		.content {
 			padding-top: 58px;
 
+
 			.list {
 				.item {
 					padding: 20px 10px;
diff --git a/pages/applyleave/applyleave.vue b/pages/applyleave/applyleave.vue
index 08896a4..4d34c58 100644
--- a/pages/applyleave/applyleave.vue
+++ b/pages/applyleave/applyleave.vue
@@ -67,7 +67,7 @@
 			<text class="label"> <text class="required">*</text> 请假起始时间：</text>
 
 			<view class="example-body">
-				<uni-datetime-picker @change="changeDate('start',$event)" returnType="timestamp"
+				<uni-datetime-picker @change="changeDate('start', $event)" returnType="timestamp"
 					v-model="formData.single" />
 
 			</view>
@@ -75,7 +75,7 @@
 		<view class="form-item"> <!-- 根据选择的申请类型来决定是否显示 -->
 			<text class="label"> <text class="required">*</text> 请假结束时间：</text>
 			<view class="example-body">
-				<uni-datetime-picker @change="changeDate('end',$event)" returnType="timestamp"
+				<uni-datetime-picker @change="changeDate('end', $event)" returnType="timestamp"
 					v-model="formData.endsingle" />
 			</view>
 		</view>
@@ -120,7 +120,7 @@
 		<!-- 签名 -->
 		<view class="form-canvas">
 			<text class="label"> <text class="required">*</text> 手写签字：</text>
-			<view class="sign-img" v-if="signImg!=''">
+			<view class="sign-img" v-if="signImg != ''">
 				<image :src="signImg" mode=""></image>
 				<text @tap="signToggle">重新签名</text>
 			</view>
@@ -145,7 +145,7 @@
 			</view>
 		</uni-popup> -->
 		<!-- 新签名组件 -->
-		<jp-signature-popup ref="jpSignature" :required="true" popup  @change="uploadSign"/>
+		<jp-signature-popup ref="jpSignature" :required="true" popup @change="uploadSign" />
 
 		<uni-popup class="safety-popup" :is-mask-click="false" ref="safetyPopup" background-color="#fff">
 			<view class="popup-content">
@@ -160,8 +160,8 @@
 						4、如有特殊情况需要延长请假时间，会及时向学校或老师做出说明和沟通。
 						5、意识到请假可能会对我的学业和成绩造成负面影响，我愿意承担相应的责任和后果。
 					</view>
-					<view class="time" v-if="safetime>0">
-						请阅读{{safetime}}s承诺书
+					<view class="time" v-if="safetime > 0">
+						请阅读{{ safetime }}s承诺书
 					</view>
 				</view>
 				<view class="safety-btn">
@@ -173,569 +173,565 @@
 </template>
 
 <script>
-	import uploadFile from "@/plugins/upload.js";
-	import {
-		baseUrl
-	} from "@/config.js";
-	import {
-		calculateDays,
-		convertToTimestamp
-	} from "@/utils/time-calculation.js"
-	import {
-		addApply,
-		getStuInfo,
-		commonUpload,
-		leaveSave
-	} from "@/api/applyleave/applyleave.js";
-	export default {
-		data() {
-			return {
-				isSubmitting: false, //表单提交标志位
-				isDisabled: true,
-				safetime: 5,
-				// 用户信息
-				stuInfo: {},
-				studID: "",
-				name: "",
-				courtyard: "",
-				sex: '',
-				classroom: "",
-				phone: "",
-				parent: "",
-				parentPhone: "",
-				selectedOptionIndex: -1, // 当前选中的奖项索引
-				politicalOptions: ['因病', '因事'], // 请假选项
-				beginData: '',
-				endData: "",
-				remark: "",
-				leave: ['是', '否'],
-				leaveIndex: -1,
-				url: "",
-				urltwo: "",
-				checkboxValue: 0,
-				isLeaveGui: 0, //是否离桂
-				//附件
-				attachmentFile: "",
-				signImg: "",
-				formData: {
-					selectedPoliticalIndex: "", // 当前选中的请假索引
-					deeds: "",
-					endsingle: "",
-					single: '',
-					dataNum: "",
-					endAddress: "",
-					address: "",
-					signFile: "",
-				},
-			};
-		},
-		created() {
-			this.getSut();
-		},
-		mounted() {
-			console.log(this.one)
-		},
-		methods: {
-			toggleLG() {
-				this.isLeaveGui = this.isLeaveGui === 1 ? 0 : 1;
+import {
+	addApply,
+	getStuInfo,
+	leaveSave
+} from "@/api/applyleave/applyleave.js";
+import {
+	baseUrl
+} from "@/config.js";
+import uploadFile from "@/plugins/upload.js";
+import {
+	calculateDays,
+	convertToTimestamp
+} from "@/utils/time-calculation.js";
+export default {
+	data() {
+		return {
+			isSubmitting: false, //表单提交标志位
+			isDisabled: true,
+			safetime: 5,
+			// 用户信息
+			stuInfo: {},
+			studID: "",
+			name: "",
+			courtyard: "",
+			sex: '',
+			classroom: "",
+			phone: "",
+			parent: "",
+			parentPhone: "",
+			selectedOptionIndex: -1, // 当前选中的奖项索引
+			politicalOptions: ['因病', '因事'], // 请假选项
+			beginData: '',
+			endData: "",
+			remark: "",
+			leave: ['是', '否'],
+			leaveIndex: -1,
+			url: "",
+			urltwo: "",
+			checkboxValue: 0,
+			isLeaveGui: 0, //是否离桂
+			//附件
+			attachmentFile: "",
+			signImg: "",
+			formData: {
+				selectedPoliticalIndex: "", // 当前选中的请假索引
+				deeds: "",
+				endsingle: "",
+				single: '',
+				dataNum: "",
+				endAddress: "",
+				address: "",
+				signFile: "",
 			},
-			// 获取学生信息
-			getSut() {
-				getStuInfo().then(res => {
-					console.log(res);
-					if (res.code == 200) {
-						this.stuInfo = res.data
-					}
-					if (res.code == 500) {
-						uni.showToast({
-							title: res.msg,
-							icon: "error"
-						})
-					}
-
-				});
-			},
-			changeDate(type, e) {
-				this.formData.single = convertToTimestamp(this.formData.single);
-				this.formData.endsingle = convertToTimestamp(this.formData.endsingle);
-				if (type == "end") {
-					this.formData.endsingle = e;
-					if (this.formData.endsingle < this.formData.single) {
-						uni.showToast({
-							title: "时间不能早于请假开始时间",
-							icon: "none"
-						})
-					}
-					this.formData.dataNum = calculateDays(this.formData.single, this.formData.endsingle);
-				} else {
-					this.formData.single = e;
-					if (this.formData.endsingle < this.formData.single) {
-						uni.showToast({
-							title: "起始时间不能晚于结束时间",
-							icon: "none"
-						})
-					}
-					this.formData.dataNum = calculateDays(this.formData.single, this.formData.endsingle);
+		};
+	},
+	created() {
+		this.getSut();
+	},
+	mounted() {
+		console.log(this.one)
+	},
+	methods: {
+		toggleLG() {
+			this.isLeaveGui = this.isLeaveGui === 1 ? 0 : 1;
+		},
+		// 获取学生信息
+		getSut() {
+			getStuInfo().then(res => {
+				console.log(res);
+				if (res.code == 200) {
+					this.stuInfo = res.data
 				}
-				// 检查请假天数是否小于0.5天
-				if (this.formData.dataNum < 0.5) {
+				if (res.code == 500) {
 					uni.showToast({
-						title: "请假天数不能小于0.5天",
+						title: res.msg,
+						icon: "error"
+					})
+				}
+
+			});
+		},
+		changeDate(type, e) {
+			this.formData.single = convertToTimestamp(this.formData.single);
+			this.formData.endsingle = convertToTimestamp(this.formData.endsingle);
+			if (type == "end") {
+				this.formData.endsingle = e;
+				if (this.formData.endsingle < this.formData.single) {
+					uni.showToast({
+						title: "时间不能早于请假开始时间",
 						icon: "none"
 					})
-					this.formData.dataNum = "";
-				}
-			},
-			signToggle() {
-				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				// this.$refs.popup.open('center')
-				//打开签名
-				this.$refs.jpSignature.toPop();
-			},
-			closeSafePopup() {
-				this.$refs.safetyPopup.close('center')
-			},
-			// 提交申请
-			applyLeave() {
-				uni.showLoading({
-					title: "正在提交"
-				})
-				if (this.checkboxValue == 0) {
-					// 如果复选框未被选中，则不允许提交
-					uni.showToast({
-						title: "请勾选承诺书",
-						icon: "error"
-					});
-					return; // 阻止表单提交
-				}
-				if (this.formData.signFile == '') {
-					// 如果复选框未被选中，则不允许提交
-					uni.showToast({
-						title: "请先进行签名",
-						icon: "error"
-					});
-					return; // 阻止表单提交
 				}
+				this.formData.dataNum = calculateDays(this.formData.single, this.formData.endsingle);
+			} else {
+				this.formData.single = e;
 				if (this.formData.endsingle < this.formData.single) {
 					uni.showToast({
 						title: "起始时间不能晚于结束时间",
 						icon: "none"
 					})
-					return; // 阻止表单提交
 				}
-				//表单非空校验
-				const requiredFields = [
-					'selectedPoliticalIndex',
-					'deeds',
-					'endsingle',
-					'single',
-					'dataNum',
-					'endAddress',
-					'address'
-				];
-				const emptyField = requiredFields.find(field => this.formData[field] === "");
-				if (emptyField) {
-					uni.showToast({
-						title: `请填写完必填字段`,
-						icon: "none"
-					})
-					return;
-				}
-				let data = {
-					applicantSignature: this.formData.signFile,
-					attachment: this.attachmentFile,
-					destination: this.formData.endAddress,
-					destinationDetails: this.formData.address,
-					endDate: this.formData.endsingle,
-					leaveDays: this.formData.dataNum,
-					leaveType: this.formData.selectedPoliticalIndex,
-					reason: this.formData.deeds,
-					remark: this.remark,
-					safetyPromise: 1,
-					startDate: this.formData.single
-				}
-				this.isSubmitting = true; // 设置为正在提交 
-				addApply(data).then(res => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: "提交成功",
-							icon: "success"
-						});
-						uni.hideLoading();
-						this.isSubmitting = false;
-						uni.navigateBack({
-							success: () => {
-								const pages = getCurrentPages();
-								if (pages.length > 0) {
-									const prevPage = pages[pages.length - 2]
-									if (prevPage && typeof prevPage.getLeaveList ===
-										'function') {
-										prevPage.getLeaveList();
-									}
-								}
-							}
-						})
-					} else {
-						uni.showToast({
-							title: "提交失败,请先填写完整内容",
-							icon: "none"
-						});
-					}
-				});
-			},
-			//上传佐证
-			uploadEvidence(e) {
-				uploadFile('/common/upload', e.tempFilePaths[0]).then((res) => {
-					if (this.attachmentFile !== "") {
-						this.attachmentFile = this.attachmentFile + "," + JSON.parse(res).fileName;
-					} else {
-						this.attachmentFile = JSON.parse(res).fileName;
-					}
+				this.formData.dataNum = calculateDays(this.formData.single, this.formData.endsingle);
+			}
+			// 检查请假天数是否小于0.5天
+			if (this.formData.dataNum < 0.5) {
+				uni.showToast({
+					title: "请假天数不能小于0.5天",
+					icon: "none"
 				})
-			},
-			//删除已选图片
-			onDelImg(e) {
-				console.log(this.attachmentFile);
-				console.log(e);
-			},
-			//上传签名
-			uploadSign(e) {
-				const blob = this.base64ToBlob(e);
-				const fileObj = new File([blob], 'signature', {
-					type: 'image/png'
-				});
-				const formData = new FormData();
-				formData.append("file", fileObj);
-				const formDataObj = this.formDataToObject(formData);
-				uploadFile('/common/upload', '', formDataObj).then((res) => {
-					this.formData.signFile = JSON.parse(res).fileName;
-					this.signImg = baseUrl + JSON.parse(res).fileName;
-					// this.$refs.popup.close('center')
-				})
-			},
-			formDataToObject(formData) {
-				const obj = {};
-				formData.forEach((value, key) => {
-					obj[key] = value;
-				});
-				return obj;
-			},
-			base64ToBlob(base64String) {
-				const byteCharacters = atob(base64String.split(',')[1]);
-				const byteNumbers = new Array(byteCharacters.length);
-
-				for (let i = 0; i < byteCharacters.length; i++) {
-					byteNumbers[i] = byteCharacters.charCodeAt(i);
-				}
-
-				const byteArray = new Uint8Array(byteNumbers);
-				return new Blob([byteArray], {
-					type: 'application/octet-stream'
-				});
-			},
-			onPickerChange(event) {
-				this.selectedOptionIndex = event.detail.value;
-			},
-			onPoliticalChange(event) {
-				this.formData.selectedPoliticalIndex = event.detail.value;
-			},
-			toggleCheckbox() {
-				// 切换 checkboxValue 的值
-				this.checkboxValue = this.checkboxValue === 1 ? 0 : 1;
-				if (this.checkboxValue) {
-					this.$refs.safetyPopup.open('center')
-					if (this.safetime > 0) {
-						const intervalId = setInterval(() => {
-							this.safetime--;
-							console.log(this.safetime);
-							if (this.safetime === 0) {
-								clearInterval(intervalId); // 停止倒计时
-								this.isDisabled = false;
-							}
-						}, 1000);
-					}
-				}
-			},
-			// 清空表单
-			clean() {
-				this.studID = "";
-				this.name = "";
-				this.courtyard = "";
-				this.formData.selectedOptionIndex = "";
-				this.classroom = '';
-				this.phone = '';
-				this.parent = '';
-				this.parentPhone = "";
-				this.selectedPoliticalIndex = ""
-				this.beginData = "";
-				this.endData = '';
-				this.formData.dataNum = '';
-				this.formData.deeds = '';
-				this.leaveIndex = -1;
-				this.formData.endAddress = '';
-				this.formData.address = '';
-				this.isChecked = false;
-				this.$forceUpdate(); // 强制更新组件
-				this.url = ''
-				localStorage.removeItem('formData');
-			},
-			//保存假条信息
-			save() {
-				if (this.checkboxValue == 0) {
-					// 如果复选框未被选中，则不允许提交
-					uni.showToast({
-						title: "请勾选承诺书",
-						icon: "error"
-					});
-					return; // 阻止表单提交
-				}
-				if (this.formData.signFile == '' || this.formData.signFile == null) {
-					// 如果复选框未被选中，则不允许提交
-					uni.showToast({
-						title: "请先进行签名",
-						icon: "error"
-					});
-					return; // 阻止表单提交
-				}
-				if (this.endsingle < this.single) {
-					uni.showToast({
-						title: "起始时间不能晚于结束时间",
-						icon: "none"
-					})
-					return; // 阻止表单提交
-				}
-				this.isSubmitting = true;
-				let data = {
-					applicantSignature: this.formData.signFile,
-					attachment: this.attachmentFile,
-					destination: this.endAddress,
-					destinationDetails: this.address,
-					endDate: this.endsingle,
-					leaveDays: this.dataNum,
-					leaveType: this.selectedPoliticalIndex,
-					reason: this.deeds,
-					remark: this.remark,
-					safetyPromise: 1,
-					startDate: this.single
-				}
-				leaveSave(data).then(res => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: "保存成功",
-							icon: "success"
-						});
-						this.isSubmitting = false;
-						uni.navigateBack({
-							success: () => {
-								const pages = getCurrentPages();
-								if (pages.length > 0) {
-									const prevPage = pages[pages.length - 2]
-									if (prevPage && typeof prevPage.getLeaveList ===
-										'function') {
-										prevPage.getLeaveList();
-									}
-								}
-							}
-						})
-					} else {
-						uni.showToast({
-							title: "提交失败,请先填写完整内容",
-							icon: "none"
-						});
-					}
-				});
-			},
+				this.formData.dataNum = "";
+			}
 		},
+		signToggle() {
+			// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+			// this.$refs.popup.open('center')
+			//打开签名
+			this.$refs.jpSignature.toPop();
+		},
+		closeSafePopup() {
+			this.$refs.safetyPopup.close('center')
+		},
+		// 提交申请
+		applyLeave() {
+			uni.showLoading({
+				title: "正在提交"
+			})
+			if (this.checkboxValue == 0) {
+				// 如果复选框未被选中，则不允许提交
+				uni.showToast({
+					title: "请勾选承诺书",
+					icon: "error"
+				});
+				uni.hideLoading();
+				return;
+			}
+			if (this.formData.signFile == '') {
+				// 如果复选框未被选中，则不允许提交
+				uni.showToast({
+					title: "请先进行签名",
+					icon: "error"
+				});
+				uni.hideLoading();
+				return;
+			}
+			if (this.formData.endsingle < this.formData.single) {
+				uni.showToast({
+					title: "起始时间不能晚于结束时间",
+					icon: "none"
+				})
+				uni.hideLoading();
+				return;
+			}
+			//表单非空校验
+			const requiredFields = [
+				'selectedPoliticalIndex',
+				'deeds',
+				'endsingle',
+				'single',
+				'dataNum',
+				'endAddress',
+				'address'
+			];
+			const emptyField = requiredFields.find(field => this.formData[field] === "");
+			if (emptyField) {
+				uni.showToast({
+					title: `请填写完必填字段`,
+					icon: "none"
+				})
+				uni.hideLoading();
+				return;
+			}
+			let data = {
+				applicantSignature: this.formData.signFile,
+				attachment: this.attachmentFile,
+				destination: this.formData.endAddress,
+				destinationDetails: this.formData.address,
+				endDate: this.formData.endsingle,
+				leaveDays: this.formData.dataNum,
+				leaveType: this.formData.selectedPoliticalIndex,
+				reason: this.formData.deeds,
+				remark: this.remark,
+				safetyPromise: 1,
+				startDate: this.formData.single
+			}
+			this.isSubmitting = true; // 设置为正在提交 
+			addApply(data).then(res => {
+				if (res.code == 200) {
+					uni.showToast({
+						title: "提交成功",
+						icon: "success"
+					});
+					uni.hideLoading();
+					this.isSubmitting = false;
+					uni.navigateBack({
+						success: () => {
+							const pages = getCurrentPages();
+							if (pages.length > 0) {
+								const prevPage = pages[pages.length - 2]
+								if (prevPage && typeof prevPage.getLeaveList ===
+									'function') {
+									prevPage.getLeaveList();
+								}
+							}
+						}
+					})
+				} else {
+					uni.showToast({
+						title: "提交失败,请先填写完整内容",
+						icon: "none"
+					});
+				}
+			});
+		},
+		//上传佐证
+		uploadEvidence(e) {
+			uploadFile('/common/upload', e.tempFilePaths[0]).then((res) => {
+				if (this.attachmentFile !== "") {
+					this.attachmentFile = this.attachmentFile + "," + JSON.parse(res).fileName;
+				} else {
+					this.attachmentFile = JSON.parse(res).fileName;
+				}
+			})
+		},
+		//删除已选图片
+		onDelImg(e) {
+			console.log(this.attachmentFile);
+			console.log(e);
+		},
+		//上传签名
+		uploadSign(e) {
+			uploadFile('/common/upload', e).then((res) => {
+				const data = JSON.parse(res);
+				this.formData.signFile = data.fileName;
+				this.signImg = data.url || (baseUrl + data.fileName);
+			})
+		},
+		formDataToObject(formData) {
+			const obj = {};
+			formData.forEach((value, key) => {
+				obj[key] = value;
+			});
+			return obj;
+		},
+		base64ToBlob(base64String) {
+			const byteCharacters = atob(base64String.split(',')[1]);
+			const byteNumbers = new Array(byteCharacters.length);
 
-	};
+			for (let i = 0; i < byteCharacters.length; i++) {
+				byteNumbers[i] = byteCharacters.charCodeAt(i);
+			}
+
+			const byteArray = new Uint8Array(byteNumbers);
+			return new Blob([byteArray], {
+				type: 'application/octet-stream'
+			});
+		},
+		onPickerChange(event) {
+			this.selectedOptionIndex = event.detail.value;
+		},
+		onPoliticalChange(event) {
+			this.formData.selectedPoliticalIndex = event.detail.value;
+		},
+		toggleCheckbox() {
+			// 切换 checkboxValue 的值
+			this.checkboxValue = this.checkboxValue === 1 ? 0 : 1;
+			if (this.checkboxValue) {
+				this.$refs.safetyPopup.open('center')
+				if (this.safetime > 0) {
+					const intervalId = setInterval(() => {
+						this.safetime--;
+						console.log(this.safetime);
+						if (this.safetime === 0) {
+							clearInterval(intervalId); // 停止倒计时
+							this.isDisabled = false;
+						}
+					}, 1000);
+				}
+			}
+		},
+		// 清空表单
+		clean() {
+			this.studID = "";
+			this.name = "";
+			this.courtyard = "";
+			this.formData.selectedOptionIndex = "";
+			this.classroom = '';
+			this.phone = '';
+			this.parent = '';
+			this.parentPhone = "";
+			this.selectedPoliticalIndex = ""
+			this.beginData = "";
+			this.endData = '';
+			this.formData.dataNum = '';
+			this.formData.deeds = '';
+			this.leaveIndex = -1;
+			this.formData.endAddress = '';
+			this.formData.address = '';
+			this.isChecked = false;
+			this.$forceUpdate(); // 强制更新组件
+			this.url = ''
+			localStorage.removeItem('formData');
+		},
+		//保存假条信息
+		save() {
+			if (this.checkboxValue == 0) {
+				// 如果复选框未被选中，则不允许提交
+				uni.showToast({
+					title: "请勾选承诺书",
+					icon: "error"
+				});
+				return; // 阻止表单提交
+			}
+			if (this.formData.signFile == '' || this.formData.signFile == null) {
+				// 如果复选框未被选中，则不允许提交
+				uni.showToast({
+					title: "请先进行签名",
+					icon: "error"
+				});
+				return; // 阻止表单提交
+			}
+			if (this.formData.endsingle < this.formData.single) {
+				uni.showToast({
+					title: "起始时间不能晚于结束时间",
+					icon: "none"
+				})
+				return; // 阻止表单提交
+			}
+			this.isSubmitting = true;
+			let data = {
+				applicantSignature: this.formData.signFile,
+				attachment: this.attachmentFile,
+				destination: this.formData.endAddress,
+				destinationDetails: this.formData.address,
+				endDate: this.formData.endsingle,
+				leaveDays: this.formData.dataNum,
+				leaveType: this.formData.selectedPoliticalIndex,
+				reason: this.formData.deeds,
+				remark: this.remark,
+				safetyPromise: 1,
+				startDate: this.formData.single
+			}
+			leaveSave(data).then(res => {
+				if (res.code == 200) {
+					uni.showToast({
+						title: "保存成功",
+						icon: "success"
+					});
+					this.isSubmitting = false;
+					uni.navigateBack({
+						success: () => {
+							const pages = getCurrentPages();
+							if (pages.length > 0) {
+								const prevPage = pages[pages.length - 2]
+								if (prevPage && typeof prevPage.getLeaveList ===
+									'function') {
+									prevPage.getLeaveList();
+								}
+							}
+						}
+					})
+				} else {
+					uni.showToast({
+						title: "提交失败,请先填写完整内容",
+						icon: "none"
+					});
+				}
+			});
+		},
+	},
+
+};
 </script>
 
 <style scoped lang="scss">
-	.container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
 
-	.form-item {
-		padding: 15rpx 20rpx;
-		width: 100%;
-		height: 80rpx;
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-		justify-content: space-between;
+.form-item {
+	padding: 15rpx 20rpx;
+	width: 100%;
+	height: 80rpx;
+	display: flex;
+	align-items: center;
+	margin-bottom: 20rpx;
+	justify-content: space-between;
 
-		checkbox {
-			/deep/.uni-checkbox-input.uni-checkbox-input-checked {
-				background: #007aff;
-			}
-		}
-
-	}
-
-	.form-text {
-		width: 95%;
-		margin-bottom: 20rpx;
-		border-bottom: 1px solid #ededee;
-	}
-
-	.form-img {
-		width: 95%;
-		margin-bottom: 20rpx;
-		border-bottom: 1px solid #ededee;
-	}
-
-	.example-body {
-		margin-top: 20rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.txt {
-		margin-top: 20rpx;
-	}
-
-	.label {
-		text-align: right;
-		margin-right: 20rpx;
-
-		.required {
-			color: red;
-		}
-
-	}
-
-	.select {
-		color: #888889;
-		white-space: nowrap;
-		/* 防止换行 */
-		overflow: hidden;
-		/* 隐藏溢出部分 */
-		text-overflow: ellipsis;
-		/* 显示省略号 */
-	}
-
-	.uni-input {
-		color: #888889;
-		text-align: right;
-	}
-
-	.btn {
-		display: flex;
-		justify-content: space-between;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		margin: 0 auto;
-		border-top: 1px solid #d6d6d6;
-		background: #fff;
-		padding: 10px;
-		right: 0;
-
-		button {
-			width: 30%;
-			background-color: #4097FE;
-			color: white;
+	checkbox {
+		/deep/.uni-checkbox-input.uni-checkbox-input-checked {
+			background: #007aff;
 		}
 	}
 
+}
 
+.form-text {
+	width: 95%;
+	margin-bottom: 20rpx;
+	border-bottom: 1px solid #ededee;
+}
 
-	.form-address {
+.form-img {
+	width: 95%;
+	margin-bottom: 20rpx;
+	border-bottom: 1px solid #ededee;
+}
 
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-	}
+.example-body {
+	margin-top: 20rpx;
+	margin-bottom: 20rpx;
+}
 
-	.labelsafe {
+.txt {
+	margin-top: 20rpx;
+}
+
+.label {
+	text-align: right;
+	margin-right: 20rpx;
+
+	.required {
 		color: red;
-		font-size: 24rpx;
 	}
 
-	.form-canvas {
-		width: 95%;
-		margin-bottom: 25px;
+}
 
-		.sign-img {
-			position: relative;
-			margin-top: 8px;
+.select {
+	color: #888889;
+	white-space: nowrap;
+	/* 防止换行 */
+	overflow: hidden;
+	/* 隐藏溢出部分 */
+	text-overflow: ellipsis;
+	/* 显示省略号 */
+}
 
-			image {
-				width: 100%;
-			}
+.uni-input {
+	color: #888889;
+	text-align: right;
+}
 
-			text {
-				position: absolute;
-				right: 9px;
-				bottom: 10px;
-				background: white;
-				padding: 3px 5px;
-				border-radius: 2px;
-				color: #5c5c5c;
-			}
+.btn {
+	display: flex;
+	justify-content: space-between;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	margin: 0 auto;
+	border-top: 1px solid #d6d6d6;
+	background: #fff;
+	padding: 10px;
+	right: 0;
+
+	button {
+		width: 30%;
+		background-color: #4097FE;
+		color: white;
+	}
+}
+
+
+
+.form-address {
+
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+}
+
+.labelsafe {
+	color: red;
+	font-size: 24rpx;
+}
+
+.form-canvas {
+	width: 95%;
+	margin-bottom: 25px;
+
+	.sign-img {
+		position: relative;
+		margin-top: 8px;
+
+		image {
+			width: 100%;
 		}
 
-		/* height: 700rpx; */
-		.sign {
-			margin-top: 8px;
-			border: 1px solid #ebebeb;
-			padding: 25px;
-			color: #1e6fff;
-			text-align: center;
-			font-weight: bold;
+		text {
+			position: absolute;
+			right: 9px;
+			bottom: 10px;
+			background: white;
+			padding: 3px 5px;
+			border-radius: 2px;
+			color: #5c5c5c;
 		}
 	}
 
-	.tab-box {
-		width: 80%;
-		height: 100vh;
-		background-color: #f0f0f0;
-
-		.success-img {
-			width: 90%;
-			height: 300rpx;
-
-		}
+	/* height: 700rpx; */
+	.sign {
+		margin-top: 8px;
+		border: 1px solid #ebebeb;
+		padding: 25px;
+		color: #1e6fff;
+		text-align: center;
+		font-weight: bold;
 	}
+}
 
-	.safety-popup {}
+.tab-box {
+	width: 80%;
+	height: 100vh;
+	background-color: #f0f0f0;
+
+	.success-img {
+		width: 90%;
+		height: 300rpx;
+
+	}
+}
+
+.safety-popup {}
 </style>
 
 
 <style lang="scss">
-	.popup-content {
-		height: 100vh;
-		box-sizing: border-box;
+.popup-content {
+	height: 100vh;
+	box-sizing: border-box;
 
-		.title {
+	.title {
+		text-align: center;
+		font-size: 18px;
+		font-weight: bold;
+		padding: 25px;
+	}
+
+	.content {
+		color: #7e7e7e;
+		padding: 0 25px 0 25px;
+		line-height: 25px;
+
+		.time {
 			text-align: center;
-			font-size: 18px;
-			font-weight: bold;
-			padding: 25px;
+			margin-top: 25px;
 		}
+	}
 
-		.content {
-			color: #7e7e7e;
-			padding: 0 25px 0 25px;
-			line-height: 25px;
+	.safety-btn {
+		margin-top: 35px;
+		border-top: 1px solid #b6b6b6;
+		padding: 5px 0;
 
-			.time {
-				text-align: center;
-				margin-top: 25px;
-			}
-		}
-
-		.safety-btn {
-			margin-top: 35px;
-			border-top: 1px solid #b6b6b6;
-			padding: 5px 0;
-
-			button {
-				&::after {
-					border: none;
-				}
+		button {
+			&::after {
+				border: none;
 			}
 		}
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/pages/applyleave/editLeave.vue b/pages/applyleave/editLeave.vue
index 70ba8f4..e68d4fe 100644
--- a/pages/applyleave/editLeave.vue
+++ b/pages/applyleave/editLeave.vue
@@ -418,12 +418,12 @@
 											const pages = getCurrentPages();
 											if (pages.length > 0) {
 									const prevPage = pages[pages.length - 2] || pages[pages.length - 1]
-									if (prevPage && typeof prevPage.handleChange === 'function') {
-										prevPage.handleChange(2);
-										console.log('刷新已办任务数据');
-									} else if (prevPage && typeof prevPage.getLeaveList === 'function') {
-										prevPage.getLeaveList();
-									}
+                                    if (prevPage && typeof prevPage.handleChange === 'function') {
+                                        prevPage.handleChange(1);
+                                        console.log('切回待办任务');
+                                    } else if (prevPage && typeof prevPage.getLeaveList === 'function') {
+                                        prevPage.getLeaveList();
+                                    }
 											}
 										}
 									})
@@ -623,12 +623,12 @@
 								const pages = getCurrentPages();
 								if (pages.length > 0) {
 									const prevPage = pages[pages.length - 2] || pages[pages.length - 1]
-									if (prevPage && typeof prevPage.handleChange === 'function') {
-										prevPage.handleChange(2);
-									} else if (prevPage && typeof prevPage.getLeaveList ===
-										'function') {
-										prevPage.getLeaveList();
-									}
+                                    if (prevPage && typeof prevPage.handleChange === 'function') {
+                                        prevPage.handleChange(1);
+                                    } else if (prevPage && typeof prevPage.getLeaveList ===
+                                        'function') {
+                                        prevPage.getLeaveList();
+                                    }
 								}
 							}
 						})
diff --git a/pages/dormitory/studentDormInfo/index.vue b/pages/dormitory/studentDormInfo/index.vue
index e45ad61..6bf5b5e 100644
--- a/pages/dormitory/studentDormInfo/index.vue
+++ b/pages/dormitory/studentDormInfo/index.vue
@@ -21,8 +21,8 @@
 								@change="handleGradeChange" class="filter-picker">
 								<view class="picker-content">
 									<!-- 添加空值判断 -->
-									<text
-										class="picker-text">{{ gradeList[gradeIndex] ? gradeList[gradeIndex].gradeName : '全部' }}</text>
+									<text class="picker-text">{{ gradeList[gradeIndex] ? gradeList[gradeIndex].gradeName
+										: '全部' }}</text>
 									<uni-icons type="bottom" size="20rpx" color="#999"></uni-icons>
 								</view>
 							</picker>
@@ -34,8 +34,8 @@
 							<picker mode="selector" :range="dormAreaList" :range-key="'name'" :value="dormAreaIndex"
 								@change="handleDormAreaChange" class="filter-picker">
 								<view class="picker-content">
-									<text
-										class="picker-text">{{ dormAreaList[dormAreaIndex] ? dormAreaList[dormAreaIndex].name : '全部' }}</text>
+									<text class="picker-text">{{ dormAreaList[dormAreaIndex] ?
+										dormAreaList[dormAreaIndex].name : '全部' }}</text>
 									<uni-icons type="bottom" size="20rpx" color="#999"></uni-icons>
 								</view>
 							</picker>
@@ -48,8 +48,8 @@
 								:disabled="!queryParams.campusId" @change="handleParkChange" class="filter-picker"
 								id="park">
 								<view class="picker-content">
-									<text
-										class="picker-text">{{ parkList[parkIndex] ? parkList[parkIndex].name : '全部' }}</text>
+									<text class="picker-text">{{ parkList[parkIndex] ? parkList[parkIndex].name : '全部'
+									}}</text>
 									<uni-icons type="bottom" size="20rpx" color="#999"></uni-icons>
 								</view>
 							</picker>
@@ -59,7 +59,7 @@
 						<view class="filter-item">
 							<text class="filter-label">宿舍</text>
 							<view @click="addRecordsPopup" class="filter-input">
-								{{ dormValue || '请输入'}}
+								{{ dormValue || '请输入' }}
 							</view>
 						</view>
 						<uni-popup ref="popupTime" class="popup-time" background-color="#ffffff">
@@ -73,8 +73,8 @@
 										<picker range-key="name" :value="buildingIndex" :range="buildingOptions"
 											@change="handleBuildingChange">
 											<view class="uni-input">
-												<text
-													class="val">{{buildingOptions[buildingIndex] ? buildingOptions[buildingIndex].name : '全部'}}</text>
+												<text class="val">{{ buildingOptions[buildingIndex] ?
+													buildingOptions[buildingIndex].name : '全部' }}</text>
 												<uni-icons type="calendar" size="25" color="#202020"></uni-icons>
 											</view>
 										</picker>
@@ -84,8 +84,8 @@
 										<picker @change="handleFloorChange" :range="floorOptions" :range-key="'floor'"
 											:disabled="!queryParams.buildingId">
 											<view class="uni-input">
-												<text
-													class="val">{{floorOptions[floorIndex] ? floorOptions[floorIndex].floor : '全部'}}</text>
+												<text class="val">{{ floorOptions[floorIndex] ?
+													floorOptions[floorIndex].floor : '全部' }}</text>
 												<uni-icons type="calendar" size="25" color="#202020"></uni-icons>
 											</view>
 										</picker>
@@ -95,8 +95,8 @@
 										<picker @change="handleDormChange" :range="dormOptions" :range-key="'roomNo'"
 											:disabled="!queryParams.floorId">
 											<view class="uni-input">
-												<text
-													class="val">{{dormOptions[dormIndex] ? dormOptions[dormIndex].roomNo : '全部'}}</text>
+												<text class="val">{{ dormOptions[dormIndex] ?
+													dormOptions[dormIndex].roomNo : '全部' }}</text>
 												<uni-icons type="calendar" size="25" color="#202020"></uni-icons>
 											</view>
 										</picker>
@@ -125,9 +125,17 @@
 			</view>
 		</view>
 
+		<u-modal :show="showNotice" title="提示"
+			:content="noticeContent"
+			:showCancelButton="false"
+			:closeOnClickOverlay="true"
+			@confirm="onCloseNotice"
+			@close="onCloseNotice" />
+
 		<!-- 添加信息收集按钮 -->
 		<view class="add" @click="addDormInfo" v-if="roleGroup == '学生'">+</view>
 
+
 		<!-- 滚动容器 -->
 		<scroll-view ref="scrollRef" class="scroll-container" scroll-y @scrolltolower="loadNextPage"
 			@refresherrefresh="handleRefresh">
@@ -153,6 +161,9 @@
 							<view>入住时间: {{ item.checkinTime }}</view>
 							<view>状态: {{ item.inStatus === '1' ? '已入住' : '未入住' }}</view>
 						</view>
+						<view class="item-actions">
+							<button class="edit-btn" @click.stop="editItem(item)">详情</button>
+						</view>
 					</view>
 				</view>
 
@@ -162,860 +173,943 @@
 				<view v-if="dormInfo.length === 0 && !isLoading" class="no-data">暂无数据</view>
 			</view>
 		</scroll-view>
+
 	</view>
 </template>
 
 <script>
-	import {
-		listAllCampus,
-		listParkByCampus,
-		listBuildingByPark,
-		listFloorByBuilding,
-		listAllRoomByFloor,
-		listStudent,
-		getDeptName
-	} from "@/api/dms/studentDormInfo/index.js"
-	import {
-		getUserProfile
-	} from '@/api/system/user'
-	import {
-		listGrade
-	} from "@/api/dms/studentDormInfo/index.js"
-	export default {
-		data() {
-			return {
-				queryParams: {
-					pageNum: 1,
-					pageSize: 5, // 每页5条，便于测试分页
-					dormitoryId: null,
-					bedId: null,
-					stuNo: null,
-					isDormitoryHead: null,
-					status: null,
-					checkinTime: null,
-					inStatus: null,
-					stuName: null,
-					teacherName: null,
-					gradeId: null,
-					campusId: null,
-					parkId: null,
-					buildingId: null,
-					floorId: null,
-					dormitoryId: null,
-					dormArea: null, // 宿舍区筛选参数
-					parkName: null // 园区筛选参数
-				},
-				dormInfo: [],
-				isLoading: false,
-				hasMore: true,
-				total: 0, // 存储接口返回的总数据条数
-				// 筛选下拉选项数据
-				gradeList: [],
-				dormAreaList: [],
-				parkList: [],
-				// 楼栋选项（按园区联动）
-				buildingOptions: [],
-				// 楼层选项（下拉框）
-				floorOptions: [],
-				// 宿舍号选项（下拉框）
-				dormOptions: [],
-				// 筛选选中索引
-				gradeIndex: 0,
-				dormAreaIndex: 0,
-				parkIndex: 0,
-				buildingIndex: 0,
-				floorIndex: 0,
-				dormIndex: 0,
-				searchTimer: null,
-				roleGroup: null,
-				// 存储搜索区高度（非学生有搜索区，学生无）
-				searchAreaHeight: 0,
-				dormValue: ''
-			}
+import {
+	getDeptName,
+	listAllCampus,
+	listAllRoomByFloor,
+	listBuildingByPark,
+	listFloorByBuilding,
+	listGrade,
+	listParkByCampus,
+	listStudent
+} from "@/api/dms/studentDormInfo/index.js";
+import {
+	getUserProfile
+} from '@/api/system/user';
+export default {
+	data() {
+		return {
+			queryParams: {
+				pageNum: 1,
+				pageSize: 5, // 每页5条，便于测试分页
+				dormitoryId: null,
+				bedId: null,
+				stuNo: null,
+				isDormitoryHead: null,
+				status: null,
+				checkinTime: null,
+				inStatus: null,
+				stuName: null,
+				teacherName: null,
+				gradeId: null,
+				campusId: null,
+				parkId: null,
+				buildingId: null,
+				floorId: null,
+				dormitoryId: null,
+				dormArea: null, // 宿舍区筛选参数
+				parkName: null // 园区筛选参数
+			},
+			dormInfo: [],
+			isLoading: false,
+			hasMore: true,
+			total: 0, // 存储接口返回的总数据条数
+			// 筛选下拉选项数据
+			gradeList: [],
+			dormAreaList: [],
+			parkList: [],
+			// 楼栋选项（按园区联动）
+			buildingOptions: [],
+			// 楼层选项（下拉框）
+			floorOptions: [],
+			// 宿舍号选项（下拉框）
+			dormOptions: [],
+			// 筛选选中索引
+			gradeIndex: 0,
+			dormAreaIndex: 0,
+			parkIndex: 0,
+			buildingIndex: 0,
+			floorIndex: 0,
+			dormIndex: 0,
+			searchTimer: null,
+			roleGroup: null,
+			// 存储搜索区高度（非学生有搜索区，学生无）
+			searchAreaHeight: 0,
+			showNotice: false,
+			noticeContent: '请在一周内确认自己的住宿信息和银行卡信息，并上传个人证件照',
+			dormValue: ''
+		}
 		},
-		onShow() {
-			// 每次显示页面时重置数据并重新加载
-			this.resetData()
-			this.getUserProfile()
-			this.listGrade()
-			this.listAllCampus()
-			this.scrollToTop()
-			// 页面渲染完成后，计算搜索区高度并设置内边距
+	onShow() {
+		this.openNotice()
+		// 每次显示页面时重置数据并重新加载
+		this.resetData()
+		this.getUserProfile()
+		this.listGrade()
+		this.listAllCampus()
+		this.scrollToTop()
+		// 页面渲染完成后，计算搜索区高度并设置内边距
+		this.$nextTick(() => {
+			this.calcSearchAreaHeight()
+			this.setScrollContentPadding()
+		})
+	},
+	onLoad() {
+		this.$nextTick(() => this.openNotice())
+	},
+	watch: {
+		// 监听角色变化，重新设置内边距（防止角色切换导致适配问题）
+		roleGroup() {
 			this.$nextTick(() => {
 				this.calcSearchAreaHeight()
 				this.setScrollContentPadding()
 			})
+		}
+	},
+		methods: {
+			openNotice() {
+				this.showNotice = true
+			},
+			onCloseNotice() {
+				this.showNotice = false
+			},
+			onGoFill() {},
+		// 重置分页数据（用于刷新或重新加载）
+		resetData() {
+			this.queryParams.pageNum = 1
+			this.dormInfo = []
+			this.hasMore = true
+			this.total = 0 // 重置总条数
 		},
-		watch: {
-			// 监听角色变化，重新设置内边距（防止角色切换导致适配问题）
-			roleGroup() {
-				this.$nextTick(() => {
-					this.calcSearchAreaHeight()
-					this.setScrollContentPadding()
-				})
+
+		// 计算搜索区高度
+		calcSearchAreaHeight() {
+			if (this.roleGroup !== '学生') {
+				const query = uni.createSelectorQuery().in(this)
+				query.select('.fixed-search-wrap')
+					.boundingClientRect(rect => {
+						// 转换rpx为px（1rpx≈0.5px，根据实际设备像素比调整）
+						this.searchAreaHeight = rect ? Math.ceil(rect.height) : 145 // 145px≈290rpx
+					})
+					.exec()
+			} else {
+				this.searchAreaHeight = 0
+			}
+			console.log(this.searchAreaHeight);
+		},
+
+		// 动态设置滚动内容的顶部内边距
+		setScrollContentPadding() {
+			const scrollContent = document.querySelector('.scroll-content')
+			const scrollContainer = document.querySelector('.scroll-container')
+			if (scrollContent) {
+				if (this.roleGroup !== '学生') {
+					// 非学生：内边距=搜索区高度 - 60rpx（额外间距）
+					const paddingTop = this.searchAreaHeight - 30 // 10px≈20rpx
+					scrollContent.style.paddingTop = `${paddingTop}px`
+				} else {
+					// 学生：基础内边距
+					scrollContent.style.paddingTop = '5px'
+					scrollContainer.style.top = '10px'
+				}
 			}
 		},
-		methods: {
-			// 重置分页数据（用于刷新或重新加载）
-			resetData() {
-				this.queryParams.pageNum = 1
-				this.dormInfo = []
-				this.hasMore = true
-				this.total = 0 // 重置总条数
-			},
 
-			// 计算搜索区高度
-			calcSearchAreaHeight() {
-				if (this.roleGroup !== '学生') {
-					const query = uni.createSelectorQuery().in(this)
-					query.select('.fixed-search-wrap')
-						.boundingClientRect(rect => {
-							// 转换rpx为px（1rpx≈0.5px，根据实际设备像素比调整）
-							this.searchAreaHeight = rect ? Math.ceil(rect.height) : 145 // 145px≈290rpx
-						})
-						.exec()
-				} else {
-					this.searchAreaHeight = 0
-				}
-				console.log(this.searchAreaHeight);
-			},
-
-			// 动态设置滚动内容的顶部内边距
-			setScrollContentPadding() {
-				const scrollContent = document.querySelector('.scroll-content')
-				const scrollContainer = document.querySelector('.scroll-container')
-				if (scrollContent) {
-					if (this.roleGroup !== '学生') {
-						// 非学生：内边距=搜索区高度 - 60rpx（额外间距）
-						const paddingTop = this.searchAreaHeight - 30 // 10px≈20rpx
-						scrollContent.style.paddingTop = `${paddingTop}px`
-					} else {
-						// 学生：基础内边距
-						scrollContent.style.paddingTop = '5px' 
-						scrollContainer.style.top = '10px'
-					}
-				}
-			},
-
-			// 滚动条回到顶部的方法
-			scrollToTop() {
-				// 1. scroll-view 自身回顶
-				if (this.$refs.scrollRef) {
-					this.$refs.scrollRef.scrollTo({
-						scrollTop: 0,
-						duration: 300
-					})
-				}
-				// 2. 页面级回顶（兜底）
-				uni.pageScrollTo({
+		// 滚动条回到顶部的方法
+		scrollToTop() {
+			// 1. scroll-view 自身回顶
+			if (this.$refs.scrollRef) {
+				this.$refs.scrollRef.scrollTo({
 					scrollTop: 0,
 					duration: 300
 				})
-			},
+			}
+			// 2. 页面级回顶（兜底）
+			uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 300
+			})
+		},
 
 
-			// 查询列表数据
-			async getList() {
-				if (this.isLoading || !this.hasMore) {
-					// 若无需加载，直接停止刷新
-					uni.stopPullDownRefresh()
-					return
-				}
-				this.isLoading = true
+		// 查询列表数据
+		async getList() {
+			if (this.isLoading || !this.hasMore) {
+				// 若无需加载，直接停止刷新
+				uni.stopPullDownRefresh()
+				return
+			}
+			this.isLoading = true
 
-				try {
-					const res = await listStudent(this.queryParams)
-					if (res.code === 200) {
-						const newData = res.rows || []
-						this.total = res.total || 0 // 从接口获取总数据条数（需确保接口返回 total）
-						// 第一页覆盖数据，后续页追加
-						this.dormInfo = this.queryParams.pageNum === 1 ? newData : [...this.dormInfo, ...newData]
-						// 关键判断：当前已加载条数 >= 总条数 → 无更多数据
-						this.hasMore = this.dormInfo.length < this.total
-					} else {
-						uni.showToast({
-							title: '加载失败',
-							icon: 'none'
-						})
-						this.hasMore = false // 加载失败时停止后续请求
-					}
-				} catch (err) {
-					console.error('加载数据出错:', err)
+			try {
+				const res = await listStudent(this.queryParams)
+				if (res.code === 200) {
+					const newData = res.rows || []
+					this.total = res.total || 0 // 从接口获取总数据条数（需确保接口返回 total）
+					// 第一页覆盖数据，后续页追加
+					this.dormInfo = this.queryParams.pageNum === 1 ? newData : [...this.dormInfo, ...newData]
+					// 关键判断：当前已加载条数 >= 总条数 → 无更多数据
+					this.hasMore = this.dormInfo.length < this.total
+				} else {
 					uni.showToast({
-						title: '网络错误',
+						title: '加载失败',
 						icon: 'none'
 					})
-					this.hasMore = false // 异常时停止后续请求
-				} finally {
-					this.isLoading = false
-					// 最终兜底：无论如何都停止刷新
-					uni.stopPullDownRefresh()
+					this.hasMore = false // 加载失败时停止后续请求
 				}
-			},
-
-			// 加载下一页
-			loadNextPage() {
-				console.log('触发加载下一页')
-				if (this.hasMore) {
-					this.queryParams.pageNum++
-					this.getList()
-				}
-			},
-
-			// 下拉刷新
-			handleRefresh() {
-				console.log('触发下拉刷新')
-				this.resetData()
-				// 直接先停止一次（防止初始动画卡住）
+			} catch (err) {
+				console.error('加载数据出错:', err)
+				uni.showToast({
+					title: '网络错误',
+					icon: 'none'
+				})
+				this.hasMore = false // 异常时停止后续请求
+			} finally {
+				this.isLoading = false
+				// 最终兜底：无论如何都停止刷新
 				uni.stopPullDownRefresh()
-				// 执行数据加载，加载完成后再次停止
-				this.getList().then(() => {
-					// 延迟300ms确保动画正常结束（兼容快速加载场景）
-					setTimeout(() => {
-						uni.stopPullDownRefresh()
-					}, 300)
-				}).catch(() => {
-					setTimeout(() => {
-						uni.stopPullDownRefresh()
-					}, 300)
-				})
-			},
+			}
+		},
 
-			// 获取用户信息
-			async getUserProfile() {
-				try {
-					const res = await getUserProfile()
-					console.log('当前用户信息:', res)
-					this.roleGroup = res.roleGroup
-					if (res.roleGroup === "学生") {
-						this.queryParams.stuName = res.data.nickName
-					} else if (res.roleGroup.includes("辅导员")) {
-						this.queryParams.teacherName = res.data.nickName
-					} else if (res.roleGroup.includes("学务")) {
-						let res = await getDeptName()
-						console.log(res);
-					}
-					this.getList()
-				} catch (err) {
-					console.error('获取用户信息失败:', err)
-				}
-			},
-
-			// 跳转添加页面
-			addDormInfo() {
-				if (this.roleGroup === "学生") {
-					if (this.dormInfo.length > 0) {
-						uni.showToast({
-							title: '请勿重复提交',
-							icon: 'none'
-						});
-						return
-					}
-				}
-				uni.navigateTo({
-					url: `/pages/dormitory/studentDormInfo/informationCollection`
-				})
-			},
-
-			// 点击列表项
-			handleItemClick(item) {
-				console.log('点击学生信息:', item)
-				// 可添加跳转详情页逻辑
-				// uni.navigateTo({ url: `/pages/detail?id=${item.id}` })
-			},
-
-			// 获取年级
-			async listGrade() {
-				let res = await listGrade()
-				this.gradeList = [{
-					gradeName: '全部'
-				}, ...res.rows]
-			},
-
-			// 获取校区数据
-			async listAllCampus() {
-				let res = await listAllCampus()
-				if (res.code == 200) {
-					this.dormAreaList = [{
-						name: '全部'
-					}, ...res.data]
-				}
-			},
-
-			// 搜索输入防抖
-			handleSearchInput() {
-				clearTimeout(this.searchTimer)
-				this.searchTimer = setTimeout(() => {
-					this.resetData()
-					this.getList()
-				}, 1000)
-			},
-
-			// 年级筛选
-			handleGradeChange(e) {
-				this.gradeIndex = e.detail.value
-				const selectedGrade = this.gradeList[this.gradeIndex]
-				// 修复：“全部”选项无gradeId，设为null
-				this.queryParams.gradeId = selectedGrade.gradeId || null
-				this.resetData()
+		// 加载下一页
+		loadNextPage() {
+			console.log('触发加载下一页')
+			if (this.hasMore) {
+				this.queryParams.pageNum++
 				this.getList()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-			},
+			}
+		},
 
-			// 宿舍区筛选
-			async handleDormAreaChange(e) {
-				this.dormAreaIndex = e.detail.value
-				const selectedArea = this.dormAreaList[this.dormAreaIndex]
-				this.queryParams.campusId = selectedArea.id || null
-				this.resetData()
+		// 下拉刷新
+		handleRefresh() {
+			console.log('触发下拉刷新')
+			this.resetData()
+			// 直接先停止一次（防止初始动画卡住）
+			uni.stopPullDownRefresh()
+			// 执行数据加载，加载完成后再次停止
+			this.getList().then(() => {
+				// 延迟300ms确保动画正常结束（兼容快速加载场景）
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 300)
+			}).catch(() => {
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 300)
+			})
+		},
+
+		// 获取用户信息
+		async getUserProfile() {
+			try {
+				const res = await getUserProfile()
+				console.log('当前用户信息:', res)
+				this.roleGroup = res.roleGroup
+				if (res.roleGroup === "学生") {
+					this.queryParams.stuName = res.data.nickName
+				} else if (res.roleGroup.includes("辅导员")) {
+					this.queryParams.teacherName = res.data.nickName
+				} else if (res.roleGroup.includes("学务")) {
+					let res = await getDeptName()
+					console.log(res);
+				}
 				this.getList()
-				this.resetDorm()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-				if (this.queryParams.campusId) {
-					// 根据校区id获取园区
-					let res = await listParkByCampus(this.queryParams.campusId)
-					if (res.code == 200) {
-						this.parkList = [{
-							name: '全部'
-						}, ...res.data]
-					}
-				}
-			},
+			} catch (err) {
+				console.error('获取用户信息失败:', err)
+			}
+		},
 
-			// 宿舍区选择，重置园区等其他选择
-			resetDorm() {
-				this.parkList = []
-				this.parkIndex = 0
-				this.buildingOptions = []
-				this.buildingIndex = 0
-				this.floorIndex = 0
-				this.floorOptions = []
-				this.dormIndex = 0
-				this.dormOptions = []
-				this.dormValue = ''
-			},
-
-			// 判断是否选择上一个选项
-			isDorm(data) {
-				if (data == '楼层') {
-					if (this.queryParams.buildingId == null) {
-						uni.showToast({
-							title: '请先选择楼栋',
-							icon: 'none'
-						});
-						return
-					}
-				} else if (data == '宿舍号') {
-					if (this.queryParams.floorId == null) {
-						uni.showToast({
-							title: '请先选择楼层',
-							icon: 'none'
-						});
-						return
-					}
-				} else {
-					if (this.queryParams.campusId == null) {
-						uni.showToast({
-							title: '请先选择宿舍区',
-							icon: 'none'
-						});
-						return
-					}
-				}
-			},
-
-			// 园区筛选
-			async handleParkChange(e) {
-
-				this.parkIndex = e.detail.value
-				const selectedPark = this.parkList[this.parkIndex]
-				this.queryParams.parkId = selectedPark.id || null
-				this.resetData()
-				this.getList()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-				this.buildingOptions = []
-				this.buildingIndex = 0
-				this.floorIndex = 0
-				this.floorOptions = []
-				this.dormIndex = 0
-				this.dormOptions = []
-				this.dormValue = ''
-				if (this.queryParams.parkId) {
-					// 根据园区id获取楼栋
-					let res = await listBuildingByPark(this.queryParams.parkId)
-					if (res.code == 200) {
-						this.buildingOptions = [{
-							name: '全部'
-						}, ...res.data]
-					}
-				}
-			},
-
-			// 楼栋筛选
-			async handleBuildingChange(e) {
-				this.buildingIndex = e.detail.value
-				const selectedBuilding = this.buildingOptions[this.buildingIndex]
-				this.queryParams.buildingId = selectedBuilding.id || null
-				this.floorIndex = 0
-				this.floorOptions = []
-				this.dormIndex = 0
-				this.dormOptions = []
-				this.dormValue = ''
-				if (this.queryParams.buildingId) {
-					// 根据楼栋id获取楼层
-					let res = await listFloorByBuilding(this.queryParams.buildingId)
-					if (res.code == 200) {
-						this.floorOptions = [{
-							floor: '全部'
-						}, ...res.data]
-
-					}
-				}
-			},
-
-			// 楼层筛选
-			async handleFloorChange(e) {
-				this.floorIndex = e.detail.value
-				const selectedFloor = this.floorOptions[this.floorIndex]
-				this.queryParams.floorId = selectedFloor.id || null
-				this.dormIndex = 0
-				this.dormOptions = []
-				this.dormValue = ''
-				if (this.queryParams.floorId) {
-					// 根据楼栋id获取楼层
-					let res = await listAllRoomByFloor(this.queryParams.floorId)
-					if (res.code == 200) {
-						this.dormOptions = [{
-							roomNo: '全部'
-						}, ...res.data]
-					}
-				}
-			},
-
-			// 宿舍号筛选
-			handleDormChange(e) {
-				this.dormIndex = e.detail.value
-				const selectedDorm = this.dormOptions[this.dormIndex]
-				this.queryParams.dormitoryId = selectedDorm.id || null
-			},
-
-			// 重置筛选
-			resetFilter() {
-				this.gradeIndex = 0
-				this.dormAreaIndex = 0
-				this.parkIndex = 0
-				this.buildingIndex = 0
-				this.floorIndex = 0
-				this.dormIndex = 0
-				this.dormValue = ''
-				// 重置筛选参数，保留分页基础参数
-				this.queryParams = {
-					...this.queryParams,
-					gradeId: null,
-					dormArea: null,
-					parkName: null,
-					roomNo: null,
-					stuName: null,
-					campusId: null,
-					parkId: null,
-					buildingId: null,
-					floorId: null,
-					dormitoryId: null,
-					dormArea: null, // 宿舍区筛选参数
-					parkName: null // 园区筛选参数
-				}
-				this.resetData()
-				this.getList()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-			},
-
-			// 手动搜索
-			handleSearch() {
-				this.resetData()
-				this.getList()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-			},
-			addRecordsPopup() {
-				if (this.queryParams.parkId == null) {
+		// 跳转添加页面
+		addDormInfo() {
+			if (this.roleGroup === "学生") {
+				if (this.dormInfo.length > 0) {
 					uni.showToast({
-						title: '请先选择园区',
+						title: '请勿重复提交',
 						icon: 'none'
 					});
 					return
 				}
-				this.$refs.popupTime.open('center');
-			},
-			onCancel() {
-				this.$refs.popupTime.close();
-			},
-			topersonalReporting() {
-				
-				if (this.queryParams.buildingId != null) {
-					this.dormValue = this.buildingOptions[this.buildingIndex].name
-				} 
-				if (this.queryParams.floorId != null) {
-					 const data = `${this.floorOptions[this.floorIndex].floor}`
-					if (!data.includes("栋")) {
-						this.dormValue = this.buildingOptions[this.buildingIndex].name + ' ' + this.floorOptions[this.floorIndex].floor + "层"
-					} else {
-						this.dormValue = this.buildingOptions[this.buildingIndex].name + ' ' + this.floorOptions[this.floorIndex].floor
-					}
-				} 
-				if (this.queryParams.dormitoryId != null) {
-					this.dormValue = this.dormOptions[this.dormIndex].roomNo
-				} 
-				console.log(this.dormValue);
-				this.resetData()
-				this.getList()
-				this.scrollToTop()
-				this.$nextTick(() => this.setScrollContentPadding())
-				this.$refs.popupTime.close();
+			}
+			uni.navigateTo({
+				url: `/pages/dormitory/studentDormInfo/informationCollection`
+			})
+		},
+
+		// 点击列表项
+		handleItemClick(item) {
+			const itemId = item.id
+			uni.navigateTo({ url: `/pages/dormitory/studentDormInfo/informationCollection?mode=edit&id=${itemId}` })
+		},
+
+		// 明示编辑按钮
+		editItem(item) {
+			const itemId = item.id
+			uni.navigateTo({ url: `/pages/dormitory/studentDormInfo/informationCollection?mode=edit&id=${itemId}` })
+		},
+
+		// 获取年级
+		async listGrade() {
+			let res = await listGrade()
+			this.gradeList = [{
+				gradeName: '全部'
+			}, ...res.rows]
+		},
+
+		// 获取校区数据
+		async listAllCampus() {
+			let res = await listAllCampus()
+			if (res.code == 200) {
+				this.dormAreaList = [{
+					name: '全部'
+				}, ...res.data]
 			}
 		},
-		destroyed() {
+
+		// 搜索输入防抖
+		handleSearchInput() {
 			clearTimeout(this.searchTimer)
+			this.searchTimer = setTimeout(() => {
+				this.resetData()
+				this.getList()
+			}, 1000)
+		},
+
+		// 年级筛选
+		handleGradeChange(e) {
+			this.gradeIndex = e.detail.value
+			const selectedGrade = this.gradeList[this.gradeIndex]
+			// 修复：“全部”选项无gradeId，设为null
+			this.queryParams.gradeId = selectedGrade.gradeId || null
+			this.resetData()
+			this.getList()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+		},
+
+		// 宿舍区筛选
+		async handleDormAreaChange(e) {
+			this.dormAreaIndex = e.detail.value
+			const selectedArea = this.dormAreaList[this.dormAreaIndex]
+			this.queryParams.campusId = selectedArea.id || null
+			this.resetData()
+			this.getList()
+			this.resetDorm()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+			if (this.queryParams.campusId) {
+				// 根据校区id获取园区
+				let res = await listParkByCampus(this.queryParams.campusId)
+				if (res.code == 200) {
+					this.parkList = [{
+						name: '全部'
+					}, ...res.data]
+				}
+			}
+		},
+
+		// 宿舍区选择，重置园区等其他选择
+		resetDorm() {
+			this.parkList = []
+			this.parkIndex = 0
+			this.buildingOptions = []
+			this.buildingIndex = 0
+			this.floorIndex = 0
+			this.floorOptions = []
+			this.dormIndex = 0
+			this.dormOptions = []
+			this.dormValue = ''
+		},
+
+		// 判断是否选择上一个选项
+		isDorm(data) {
+			if (data == '楼层') {
+				if (this.queryParams.buildingId == null) {
+					uni.showToast({
+						title: '请先选择楼栋',
+						icon: 'none'
+					});
+					return
+				}
+			} else if (data == '宿舍号') {
+				if (this.queryParams.floorId == null) {
+					uni.showToast({
+						title: '请先选择楼层',
+						icon: 'none'
+					});
+					return
+				}
+			} else {
+				if (this.queryParams.campusId == null) {
+					uni.showToast({
+						title: '请先选择宿舍区',
+						icon: 'none'
+					});
+					return
+				}
+			}
+		},
+
+		// 园区筛选
+		async handleParkChange(e) {
+
+			this.parkIndex = e.detail.value
+			const selectedPark = this.parkList[this.parkIndex]
+			this.queryParams.parkId = selectedPark.id || null
+			this.resetData()
+			this.getList()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+			this.buildingOptions = []
+			this.buildingIndex = 0
+			this.floorIndex = 0
+			this.floorOptions = []
+			this.dormIndex = 0
+			this.dormOptions = []
+			this.dormValue = ''
+			if (this.queryParams.parkId) {
+				// 根据园区id获取楼栋
+				let res = await listBuildingByPark(this.queryParams.parkId)
+				if (res.code == 200) {
+					this.buildingOptions = [{
+						name: '全部'
+					}, ...res.data]
+				}
+			}
+		},
+
+		// 楼栋筛选
+		async handleBuildingChange(e) {
+			this.buildingIndex = e.detail.value
+			const selectedBuilding = this.buildingOptions[this.buildingIndex]
+			this.queryParams.buildingId = selectedBuilding.id || null
+			this.floorIndex = 0
+			this.floorOptions = []
+			this.dormIndex = 0
+			this.dormOptions = []
+			this.dormValue = ''
+			if (this.queryParams.buildingId) {
+				// 根据楼栋id获取楼层
+				let res = await listFloorByBuilding(this.queryParams.buildingId)
+				if (res.code == 200) {
+					this.floorOptions = [{
+						floor: '全部'
+					}, ...res.data]
+
+				}
+			}
+		},
+
+		// 楼层筛选
+		async handleFloorChange(e) {
+			this.floorIndex = e.detail.value
+			const selectedFloor = this.floorOptions[this.floorIndex]
+			this.queryParams.floorId = selectedFloor.id || null
+			this.dormIndex = 0
+			this.dormOptions = []
+			this.dormValue = ''
+			if (this.queryParams.floorId) {
+				// 根据楼栋id获取楼层
+				let res = await listAllRoomByFloor(this.queryParams.floorId)
+				if (res.code == 200) {
+					this.dormOptions = [{
+						roomNo: '全部'
+					}, ...res.data]
+				}
+			}
+		},
+
+		// 宿舍号筛选
+		handleDormChange(e) {
+			this.dormIndex = e.detail.value
+			const selectedDorm = this.dormOptions[this.dormIndex]
+			this.queryParams.dormitoryId = selectedDorm.id || null
+		},
+
+		// 重置筛选
+		resetFilter() {
+			this.gradeIndex = 0
+			this.dormAreaIndex = 0
+			this.parkIndex = 0
+			this.buildingIndex = 0
+			this.floorIndex = 0
+			this.dormIndex = 0
+			this.dormValue = ''
+			// 重置筛选参数，保留分页基础参数
+			this.queryParams = {
+				...this.queryParams,
+				gradeId: null,
+				dormArea: null,
+				parkName: null,
+				roomNo: null,
+				stuName: null,
+				campusId: null,
+				parkId: null,
+				buildingId: null,
+				floorId: null,
+				dormitoryId: null,
+				dormArea: null, // 宿舍区筛选参数
+				parkName: null // 园区筛选参数
+			}
+			this.resetData()
+			this.getList()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+		},
+
+		// 手动搜索
+		handleSearch() {
+			this.resetData()
+			this.getList()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+		},
+		addRecordsPopup() {
+			if (this.queryParams.parkId == null) {
+				uni.showToast({
+					title: '请先选择园区',
+					icon: 'none'
+				});
+				return
+			}
+			this.$refs.popupTime.open('center');
+		},
+		onCancel() {
+			this.$refs.popupTime.close();
+		},
+		topersonalReporting() {
+
+			if (this.queryParams.buildingId != null) {
+				this.dormValue = this.buildingOptions[this.buildingIndex].name
+			}
+			if (this.queryParams.floorId != null) {
+				const data = `${this.floorOptions[this.floorIndex].floor}`
+				if (!data.includes("栋")) {
+					this.dormValue = this.buildingOptions[this.buildingIndex].name + ' ' + this.floorOptions[this.floorIndex].floor + "层"
+				} else {
+					this.dormValue = this.buildingOptions[this.buildingIndex].name + ' ' + this.floorOptions[this.floorIndex].floor
+				}
+			}
+			if (this.queryParams.dormitoryId != null) {
+				this.dormValue = this.dormOptions[this.dormIndex].roomNo
+			}
+			console.log(this.dormValue);
+			this.resetData()
+			this.getList()
+			this.scrollToTop()
+			this.$nextTick(() => this.setScrollContentPadding())
+			this.$refs.popupTime.close();
 		}
+	},
+	destroyed() {
+		clearTimeout(this.searchTimer)
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	.page-container {
-		position: relative;
-		height: 100vh;
-		background-color: #f5f7fa;
-		box-sizing: border-box;
-		/* 禁止页面滚动 */
-		overflow: hidden;
-	}
+.page-container {
+	position: relative;
+	height: 100vh;
+	background-color: #f5f7fa;
+	box-sizing: border-box;
+	/* 禁止页面滚动 */
+	overflow: hidden;
+}
 
-	/* 固定搜索区*/
-	.fixed-search-wrap {
-		position: fixed;
-		top: 44px;
-		/* 原生title高度 */
-		left: 0;
-		right: 0;
-		z-index: 90;
-		background-color: #fff;
-		border-bottom: 1px solid #eee;
-		padding: 14px;
-		box-sizing: border-box;
-	}
 
-	/* 触发器：样式简洁，点击区域大 */
-	.search-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		cursor: pointer;
-		border-bottom: 1px solid #f5f5f5;
-	}
 
-	.search-header-title {
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #333;
-	}
+/* 固定搜索区*/
+.fixed-search-wrap {
+	position: fixed;
+	top: 44px;
+	/* 原生title高度 */
+	left: 0;
+	right: 0;
+	z-index: 90;
+	background-color: #fff;
+	border-bottom: 1px solid #eee;
+	padding: 14px;
+	box-sizing: border-box;
+}
 
-	/* 搜索内容*/
-	.search-content {
-		transition: all 0.3s ease;
-		/* 动画过渡更自然 */
-	}
+/* 触发器：样式简洁，点击区域大 */
+.search-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	cursor: pointer;
+	border-bottom: 1px solid #f5f5f5;
+}
 
-	.search-card {
-		padding: 20rpx;
-		box-shadow: none;
-		/* 收缩时去掉阴影，更简洁 */
-	}
+.search-header-title {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333;
+}
 
-	/* 滚动容器：调整顶部内边距，适应搜索区高度变化 */
-	.scroll-container {
-		position: absolute;
-		top: 44px;
-		/* 与原生title对齐 */
-		left: 0;
-		right: 0;
-		bottom: 60px;
-		/* 预留添加按钮高度 */
-		width: 100%;
-		overflow-y: auto;
-		overflow-x: hidden;
-	}
+/* 搜索内容*/
+.search-content {
+	transition: all 0.3s ease;
+	/* 动画过渡更自然 */
+}
 
-	/* 滚动内容容器：处理内边距，避免内容被遮挡 */
-	.scroll-content {
-		/* 底部预留加载状态高度 */
-		padding-bottom: 40rpx;
-		/* 左右内边距 */
-		padding-left: 20rpx;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
+.search-card {
+	padding: 20rpx;
+	box-shadow: none;
+	/* 收缩时去掉阴影，更简洁 */
+}
 
-	/* 以下为原有样式，无需修改 */
-	.add {
-		position: fixed;
-		bottom: 50rpx;
-		right: 50rpx;
-		width: 90rpx;
-		height: 90rpx;
-		border-radius: 50%;
-		background-color: #1890FF;
-		color: white;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 60rpx;
-		box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
-		z-index: 99;
-	}
+/* 滚动容器：调整顶部内边距，适应搜索区高度变化 */
+.scroll-container {
+	position: absolute;
+	top: 44px;
+	/* 与原生title对齐 */
+	left: 0;
+	right: 0;
+	bottom: 60px;
+	/* 预留添加按钮高度 */
+	width: 100%;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
 
-	.dorm-list {
-		// padding: 20rpx;
-		padding: 0;
-	}
+/* 滚动内容容器：处理内边距，避免内容被遮挡 */
+.scroll-content {
+	/* 底部预留加载状态高度 */
+	padding-bottom: 40rpx;
+	/* 左右内边距 */
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	box-sizing: border-box;
+}
 
-	.dorm-item {
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 28rpx;
-		margin-bottom: 20rpx;
-		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-		transition: transform 0.2s;
-	}
+/* 以下为原有样式，无需修改 */
+.add {
+	position: fixed;
+	bottom: 50rpx;
+	right: 50rpx;
+	width: 90rpx;
+	height: 90rpx;
+	border-radius: 50%;
+	background-color: #1890FF;
+	color: white;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 60rpx;
+	box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
+	z-index: 99;
+}
 
-	.dorm-item:active {
-		transform: scale(0.99);
-	}
+.dorm-list {
+	// padding: 20rpx;
+	padding: 0;
+}
 
-	.item-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: 20rpx;
-		padding-bottom: 16rpx;
-		border-bottom: 1px solid #f0f0f0;
-	}
+.dorm-item {
+	background-color: #fff;
+	border-radius: 16rpx;
+	padding: 28rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+	transition: transform 0.2s;
+}
 
-	.name {
-		font-size: 34rpx;
-		font-weight: 600;
-		color: #333;
-	}
+.item-actions {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 16rpx;
+}
 
-	.tag {
-		font-size: 24rpx;
-		padding: 4rpx 16rpx;
-		border-radius: 20rpx;
-		color: #fff;
-	}
+.edit-btn {
+	background-color: #1890ff;
+	color: #fff;
+	border-radius: 8rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	padding: 0 24rpx;
+}
 
-	.head-tag {
-		background-color: #28a745;
-	}
+.dorm-item:active {
+	transform: scale(0.99);
+}
 
-	.item-content {
-		font-size: 28rpx;
-		color: #666;
-		line-height: 1.8;
-	}
+.item-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 20rpx;
+	padding-bottom: 16rpx;
+	border-bottom: 1px solid #f0f0f0;
+}
 
-	.item-content view {
-		margin-bottom: 14rpx;
-	}
+.name {
+	font-size: 34rpx;
+	font-weight: 600;
+	color: #333;
+}
 
-	.item-content view:last-child {
-		margin-bottom: 0;
-	}
+.tag {
+	font-size: 24rpx;
+	padding: 4rpx 16rpx;
+	border-radius: 20rpx;
+	color: #fff;
+}
 
-	.loading,
-	.no-more,
-	.no-data {
-		text-align: center;
-		padding: 30rpx 0;
-		color: #999;
-		font-size: 28rpx;
-	}
+.head-tag {
+	background-color: #28a745;
+}
 
-	.no-data {
-		padding: 100rpx 0;
-	}
+.item-content {
+	font-size: 28rpx;
+	color: #666;
+	line-height: 1.8;
+}
 
-	.search-row {
-		display: flex;
-		align-items: center;
-		background-color: #f5f7fa;
-		border-radius: 60rpx;
-		padding: 14rpx 20rpx;
-		margin-bottom: 24rpx;
-	}
+.item-content view {
+	margin-bottom: 14rpx;
+}
 
-	.search-icon {
-		margin-right: 12rpx;
-	}
+.item-content view:last-child {
+	margin-bottom: 0;
+}
 
-	.search-input {
-		flex: 1;
-		font-size: 28rpx;
-		color: #333;
-	}
+.loading,
+.no-more,
+.no-data {
+	text-align: center;
+	padding: 30rpx 0;
+	color: #999;
+	font-size: 28rpx;
+}
 
-	.filter-row {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 16rpx;
-		margin-bottom: 24rpx;
-	}
+.no-data {
+	padding: 100rpx 0;
+}
 
-	.filter-item {
-		flex: 1;
-		min-width: 120rpx;
-		display: flex;
-		flex-direction: column;
-		gap: 8rpx;
-	}
+.search-row {
+	display: flex;
+	align-items: center;
+	background-color: #f5f7fa;
+	border-radius: 60rpx;
+	padding: 14rpx 20rpx;
+	margin-bottom: 24rpx;
+}
 
-	.filter-label {
-		font-size: 24rpx;
-		color: #666;
-		padding-left: 4rpx;
-	}
+.search-icon {
+	margin-right: 12rpx;
+}
 
-	.picker-content,
-	.filter-input {
-		display: flex;
-		align-items: center;
-		font-size: 26rpx;
-		color: #333;
-		padding: 14rpx 16rpx;
-		background-color: #f5f7fa;
-		border-radius: 12rpx;
-		height: 60rpx;
-		box-sizing: border-box;
-	}
+.search-input {
+	flex: 1;
+	font-size: 28rpx;
+	color: #333;
+}
 
-	.filter-input::placeholder {
-		color: #999;
-	}
+.filter-row {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16rpx;
+	margin-bottom: 24rpx;
+}
 
-	.action-row {
-		display: flex;
-		gap: 16rpx;
-	}
+.filter-item {
+	flex: 1;
+	min-width: 120rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 8rpx;
+}
 
-	.reset-btn,
-	.search-btn {
-		flex: 1;
-		height: 72rpx;
-		line-height: 72rpx;
-		border-radius: 36rpx;
-		font-size: 28rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.filter-label {
+	font-size: 24rpx;
+	color: #666;
+	padding-left: 4rpx;
+}
 
-	.reset-btn {
-		background-color: #fff;
-		color: #1890FF;
-		border: 1px solid #1890FF;
-	}
+.picker-content,
+.filter-input {
+	display: flex;
+	align-items: center;
+	font-size: 26rpx;
+	color: #333;
+	padding: 14rpx 16rpx;
+	background-color: #f5f7fa;
+	border-radius: 12rpx;
+	height: 60rpx;
+	box-sizing: border-box;
+}
 
-	.search-btn {
-		background-color: #1890FF;
-		color: #fff;
-		border: none;
-	}
+.filter-input::placeholder {
+	color: #999;
+}
 
-	.btn-icon {
-		margin-right: 6rpx;
-	}
+.action-row {
+	display: flex;
+	gap: 16rpx;
+}
 
-	.popup-time,
-	.popup-audit {
-		width: 80%;
+.reset-btn,
+.search-btn {
+	flex: 1;
+	height: 72rpx;
+	line-height: 72rpx;
+	border-radius: 36rpx;
+	font-size: 28rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
 
-		.popup-content {
-			width: 600rpx;
-			height: 750rpx;
-			padding: 40rpx 50rpx 40rpx;
+.reset-btn {
+	background-color: #fff;
+	color: #1890FF;
+	border: 1px solid #1890FF;
+}
 
-			.title {
-				text-align: center;
-				padding-bottom: 20rpx;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #3D3D3D;
-				border-bottom: 1px solid #F5F5F7;
-			}
+.search-btn {
+	background-color: #1890FF;
+	color: #fff;
+	border: none;
+}
 
-			.form-item {
-				width: 100%;
-				margin-top: 40rpx;
-				padding: 0 50rpx;
+.btn-icon {
+	margin-right: 6rpx;
+}
 
-				label {
-					font-weight: bold;
-					color: #202020;
-				}
+.popup-time,
+.popup-audit {
+	width: 80%;
 
-				picker {
-					margin-top: 20rpx;
-					border: 1px solid darkgray;
-					height: 72rpx;
-					line-height: 72rpx;
-					padding-left: 8px;
-					border-radius: 10rpx;
-
-					.uni-input {
-						display: flex;
-						color: #202020;
-
-						.val {
-							flex: 1;
-						}
-
-						.uni-icons {
-							margin: 0 20rpx;
-							opacity: 0.5;
-						}
-					}
-				}
-			}
-
-			.btns {
-				display: flex;
-				margin-top: 50rpx;
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				right: 0;
-
-				button {
-					flex: 1;
-					border-radius: 0;
-					height: 80rpx;
-					line-height: 80rpx;
-
-					&:first-child {
-						background-color: #ffffff;
-						border-top: 1px solid #F5F5F7;
-					}
-
-					&:last-child {
-						background-color: #258FE4;
-						border-top: 1px solid #258FE4;
-					}
-				}
-			}
+	.popup-content {
+		width: 600rpx;
+		height: 750rpx;
+		padding: 40rpx 50rpx 40rpx;
 
+		.title {
+			text-align: center;
+			padding-bottom: 20rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #3D3D3D;
+			border-bottom: 1px solid #F5F5F7;
 		}
+
+
+
+		.form-item {
+			width: 100%;
+			margin-top: 40rpx;
+			padding: 0 50rpx;
+
+			label {
+				font-weight: bold;
+				color: #202020;
+			}
+
+			picker {
+				margin-top: 20rpx;
+				border: 1px solid darkgray;
+				height: 72rpx;
+				line-height: 72rpx;
+				padding-left: 8px;
+				border-radius: 10rpx;
+
+				.uni-input {
+					display: flex;
+					color: #202020;
+
+					.val {
+						flex: 1;
+					}
+
+					.uni-icons {
+						margin: 0 20rpx;
+						opacity: 0.5;
+					}
+				}
+			}
+		}
+
+		.btns {
+			display: flex;
+			margin-top: 50rpx;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+
+			button {
+				flex: 1;
+				border-radius: 0;
+				height: 80rpx;
+				line-height: 80rpx;
+
+				&:first-child {
+					background-color: #ffffff;
+					border-top: 1px solid #F5F5F7;
+				}
+
+				&:last-child {
+					background-color: #258FE4;
+					border-top: 1px solid #258FE4;
+				}
+			}
+		}
+
 	}
+}
+</style>
+<style scoped lang="scss">
+.notice-popup .notice-card{
+  width: 80%;
+  max-width: 680rpx;
+  background: #fff;
+  border-radius: 24rpx;
+  padding: 40rpx 32rpx;
+  box-shadow: 0 12rpx 32rpx rgba(0,0,0,0.12);
+}
+.notice-popup .title{
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+  text-align: center;
+}
+.notice-popup .msg{
+  margin-top: 28rpx;
+  font-size: 26rpx;
+  color: #666;
+  line-height: 1.6;
+  text-align: center;
+}
+.notice-popup .actions{
+    display: flex;
+    justify-content: center;
+    margin-top: 36rpx;
+}
+.notice-popup .btn{
+    flex: 0 0 auto;
+    min-width: 300rpx;
+    height: 80rpx;
+    border-radius: 16rpx;
+    font-size: 28rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 24rpx;
+}
+.notice-popup .btn.cancel{
+    background: #F5F7FA;
+    color: #333;
+}
+.notice-popup .btn.primary{
+  background: #1890FF;
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/pages/dormitory/studentDormInfo/informationCollection.vue b/pages/dormitory/studentDormInfo/informationCollection.vue
index d23154d..8d09ab8 100644
--- a/pages/dormitory/studentDormInfo/informationCollection.vue
+++ b/pages/dormitory/studentDormInfo/informationCollection.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="form-container">
-		<view class="form-title">2025-2026学年学生宿舍入住收集表</view>
+		<view class="form-title">学生宿舍入住收集表</view>
 		<view class="form-desc">涉及住宿费核算，请同学们按照实际入住情况填写。</view>
 
 		<!-- 1. 校区 -->
@@ -81,6 +81,16 @@
 			</picker>
 		</view>
 
+		<view class="form-item">
+			<view class="item-label">中国农业银行卡号</view>
+			<input class="input" v-model="form.xhk" placeholder="请输入中国农业银行卡号" />
+		</view>
+
+		<view class="form-item">
+			<view class="item-label">开户行</view>
+			<input class="input" v-model="form.bankAddr" placeholder="请输入开户行" />
+		</view>
+
 		<!-- 9. 本人证件照 -->
 		<view class="form-item">
 			<view class="item-label">
@@ -103,408 +113,530 @@
 </template>
 
 <script>
-	import {
-		listAllCampus,
-		listParkByCampus,
-		listBuildingByPark,
-		listFloorByBuilding,
-		listAllRoomByFloor,
-		addStudent,
-		submitOwnInfo as submitExtraInfo
-	} from "@/api/dms/studentDormInfo/index.js"
-	import {
-		getUserProfile
-	} from '@/api/system/user'
-	import {
-		previewImg
-	} from "@/utils/uploadImg.js"
-	import {
-		checkPic
-	} from "@/utils/checkPic.js"
-	import uploadFile from "@/plugins/upload.js";
-	export default {
-		data() {
-			return {
-				user: [],
-				form: {
-					campusName: '',
-					parkName: '',
-					buildingName: '',
-					floorName: '',
-					roomNo: '',
-					stuNo: '',
-					isDormitoryHead: '',
-					isDormHead: '',
-					checkinTime: '',
-					photo: '',
-					teacherName: '',
-					className: '',
-					deptName: '',
-					stuName: '',
-					displayText: '',
-					isInStudentsleep: '是',
-					photoData: ''
-				},
-				// 校区选项
-				campusOptions: [],
-				// 园区选项（按校区联动）
-				parkOptions: [],
-				// 楼栋选项（按园区联动）
-				buildingOptions: [],
-				// 楼层选项（下拉框）
-				floorOptions: [],
-				// 宿舍号选项（下拉框）
-				dormOptions: [],
-				// 宿舍长选项
-				dormHeadOptions: ['否', '是'],
-				// 当前选中项的id
-				selectedCampus: null, // 选中的校区（{id, name}）
-				selectedPark: null, // 选中的园区
-				selectedBuilding: null, // 选中的楼栋
-				selectedFloor: null, // 选中的楼层
-				selectedDorm: null, //选中的宿舍
-			};
+import {
+    addStudent,
+    listAllCampus,
+    listAllRoomByFloor,
+    listBuildingByPark,
+    listFloorByBuilding,
+    listParkByCampus,
+    submitOwnInfo as submitExtraInfo,
+    getStudentDetail,
+    updateStudent
+} from "@/api/dms/studentDormInfo/index.js";
+import { alipayVali } from "@/api/helpFunc/bank.js";
+import {
+	getUserProfile
+} from '@/api/system/user';
+import uploadFile from "@/plugins/upload.js";
+import config from '@/config'
+import {
+	checkPic
+} from "@/utils/checkPic.js";
+import request from "@/utils/request";
+export default {
+    data() {
+        return {
+            user: [],
+            form: {
+				campusName: '',
+				parkName: '',
+				buildingName: '',
+				floorName: '',
+				roomNo: '',
+				stuNo: '',
+				isDormitoryHead: '',
+				isDormHead: '',
+				checkinTime: '',
+				photo: '',
+				xhk: '',
+				bankAddr: '',
+				teacherName: '',
+				className: '',
+				deptName: '',
+				stuName: '',
+				displayText: '',
+				isInStudentsleep: '是',
+                photoData: ''
+            },
+			// 校区选项
+			campusOptions: [],
+			// 园区选项（按校区联动）
+			parkOptions: [],
+			// 楼栋选项（按园区联动）
+			buildingOptions: [],
+			// 楼层选项（下拉框）
+			floorOptions: [],
+			// 宿舍号选项（下拉框）
+			dormOptions: [],
+			// 宿舍长选项
+			dormHeadOptions: ['否', '是'],
+			// 当前选中项的id
+			selectedCampus: null, // 选中的校区（{id, name}）
+			selectedPark: null, // 选中的园区
+			selectedBuilding: null, // 选中的楼栋
+			selectedFloor: null, // 选中的楼层
+            selectedDorm: null, //选中的宿舍
+            mode: 'add',
+            editId: null
+        };
+    },
+    onLoad(options) {
+        this.getUserProfile()
+        this.listAllCampus()
+        if (options && options.mode === 'edit' && options.id) {
+            this.mode = 'edit'
+            this.editId = Number(options.id)
+            this.initEdit(this.editId)
+        }
+    },
+    methods: {
+		// 获取用户信息
+		async getUserProfile() {
+			try {
+				const res = await getUserProfile()
+				this.user = res
+				this.form.stuNo = this.user.data.userName
+				console.log('当前用户信息:', res)
+			} catch (err) {
+				console.error('获取用户信息失败:', err)
+			}
 		},
-		onLoad() {
-			this.getUserProfile()
-			this.listAllCampus()
+        // 获取校区数据
+        async listAllCampus() {
+            let res = await listAllCampus()
+            if (res.code == 200) {
+                this.campusOptions = [...res.data]
+            }
+        },
+        // 编辑模式初始化
+        async initEdit(id) {
+            try {
+                const res = await getStudentDetail(id)
+                if (res.code !== 200) {
+                    uni.showToast({ title: '加载详情失败', icon: 'none' })
+                    return
+                }
+                const d = res.data
+                this.form.stuNo = d.stuNo || this.form.stuNo
+                this.form.isDormHead = d.isDormitoryHead === 1 ? '是' : '否'
+                this.form.checkinTime = d.checkinTime ? String(d.checkinTime).slice(0, 10) : ''
+                this.form.isInStudentsleep = d.isInStudentsleep || this.form.isInStudentsleep
+
+                const own = await request({ url: '/system/student/getOwnInfo', method: 'get' })
+                if (own && own.data) {
+                    this.form.xhk = own.data.xhk || ''
+                    this.form.bankAddr = own.data.bankAddr || ''
+                }
+
+                const extra = await request({ url: '/comprehensive/extraInfo/getOwnInfo', method: 'get' })
+                if (extra && extra.data) {
+                    this.form.photo = extra.data.whitePhoto || ''
+                    this.form.photoData = extra.data.whitePhoto ? (config.baseUrl + extra.data.whitePhoto) : ''
+                }
+
+                const campusName = d.campusName
+                const parkName = d.parkName
+                const buildingName = d.buildingName
+                const floorName = d.floorName
+                const roomNo = d.roomNo
+
+                const campus = this.campusOptions.find(c => c.name === campusName)
+                if (campus) {
+                    this.form.campusName = campus.name
+                    this.selectedCampus = campus.id
+                    await this.listParkByCampus(this.selectedCampus)
+                    const park = this.parkOptions.find(p => p.name === parkName)
+                    if (park) {
+                        this.form.parkName = park.name
+                        this.selectedPark = park.id
+                        await this.listBuildingByPark(this.selectedPark)
+                        const building = this.buildingOptions.find(b => b.name === buildingName)
+                        if (building) {
+                            this.form.buildingName = building.name
+                            this.selectedBuilding = building.id
+                            await this.listFloorByBuilding(this.selectedBuilding)
+                            let floor = this.floorOptions.find(f => String(f.floor) === String(floorName))
+                            if (!floor) {
+                                for (const f of this.floorOptions) {
+                                    await this.listAllRoomByFloor(f.id)
+                                    const dormTry = this.dormOptions.find(r => r.roomNo === roomNo)
+                                    if (dormTry) {
+                                        floor = f
+                                        this.selectedDorm = dormTry.id
+                                        this.form.roomNo = dormTry.roomNo
+                                        break
+                                    }
+                                }
+                            }
+                            if (floor) {
+                                this.form.floorName = floor.floor
+                                this.selectedFloor = floor.id
+                                if (!this.selectedDorm) {
+                                    await this.listAllRoomByFloor(this.selectedFloor)
+                                    const dorm = this.dormOptions.find(r => r.roomNo === roomNo)
+                                    if (dorm) {
+                                        this.form.roomNo = dorm.roomNo
+                                        this.selectedDorm = dorm.id
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (e) {
+                console.error(e)
+            }
+        },
+		// 根据校区id获取园区
+		async listParkByCampus(id) {
+			let res = await listParkByCampus(id)
+			if (res.code == 200) {
+				this.parkOptions = [...res.data]
+			}
 		},
-		methods: {
-			// 获取用户信息
-			async getUserProfile() {
-				try {
-					const res = await getUserProfile()
-					this.user = res
-					this.form.stuNo = this.user.data.userName
-						console.log('当前用户信息:', res)
-				} catch (err) {
-					console.error('获取用户信息失败:', err)
-				}
-			},
-			// 获取校区数据
-			async listAllCampus() {
-				let res = await listAllCampus()
-				if (res.code == 200) {
-					this.campusOptions = [...res.data]
-				}
-			},
-			// 根据校区id获取园区
-			async listParkByCampus(id) {
-				let res = await listParkByCampus(id)
-				if (res.code == 200) {
-					this.parkOptions = [...res.data]
-				}
-			},
-			// 根据园区id获取楼栋
-			async listBuildingByPark(id) {
-				let res = await listBuildingByPark(id)
-				if (res.code == 200) {
-					this.buildingOptions = [...res.data]
-				}
-			},
-			// 根据楼栋id获取楼层
-			async listFloorByBuilding(id) {
-				let res = await listFloorByBuilding(id)
-				if (res.code == 200) {
-					this.floorOptions = [...res.data]
-				}
-			},
-			// 根据楼层id获取宿舍号
-			async listAllRoomByFloor(id) {
-				let res = await listAllRoomByFloor(id)
-				if (res.code == 200) {
-					this.dormOptions = [...res.data]
-					// 遍历数据，为每个对象添加 displayText 属性
-					this.dormOptions = res.data.map(v => ({
-						...v, // 保留原对象所有属性
-						// 新增拼接后的显示文本属性
-						displayText: `${v.roomNo} -- ${v.gender} -- 床位 ${v.bedNum} -- 已住 ${v.occupancy}`,
-						isFull: v.occupancy >= v.bedNum // 新增：判断是否满人
-					}));
-				}
-			},
-			// 校区选择变化
-			handleCampusChange(e) {
-				this.form.campusName = this.campusOptions[e.detail.value].name;
-				this.form.parkName = ''; // 重置园区
-				this.form.buildingName = ''; // 重置楼栋
-				this.form.floorName = ''; // 重置楼层
-				this.form.roomNo = ''; // 重置宿舍
-				// 获取选中的校区id
-				this.selectedCampus = this.campusOptions[e.detail.value].id;
-				// 获取对应校区下面的园区
-				this.listParkByCampus(this.selectedCampus)
-			},
-			// 园区选择变化
-			handleParkChange(e) {
-				this.form.parkName = this.parkOptions[e.detail.value].name;
-				this.form.buildingName = ''; // 重置楼栋
-				this.form.floorName = ''; // 重置楼层
-				this.form.roomNo = ''; // 重置宿舍
-				// 获取选中的园区的id
-				this.selectedPark = this.parkOptions[e.detail.value].id;
-				// 获取对应园区下面的楼栋
-				this.listBuildingByPark(this.selectedPark)
-			},
-			// 楼栋选择变化
-			handleBuildingChange(e) {
-				this.form.buildingName = this.buildingOptions[e.detail.value].name;
-				this.form.floorName = ''; // 重置楼层
-				this.form.roomNo = ''; // 重置宿舍
-				// 获取选中的楼栋的id
-				this.selectedBuilding = this.buildingOptions[e.detail.value].id;
-				// 获取选中的楼栋下面的楼层
-				this.listFloorByBuilding(this.selectedBuilding)
-			},
-			// 楼层选择变化（下拉框）
-			handleFloorChange(e) {
-				this.form.floorName = this.floorOptions[e.detail.value].floor;
-				this.form.roomNo = ''; // 重置宿舍
-				// 获取选中的楼层的id
-				this.selectedFloor = this.floorOptions[e.detail.value].id;
-				// 获取选中的楼层下面的宿舍号
-				this.listAllRoomByFloor(this.selectedFloor)
-			},
-			// 宿舍号选择变化（行拉框）
-			handleDormChange(e) {
-				const index = e.detail.value;
-				const selectedDorm = this.dormOptions[index]; // 获取选中的宿舍对象
+		// 根据园区id获取楼栋
+		async listBuildingByPark(id) {
+			let res = await listBuildingByPark(id)
+			if (res.code == 200) {
+				this.buildingOptions = [...res.data]
+			}
+		},
+		// 根据楼栋id获取楼层
+		async listFloorByBuilding(id) {
+			let res = await listFloorByBuilding(id)
+			if (res.code == 200) {
+				this.floorOptions = [...res.data]
+			}
+		},
+		// 根据楼层id获取宿舍号
+		async listAllRoomByFloor(id) {
+			let res = await listAllRoomByFloor(id)
+			if (res.code == 200) {
+				this.dormOptions = [...res.data]
+				// 遍历数据，为每个对象添加 displayText 属性
+				this.dormOptions = res.data.map(v => ({
+					...v, // 保留原对象所有属性
+					// 新增拼接后的显示文本属性
+					displayText: `${v.roomNo} -- ${v.gender} -- 床位 ${v.bedNum} -- 已住 ${v.occupancy}`,
+					isFull: v.occupancy >= v.bedNum // 新增：判断是否满人
+				}));
+			}
+		},
+		// 校区选择变化
+		handleCampusChange(e) {
+			this.form.campusName = this.campusOptions[e.detail.value].name;
+			this.form.parkName = ''; // 重置园区
+			this.form.buildingName = ''; // 重置楼栋
+			this.form.floorName = ''; // 重置楼层
+			this.form.roomNo = ''; // 重置宿舍
+			// 获取选中的校区id
+			this.selectedCampus = this.campusOptions[e.detail.value].id;
+			// 获取对应校区下面的园区
+			this.listParkByCampus(this.selectedCampus)
+		},
+		// 园区选择变化
+		handleParkChange(e) {
+			this.form.parkName = this.parkOptions[e.detail.value].name;
+			this.form.buildingName = ''; // 重置楼栋
+			this.form.floorName = ''; // 重置楼层
+			this.form.roomNo = ''; // 重置宿舍
+			// 获取选中的园区的id
+			this.selectedPark = this.parkOptions[e.detail.value].id;
+			// 获取对应园区下面的楼栋
+			this.listBuildingByPark(this.selectedPark)
+		},
+		// 楼栋选择变化
+		handleBuildingChange(e) {
+			this.form.buildingName = this.buildingOptions[e.detail.value].name;
+			this.form.floorName = ''; // 重置楼层
+			this.form.roomNo = ''; // 重置宿舍
+			// 获取选中的楼栋的id
+			this.selectedBuilding = this.buildingOptions[e.detail.value].id;
+			// 获取选中的楼栋下面的楼层
+			this.listFloorByBuilding(this.selectedBuilding)
+		},
+		// 楼层选择变化（下拉框）
+		handleFloorChange(e) {
+			this.form.floorName = this.floorOptions[e.detail.value].floor;
+			this.form.roomNo = ''; // 重置宿舍
+			// 获取选中的楼层的id
+			this.selectedFloor = this.floorOptions[e.detail.value].id;
+			// 获取选中的楼层下面的宿舍号
+			this.listAllRoomByFloor(this.selectedFloor)
+		},
+		// 宿舍号选择变化（行拉框）
+		handleDormChange(e) {
+			const index = e.detail.value;
+			const selectedDorm = this.dormOptions[index]; // 获取选中的宿舍对象
 
-				// 判断是否满人
-				if (selectedDorm.isFull) {
-					// 满人时提示并重置选择
-					uni.showToast({
-						title: `宿舍 ${selectedDorm.roomNo} 已住满，无法选择`,
-						icon: 'none',
-						duration: 2000
-					});
-					// 重置宿舍选择（如果之前有选中值则保留，否则为空）
-					if (!this.form.roomNo) {
-						this.form.roomNo = '';
-					}
-					return;
-				}
-
-				// 未满人时正常选中
-				this.form.roomNo = selectedDorm.roomNo; // 显示拼接文本
-				this.selectedDorm = selectedDorm.id; // 存储宿舍ID（用于提交）
-			},
-			// 宿舍长选择变化
-			handleDormHeadChange(e) {
-				this.form.isDormitoryHead = this.dormHeadOptions[e.detail.value] == '是' ? 1 : 0;
-				this.form.isDormHead = this.dormHeadOptions[e.detail.value]
-			},
-			// 入住时间选择变化
-			handleCheckinTimeChange(e) {
-				this.form.checkinTime = e.detail.value;
-			},
-			// 证件照上传
-			handleUpload() {
-				uni.chooseImage({
-					count: 3,
-					success: async (img) => {
-						let bool = await checkPic(img.tempFiles[0]);
-						if (bool) {
-							uploadFile('/common/upload', img.tempFilePaths[0]).then((res) => {
-								// if (this.form.photo !== "") {
-								// 	this.form.photo = this.form.photo + "," + JSON.parse(res)
-								// 		.fileName;
-								// } else {
-								// 	this.form.photo = JSON.parse(res).fileName;
-								// }
-								this.form.photoData = img.tempFilePaths[0];
-								this.form.photo = JSON.parse(res).fileName;
-							})
-						}
-
-					}
-				})
-				
-			},
-			// 提交表单
-			async handleSubmit() {
-				console.log(this.form);
-				// 验证必填项
-				if (
-					!this.form.campusName || // 校区名称（字符串，空则false）
-					!this.form.parkName || // 园区名称（字符串，空则false）
-					!this.form.buildingName || // 楼栋名称（字符串，空则false）
-					(!this.form.floorName && this.form.floorName !== 0) || // 楼层（数值，排除0的误判）
-					(!this.form.roomNo && this.form.roomNo !== 0) || // 宿舍号（数值，排除0的误判）
-					!this.form.isDormHead || // 是否宿舍长（值为"是"/"否"）
-					!this.form.checkinTime || // 入住时间（日期字符串，空则false）
-					!this.form.photo // 证件照（blob路径，空则false，若必填需加）
-				) {
-					uni.showToast({
-						title: '带*号的为必填项，请填写完整',
-						icon: 'none',
-						duration: 2000
-					});
-					return;
-				}
-				this.form.dormitoryId = this.selectedDorm;
-				// 模拟提交
-				uni.showLoading({
-					title: '提交中...'
+			// 判断是否满人
+			if (selectedDorm.isFull) {
+				// 满人时提示并重置选择
+				uni.showToast({
+					title: `宿舍 ${selectedDorm.roomNo} 已住满，无法选择`,
+					icon: 'none',
+					duration: 2000
 				});
-				// 添加入住信息
-				let res = await addStudent(this.form);
-				if (res.code == 200) {
-					uni.hideLoading();
-					uni.showToast({
-						title: '提交成功',
-						icon: 'success'
-					});
-					// 上次图片头像
-					let data = submitExtraInfo({
-						userId: this.user.data.userId,
-						whitePhoto: this.form.photo
-					})
-					// if (data.code == 200) {
-					// 	console.log(data);
-					// }
-					
-					setTimeout(() => {
-						// 重置表单
-						this.form = {
-							campusName: '',
-							parkName: '',
-							buildingName: '',
-							floorName: '',
-							roomNo: '',
-							stuNo: '',
-							isDormitoryHead: '',
-							checkinTime: '',
-							photo: ''
-						};
-						uni.redirectTo({
-							url: `/pages/dormitory/studentDormInfo/index`
+				// 重置宿舍选择（如果之前有选中值则保留，否则为空）
+				if (!this.form.roomNo) {
+					this.form.roomNo = '';
+				}
+				return;
+			}
+
+			// 未满人时正常选中
+			this.form.roomNo = selectedDorm.roomNo; // 显示拼接文本
+			this.selectedDorm = selectedDorm.id; // 存储宿舍ID（用于提交）
+		},
+		// 宿舍长选择变化
+		handleDormHeadChange(e) {
+			this.form.isDormitoryHead = this.dormHeadOptions[e.detail.value] == '是' ? 1 : 0;
+			this.form.isDormHead = this.dormHeadOptions[e.detail.value]
+		},
+		// 入住时间选择变化
+		handleCheckinTimeChange(e) {
+			this.form.checkinTime = e.detail.value;
+		},
+		// 证件照上传
+		handleUpload() {
+			uni.chooseImage({
+				count: 3,
+				success: async (img) => {
+					let bool = await checkPic(img.tempFiles[0]);
+					if (bool) {
+						uploadFile('/common/upload', img.tempFilePaths[0]).then((res) => {
+							// if (this.form.photo !== "") {
+							// 	this.form.photo = this.form.photo + "," + JSON.parse(res)
+							// 		.fileName;
+							// } else {
+							// 	this.form.photo = JSON.parse(res).fileName;
+							// }
+							this.form.photoData = img.tempFilePaths[0];
+							this.form.photo = JSON.parse(res).fileName;
 						})
-					}, 1000);
+					}
+
+				}
+			})
+
+		},
+        // 提交表单
+        async handleSubmit() {
+            console.log(this.form);
+			// 验证必填项
+			if (
+				!this.form.campusName || // 校区名称（字符串，空则false）
+				!this.form.parkName || // 园区名称（字符串，空则false）
+				!this.form.buildingName || // 楼栋名称（字符串，空则false）
+				(!this.form.floorName && this.form.floorName !== 0) || // 楼层（数值，排除0的误判）
+				(!this.form.roomNo && this.form.roomNo !== 0) || // 宿舍号（数值，排除0的误判）
+				!this.form.isDormHead || // 是否宿舍长（值为"是"/"否"）
+				!this.form.checkinTime || // 入住时间（日期字符串，空则false）
+				!this.form.photo
+			) {
+				uni.showToast({
+					title: '带*号的为必填项，请填写完整',
+					icon: 'none',
+					duration: 2000
+				});
+				return;
+			}
+			if (this.form.xhk) {
+				let cardRes = await alipayVali(this.form.xhk);
+				if (!cardRes || cardRes.validated == false) {
+					uni.showToast({
+						title: '请输入正确的银行卡号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (cardRes.bank != 'ABC') {
+					uni.showToast({
+						title: '请输入正确的中国农业银行银行卡号',
+						icon: 'none'
+					});
+					return;
 				}
 			}
-		}
-	};
+            this.form.dormitoryId = this.selectedDorm;
+            uni.showLoading({ title: '提交中...' });
+            let res;
+            if (this.mode === 'edit') {
+                const dto = {
+                    id: this.editId,
+                    dormitoryId: this.form.dormitoryId,
+                    stuNo: this.form.stuNo,
+                    isDormitoryHead: this.form.isDormHead === '是' ? 1 : 0,
+                    checkinTime: this.form.checkinTime ? new Date(this.form.checkinTime) : null,
+                    isInStudentsleep: this.form.isInStudentsleep || '是'
+                }
+                res = await updateStudent(dto)
+            } else {
+                res = await addStudent(this.form);
+            }
+            if (res.code == 200) {
+                // 上次图片头像
+                let data = submitExtraInfo({
+                    userId: this.user.data.userId,
+                    whitePhoto: this.form.photo
+                })
+				let own = await request({ url: '/system/student/getOwnInfo', method: 'get' });
+				let payload = {
+					phone: own.data.phone,
+					xhk: this.form.xhk ? this.form.xhk.replace(' ', '') : own.data.xhk,
+					idCard: own.data.idCard,
+					birthday: own.data.birthday,
+					bankAddr: this.form.bankAddr ? this.form.bankAddr : own.data.bankAddr
+				};
+				await request({ url: '/system/student/changeOwnInfo', method: 'POST', data: payload });
+				uni.hideLoading();
+                uni.showToast({ title: '提交成功', icon: 'success' });
+				// if (data.code == 200) {
+				// 	console.log(data);
+				// }
+
+				setTimeout(() => {
+					// 重置表单
+					this.form = {
+						campusName: '',
+						parkName: '',
+						buildingName: '',
+						floorName: '',
+						roomNo: '',
+						stuNo: '',
+						isDormitoryHead: '',
+						checkinTime: '',
+						photo: '',
+						xhk: '',
+						bankAddr: ''
+					};
+                    uni.redirectTo({ url: `/pages/dormitory/studentDormInfo/index` })
+                }, 1000);
+            }
+        }
+    }
+};
 </script>
 
 <style scoped lang="scss">
-	.form-container {
-		padding: 30rpx;
-		background-color: #fff;
-		min-height: 100vh;
-	}
+.form-container {
+	padding: 30rpx;
+	background-color: #fff;
+	min-height: 100vh;
+}
 
-	.form-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		text-align: center;
-		margin-bottom: 20rpx;
-	}
+.form-title {
+	font-size: 36rpx;
+	font-weight: bold;
+	text-align: center;
+	margin-bottom: 20rpx;
+}
 
-	.form-desc {
-		font-size: 24rpx;
-		color: #666;
-		text-align: center;
-		margin-bottom: 40rpx;
-	}
+.form-desc {
+	font-size: 24rpx;
+	color: #666;
+	text-align: center;
+	margin-bottom: 40rpx;
+}
 
-	.form-item {
-		margin-bottom: 40rpx;
-	}
+.form-item {
+	margin-bottom: 40rpx;
+}
 
-	.item-label {
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #333;
-		margin-bottom: 16rpx;
-		display: flex;
-		align-items: center;
-	}
+.item-label {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333;
+	margin-bottom: 16rpx;
+	display: flex;
+	align-items: center;
+}
 
-	// 红色*号样式
-	.required {
-		color: #ff4d4f;
-		margin-right: 6rpx;
-		font-weight: bold;
-	}
+// 红色*号样式
+.required {
+	color: #ff4d4f;
+	margin-right: 6rpx;
+	font-weight: bold;
+}
 
-	.item-desc {
-		font-size: 24rpx;
-		color: #999;
-		margin-bottom: 20rpx;
-	}
+.item-desc {
+	font-size: 24rpx;
+	color: #999;
+	margin-bottom: 20rpx;
+}
 
-	// 下拉框样式
-	.picker-input {
-		width: 100%;
-		height: 80rpx;
-		border: 1px solid #eee;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		background-color: #f9f9f9;
-	}
+// 下拉框样式
+.picker-input {
+	width: 100%;
+	height: 80rpx;
+	border: 1px solid #eee;
+	border-radius: 8rpx;
+	display: flex;
+	align-items: center;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	font-size: 28rpx;
+	background-color: #f9f9f9;
+}
 
-	// 输入框样式
-	.input {
-		width: 100%;
-		height: 80rpx;
-		border: 1px solid #eee;
-		border-radius: 8rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-	}
+// 输入框样式
+.input {
+	width: 100%;
+	height: 80rpx;
+	border: 1px solid #eee;
+	border-radius: 8rpx;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	font-size: 28rpx;
+}
 
-	// 图片上传样式
-	.upload-btn {
-		width: 200rpx;
-		height: 80rpx;
-		border: 1px dashed #ccc;
-		border-radius: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 10rpx;
-		font-size: 28rpx;
-		color: #666;
-		margin-bottom: 20rpx;
-	}
+// 图片上传样式
+.upload-btn {
+	width: 200rpx;
+	height: 80rpx;
+	border: 1px dashed #ccc;
+	border-radius: 8rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 10rpx;
+	font-size: 28rpx;
+	color: #666;
+	margin-bottom: 20rpx;
+}
 
-	.upload-icon {
-		font-size: 40rpx;
-		font-weight: bold;
-	}
+.upload-icon {
+	font-size: 40rpx;
+	font-weight: bold;
+}
 
-	.upload-tip {
-		font-size: 22rpx;
-		color: #999;
-		margin-bottom: 20rpx;
-	}
+.upload-tip {
+	font-size: 22rpx;
+	color: #999;
+	margin-bottom: 20rpx;
+}
 
-	.upload-preview {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 8rpx;
-		overflow: hidden;
-	}
+.upload-preview {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 8rpx;
+	overflow: hidden;
+}
 
-	.upload-preview image {
-		width: 100%;
-		height: 100%;
-	}
+.upload-preview image {
+	width: 100%;
+	height: 100%;
+}
 
-	// 提交按钮样式
-	.submit-btn {
-		width: 100%;
-		height: 90rpx;
-		background-color: #1890ff;
-		color: #fff;
-		font-size: 32rpx;
-		border-radius: 45rpx;
-		margin-top: 60rpx;
-	}
+// 提交按钮样式
+.submit-btn {
+	width: 100%;
+	height: 90rpx;
+	background-color: #1890ff;
+	color: #fff;
+	font-size: 32rpx;
+	border-radius: 45rpx;
+	margin-top: 60rpx;
+}
 </style>
\ No newline at end of file