From 27f1a36e561f99957ce121b04a6c4a4d0dbc7102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Tue, 16 Dec 2025 11:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E9=95=BF=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsideAccommodation/applicationForm.vue  | 109 +++++++++++++-----
 .../dormitory/outsideAccommodation/index.vue  |   4 +-
 2 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/pages/dormitory/outsideAccommodation/applicationForm.vue b/pages/dormitory/outsideAccommodation/applicationForm.vue
index a21d665..5fa4685 100644
--- a/pages/dormitory/outsideAccommodation/applicationForm.vue
+++ b/pages/dormitory/outsideAccommodation/applicationForm.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="app-container">
 		<!-- 顶部导航栏 -->
-<!-- 		<view class="nav-bar" @click="goBack">
+		<!-- 		<view class="nav-bar" @click="goBack">
 			<uni-icons type="back" size="20" color="#fff"></uni-icons>
 			<text class="nav-title">外宿申请表单</text>
 		</view> -->
@@ -24,7 +24,8 @@
 						<text class="tab-text">地址信息</text>
 					</view>
 					<view class="tab-item" :class="{ active: activeTab === 3 }" @click="switchTab(3)">
-						<uni-icons type="person-filled" size="16" :color="activeTab === 3 ? '#409EFF' : '#666'"></uni-icons>
+						<uni-icons type="person-filled" size="16"
+							:color="activeTab === 3 ? '#409EFF' : '#666'"></uni-icons>
 						<text class="tab-text">家长信息</text>
 					</view>
 					<view class="tab-item" :class="{ active: activeTab === 4 }" @click="switchTab(4)">
@@ -192,10 +193,13 @@
 
 							<view class="form-item">
 								<label class="form-label">家长签字附件</label>
-								<button type="default" size="mini" @click="chooseParentSignFile"
-									class="upload-btn">选择图片</button>
-								<image v-if="parentSignFiles.length" :src="parentSignFiles[0].url"
-									class="signature-preview" mode="widthFix"></image>
+								<view class="upload-btn" @click="handleUpload">
+									<text class="upload-icon">+</text>
+									<text>上传图片</text>
+								</view>
+								<view class="upload-preview" v-if="parentSignFiles">
+									<image :src="parentSignFiles" mode="aspectFill" />
+								</view>
 								<view class="upload-tip">只能上传jpg/png文件，且不超过2M</view>
 							</view>
 
@@ -375,6 +379,10 @@
 	} from '@/api/system/user'
 	import area from '@/components/complex-picker-region/area.js'
 	import config from '@/config'
+	import {
+		checkPic
+	} from "@/utils/checkPic.js";
+	import uploadFile from "@/plugins/upload.js";
 	export default {
 		name: 'OutsideAccommodationApply',
 		data() {
@@ -459,7 +467,7 @@
 				],
 				// 文件上传相关
 				affixFiles: [],
-				parentSignFiles: [],
+				parentSignFiles: "",
 				reasonFileList: [],
 				// 页面状态
 				currentId: null,
@@ -860,16 +868,28 @@
 					});
 				});
 			},
-			chooseParentSignFile() {
+			// 家长附件上传
+			handleUpload() {
 				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						this.parentSignFiles = res.tempFiles;
-						this.form.parentSignAttachment = res.tempFilePaths[0];
+					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.parentSignFiles = img.tempFilePaths[0];
+								this.form.parentSignAttachment = JSON.parse(res).fileName;
+							})
+						}
+			
 					}
-				});
+				})
+			
 			},
 			previewImage(url) {
 				uni.previewImage({
@@ -892,12 +912,12 @@
 					this.areaText = res.data.address || '';
 					this.parentAreaText = res.data.parentAddress || '';
 
-					if (this.form.parentSignAttachment) {
-						this.parentSignFiles = [{
-							name: this.form.parentSignAttachment.split('/').pop(),
-							url: this.baseUrl + this.form.parentSignAttachment
-						}];
-					}
+					// if (this.form.parentSignAttachment) {
+					// 	this.parentSignFiles = [{
+					// 		name: this.form.parentSignAttachment.split('/').pop(),
+					// 		url: this.baseUrl + this.form.parentSignAttachment
+					// 	}];
+					// }
 
 					this.loading = false;
 				}).catch(() => {
@@ -934,7 +954,7 @@
 
 										if (matchedRecord) {
 											const baseStuYearName = matchedRecord.stuYearName ||
-											'';
+												'';
 											if (baseStuYearName) {
 												const isAllSameYear = response.data.record.every(
 													item => (item.stuYearName || '') ===
@@ -1131,7 +1151,7 @@
 					};
 
 					this.affixFiles = [];
-					this.parentSignFiles = [];
+					this.parentSignFiles = "";
 					this.reasonFileList = [];
 					this.areaText = '';
 					this.parentAreaText = '';
@@ -1299,15 +1319,15 @@
 		background-color: #409EFF;
 		border-radius: 2rpx;
 	}
-	
+
 	.card-parent::after {
 		width: 290rpx;
 	}
-	
+
 	.card-area::after {
 		width: 200rpx;
 	}
-	
+
 	.card-apply::after {
 		width: 230rpx;
 	}
@@ -1356,6 +1376,43 @@
 		border-color: #409EFF;
 		box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.1);
 	}
+	// 图片上传样式
+	.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-tip {
+		font-size: 22rpx;
+		color: #999;
+		margin-bottom: 20rpx;
+	}
+	
+	.upload-preview {
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 8rpx;
+		overflow: hidden;
+	}
+	
+	.upload-preview image {
+		width: 100%;
+		height: 100%;
+	}
 
 	/* 选择器样式 */
 	.picker-input {
diff --git a/pages/dormitory/outsideAccommodation/index.vue b/pages/dormitory/outsideAccommodation/index.vue
index b67c851..c0cfb4d 100644
--- a/pages/dormitory/outsideAccommodation/index.vue
+++ b/pages/dormitory/outsideAccommodation/index.vue
@@ -55,7 +55,7 @@
 			<view class="empty-state" v-if="!loading && !hasData">
 				<uni-icons type="empty" size="80" color="#c0c4cc"></uni-icons>
 				<text class="empty-text">暂无外宿申请数据</text>
-				<text class="empty-tip" v-if="roleGroup.includes('学生')">点击"外宿申请"按钮提交新申请</text>
+				<text class="empty-tip" v-if="roleGroup.includes('学生')">点击右下角"+号"按钮提交新申请</text>
 			</view>
 
 			<!-- 数据列表 -->
@@ -112,6 +112,8 @@
 										</view>
 									</text>
 								</view>
+								<view class="info-item"><text class="label">宿费交纳：</text><text
+										class="value">{{ getSafeValue(item, 'accommodationFee', '-') }}</text></view>
 							</view>
 						</uni-collapse-item>