From a0e5c9a024a2f1f0e1dd6540d86dfabb72a865a6 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Fri, 24 Oct 2025 22:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/package.json                           |    1 +
 mobile/src/api/system/dict/data.js            |   35 +
 mobile/src/common/README-API调用规范.md       |  413 +++
 mobile/src/common/config.js                   |    4 +-
 mobile/src/pages.json                         |   55 +-
 .../src/pages/xgss/wsjc/components/README.md  |  210 ++
 .../xgss/wsjc/components/SingleRoomCheck.vue  | 2212 +++++++++++++++++
 .../wsjc/components/ViolationRecordDialog.vue | 1901 ++++++++++++++
 mobile/src/pages/xgss/wsjc/wsjc.vue           |    2 +-
 mobile/src/pages/xgss/wsjc/wsjcMainAdd.vue    |  971 ++++++++
 mobile/src/utils/upload.js                    |  308 +++
 11 files changed, 6086 insertions(+), 26 deletions(-)
 create mode 100644 mobile/src/api/system/dict/data.js
 create mode 100644 mobile/src/common/README-API调用规范.md
 create mode 100644 mobile/src/pages/xgss/wsjc/components/README.md
 create mode 100644 mobile/src/pages/xgss/wsjc/components/SingleRoomCheck.vue
 create mode 100644 mobile/src/pages/xgss/wsjc/components/ViolationRecordDialog.vue
 create mode 100644 mobile/src/pages/xgss/wsjc/wsjcMainAdd.vue
 create mode 100644 mobile/src/utils/upload.js

diff --git a/mobile/package.json b/mobile/package.json
index eedf7efa..b2d21a2a 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -73,6 +73,7 @@
     "@vue/shared": "^3.0.0",
     "core-js": "^3.8.3",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.18",
     "flyio": "^0.6.2",
     "jsencrypt": "^3.3.2",
     "uview-ui": "2.0.38",
diff --git a/mobile/src/api/system/dict/data.js b/mobile/src/api/system/dict/data.js
new file mode 100644
index 00000000..8a4b10e1
--- /dev/null
+++ b/mobile/src/api/system/dict/data.js
@@ -0,0 +1,35 @@
+// 字典数据API - 重新导出common/dict.js中的方法以保持兼容性
+import {
+    getDicts,
+    getDict,
+    useDict,
+    getDictLabel,
+    getDictValue,
+    hasDictValue,
+    refreshDict,
+    getDictTagType,
+} from '@/common/dict.js';
+
+// 重新导出所有字典相关方法
+export {
+    getDicts,
+    getDict,
+    useDict,
+    getDictLabel,
+    getDictValue,
+    hasDictValue,
+    refreshDict,
+    getDictTagType,
+};
+
+// 默认导出
+export default {
+    getDicts,
+    getDict,
+    useDict,
+    getDictLabel,
+    getDictValue,
+    hasDictValue,
+    refreshDict,
+    getDictTagType,
+};
diff --git a/mobile/src/common/README-API调用规范.md b/mobile/src/common/README-API调用规范.md
new file mode 100644
index 00000000..c4b02c1b
--- /dev/null
+++ b/mobile/src/common/README-API调用规范.md
@@ -0,0 +1,413 @@
+# 移动端API调用标准规范
+
+> 📌 **重要提示**: 移动端与Web端的API调用方式完全不同，请严格遵守本规范！
+
+## 🚫 常见错误
+
+### ❌ 不要这样做（Web端方式）
+```javascript
+// 错误1：使用 this.$http
+const res = await this.$http.get('/api/path');
+const res = await this.$http.post('/api/path', data);
+const res = await this.$http.upload('/api/upload', options);
+
+// 错误2：使用 getDicts
+import { getDicts } from '@/api/system/dict/data.js';
+const res = await getDicts('dict_type');
+this.dictData = res.data;  // Web端返回格式
+
+// 错误3：使用 this.$u.toast
+this.$u.toast('提示信息');
+```
+
+## ✅ 正确做法（移动端方式）
+
+### 1. HTTP请求
+
+```javascript
+// 导入
+import { request } from '@/common/request.js';
+
+// GET请求（无参数）
+const res = await request({
+    url: '/api/path',
+    method: 'GET',
+});
+
+// GET请求（带参数）
+const res = await request({
+    url: '/api/path',
+    method: 'GET',
+    params: { 
+        key1: 'value1',
+        key2: 'value2'
+    },
+});
+
+// POST请求
+const res = await request({
+    url: '/api/path',
+    method: 'POST',
+    data: {
+        key1: 'value1',
+        key2: 'value2'
+    },
+});
+
+// PUT请求
+const res = await request({
+    url: '/api/path',
+    method: 'PUT',
+    data: { ... },
+});
+
+// DELETE请求
+const res = await request({
+    url: '/api/path',
+    method: 'DELETE',
+});
+```
+
+### 2. 字典数据获取
+
+```javascript
+// 导入
+import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
+
+// 获取字典数据（直接返回数组）
+const dictData = await getDict('dict_type');  // 返回: [{label, value, ...}, ...]
+
+// 批量获取字典
+const [dict1, dict2] = await Promise.all([
+    getDict('dict_type_1'),
+    getDict('dict_type_2'),
+]);
+
+// 获取字典标签
+const label = getDictLabel(dictData, '1');  // 返回: '标签名'
+
+// 获取字典Tag类型（用于u-tag组件）
+const tagType = getDictTagType(dictData, '1');  // 返回: 'success', 'warning', 'error' 等
+```
+
+### 3. 字典展示（u-tag）
+
+```vue
+<template>
+    <!-- 基础用法 -->
+    <u-tag :type="getDictTagType(xg_dict_type, value)">
+        {{ getDictLabel(xg_dict_type, value) }}
+    </u-tag>
+
+    <!-- 带降级处理 -->
+    <u-tag :type="getDictTagType(xg_dict_type, value, tagTypeFallback)">
+        {{ getDictLabel(xg_dict_type, value) }}
+    </u-tag>
+
+    <!-- 选择器显示 -->
+    <u-picker
+        :show="showPicker"
+        :columns="dictColumns"
+        keyName="text"
+        @confirm="handleConfirm"
+        @cancel="showPicker = false"
+    ></u-picker>
+</template>
+
+<script>
+import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
+
+export default {
+    data() {
+        return {
+            xg_dict_type: [],
+            value: '1',
+            showPicker: false,
+            
+            // 降级映射（当字典未加载时使用）
+            tagTypeFallback: {
+                '1': 'success',
+                '2': 'warning',
+                '3': 'error',
+            },
+        };
+    },
+    computed: {
+        // 转换为选择器格式
+        dictColumns() {
+            return [
+                this.xg_dict_type.map(item => ({
+                    text: item.label,
+                    value: item.value,
+                }))
+            ];
+        },
+    },
+    async mounted() {
+        // 加载字典
+        this.xg_dict_type = await getDict('xg_dict_type');
+    },
+    methods: {
+        getDictLabel,
+        getDictTagType,
+        
+        handleConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                this.value = e.value[0].value;
+            }
+            this.showPicker = false;
+        },
+    },
+};
+</script>
+```
+
+### 4. 文件上传
+
+```javascript
+// 导入
+import { uploadFile } from '@/utils/upload.js';
+
+// 选择并上传图片
+uni.chooseImage({
+    count: 1,
+    success: async (res) => {
+        const filePath = res.tempFilePaths[0];
+        
+        // 上传文件
+        const result = await uploadFile(filePath, (progress) => {
+            console.log('上传进度:', progress);
+            // 更新进度条
+            this.uploadProgress = progress;
+        });
+        
+        if (result && result.code === 200 && result.data) {
+            // 上传成功
+            this.ossId = result.data.ossId;
+            this.fileUrl = result.data.url;
+        }
+    }
+});
+```
+
+### 5. Toast提示
+
+```javascript
+// 普通提示
+uni.showToast({ 
+    title: '提示信息', 
+    icon: 'none' 
+});
+
+// 成功提示
+uni.showToast({ 
+    title: '操作成功', 
+    icon: 'success' 
+});
+
+// 失败提示
+uni.showToast({ 
+    title: '操作失败', 
+    icon: 'error' 
+});
+
+// 加载中
+uni.showLoading({
+    title: '加载中...',
+    mask: true
+});
+
+// 关闭加载
+uni.hideLoading();
+```
+
+## 📊 完整示例
+
+```vue
+<template>
+    <view class="page-container">
+        <!-- 字典展示 -->
+        <u-tag :type="getDictTagType(xg_status_dict, formData.status)">
+            {{ getDictLabel(xg_status_dict, formData.status) }}
+        </u-tag>
+
+        <!-- 字典选择器 -->
+        <u-form-item label="状态" prop="status">
+            <view @click="showStatusPicker = true">
+                <u-input
+                    :value="getDictLabel(xg_status_dict, formData.status)"
+                    placeholder="请选择状态"
+                    readonly
+                    suffix-icon="arrow-down"
+                />
+            </view>
+            <u-picker
+                :show="showStatusPicker"
+                :columns="statusColumns"
+                keyName="text"
+                @confirm="handleStatusConfirm"
+                @cancel="showStatusPicker = false"
+            ></u-picker>
+        </u-form-item>
+
+        <!-- 提交按钮 -->
+        <u-button type="primary" @click="handleSubmit">提交</u-button>
+    </view>
+</template>
+
+<script>
+import { request } from '@/common/request.js';
+import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
+import { uploadFile } from '@/utils/upload.js';
+
+export default {
+    data() {
+        return {
+            formData: {
+                title: '',
+                status: '1',
+            },
+            xg_status_dict: [],
+            showStatusPicker: false,
+        };
+    },
+    computed: {
+        statusColumns() {
+            return [
+                this.xg_status_dict.map(item => ({
+                    text: item.label,
+                    value: item.value,
+                }))
+            ];
+        },
+    },
+    async mounted() {
+        await this.init();
+    },
+    methods: {
+        getDictLabel,
+        getDictTagType,
+
+        async init() {
+            // 加载字典
+            this.xg_status_dict = await getDict('xg_status');
+            
+            // 加载数据
+            await this.loadData();
+        },
+
+        async loadData() {
+            try {
+                const res = await request({
+                    url: '/api/getData',
+                    method: 'GET',
+                    params: { id: this.id },
+                });
+
+                if (res.code === 200) {
+                    this.formData = res.data;
+                }
+            } catch (error) {
+                console.error('加载数据失败:', error);
+                uni.showToast({ 
+                    title: '加载失败', 
+                    icon: 'none' 
+                });
+            }
+        },
+
+        handleStatusConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                this.formData.status = e.value[0].value;
+            }
+            this.showStatusPicker = false;
+        },
+
+        async handleSubmit() {
+            try {
+                uni.showLoading({ title: '提交中...', mask: true });
+
+                const res = await request({
+                    url: '/api/submit',
+                    method: 'POST',
+                    data: this.formData,
+                });
+
+                uni.hideLoading();
+
+                if (res.code === 200) {
+                    uni.showToast({ 
+                        title: '提交成功', 
+                        icon: 'success' 
+                    });
+                    
+                    setTimeout(() => {
+                        uni.navigateBack();
+                    }, 1500);
+                } else {
+                    uni.showToast({ 
+                        title: res.msg || '提交失败', 
+                        icon: 'none' 
+                    });
+                }
+            } catch (error) {
+                uni.hideLoading();
+                console.error('提交失败:', error);
+                uni.showToast({ 
+                    title: '提交失败', 
+                    icon: 'error' 
+                });
+            }
+        },
+    },
+};
+</script>
+```
+
+## 🔑 核心差异对照表
+
+| 功能 | Web端 | 移动端 |
+|------|-------|--------|
+| **HTTP请求** | `this.$http.get('/api')` | `request({ url: '/api', method: 'GET' })` |
+| **字典获取** | `getDicts('type')` 返回 `{data:[]}` | `getDict('type')` 返回 `[...]` |
+| **字典标签** | `selectDictLabel(dict, value)` | `getDictLabel(dict, value)` |
+| **Tag类型** | 手动映射 | `getDictTagType(dict, value)` |
+| **文件上传** | `this.$http.upload()` | `uploadFile(path, callback)` |
+| **Toast提示** | `this.$u.toast('msg')` | `uni.showToast({ title: 'msg' })` |
+| **加载提示** | `this.$u.loading.show()` | `uni.showLoading({ title: '...' })` |
+
+## 📝 注意事项
+
+1. **导入路径固定**:
+   - HTTP请求: `@/common/request.js`
+   - 字典方法: `@/common/dict.js`
+   - 文件上传: `@/utils/upload.js`
+
+2. **字典数据格式**:
+   - 移动端 `getDict()` 直接返回数组，不需要 `.data`
+   - 字典项格式: `{ label, value, elTagType, elTagClass, remark }`
+
+3. **Tag类型自动转换**:
+   - `danger` → `error`
+   - `default` → `primary`
+
+4. **文件上传进度**:
+   - 进度回调返回 0-100 的数字
+   - Web端可能是 `progress.progress`，移动端直接是数字
+
+5. **错误处理**:
+   - 统一使用 `try-catch`
+   - 错误时使用 `uni.showToast` 提示
+
+## 🔗 相关文档
+
+- `mobile/src/common/request.js` - HTTP请求源码
+- `mobile/src/common/dict.js` - 字典方法源码
+- `mobile/src/utils/upload.js` - 文件上传源码
+- `.cursor/cursorrules-mobile.md` - 移动端开发规范
+
+---
+
+**最后更新**: 2025-01-24  
+**适用范围**: 移动端工程（Vue 2.6.14 + uni-app 2.x）
+
diff --git a/mobile/src/common/config.js b/mobile/src/common/config.js
index 85839def..af11a20f 100644
--- a/mobile/src/common/config.js
+++ b/mobile/src/common/config.js
@@ -12,6 +12,7 @@ export const ENCRYPT_CONFIG = {
     TENANT_ID: '000000',
     // 加密请求头
     ENCRYPT_HEADER: 'encrypt-key',
+    //TODO 开发环境需要修改为false
     // 是否启用加密
     ENCRYPT_ENABLED: true,
 };
@@ -36,8 +37,9 @@ export const REQUEST_CONFIG = {
             ? 'http://localhost/login?redirect=/index'
             : 'https://hzdyjs.camasort.com/login?redirect=/index', // 生产环境前端域名
 
+    //TODO 生产环境需要修改为true
     // 是否启用加密
-    encryptEnabled: true,
+    encryptEnabled: false,
     // 防重复提交间隔时间(ms)
     repeatSubmitInterval: 500,
 };
diff --git a/mobile/src/pages.json b/mobile/src/pages.json
index 8db5e1ac..960c5afe 100644
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
@@ -200,6 +200,13 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/xgss/wsjc/wsjcMainAdd",
+			"style": {
+				"navigationBarTitleText": "宿舍卫生检查",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/xgss/xssswsjc/xssswsjc",
 			"style": {
@@ -303,30 +310,30 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		        {
-            "path": "pages/xljk/reservation/index",
-            "style": {
-                "navigationBarTitleText": "心理咨询预约",
-                "navigationBarBackgroundColor": "#0051d9",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/xljk/my-appointments/index",
-            "style": {
-                "navigationBarTitleText": "我的预约",
-                "navigationBarBackgroundColor": "#0051d9",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/xljk/reservation/appointment-form",
-            "style": {
-                "navigationBarTitleText": "预约咨询",
-                "navigationBarBackgroundColor": "#0051d9",
-                "navigationBarTextStyle": "white"
-            }
-        }
+		{
+			"path": "pages/xljk/reservation/index",
+			"style": {
+				"navigationBarTitleText": "心理咨询预约",
+				"navigationBarBackgroundColor": "#0051d9",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/xljk/my-appointments/index",
+			"style": {
+				"navigationBarTitleText": "我的预约",
+				"navigationBarBackgroundColor": "#0051d9",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/xljk/reservation/appointment-form",
+			"style": {
+				"navigationBarTitleText": "预约咨询",
+				"navigationBarBackgroundColor": "#0051d9",
+				"navigationBarTextStyle": "white"
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/mobile/src/pages/xgss/wsjc/components/README.md b/mobile/src/pages/xgss/wsjc/components/README.md
new file mode 100644
index 00000000..403034bc
--- /dev/null
+++ b/mobile/src/pages/xgss/wsjc/components/README.md
@@ -0,0 +1,210 @@
+# 宿舍卫生检查组件说明
+
+## 组件列表
+
+### 1. SingleRoomCheck.vue - 单宿舍检查组件
+
+**功能说明：**
+- 移动端单个宿舍的卫生检查表单组件
+- 与web端 `DormHygieneCheckSingleDialog.vue` 功能完全一致
+- 用于嵌入在弹窗中进行单个宿舍的详细检查
+
+**主要功能模块：**
+
+#### 1.1 宿舍整体情况
+- 违纪类型选择（从API加载）
+- 宿舍扣分输入（0-100分）
+- 卫生等级选择（字典：`xg_dorm_hygiene_grade`）
+- 检查附件上传（支持图片，最多15个）
+
+#### 1.2 宿舍学生情况
+- 学生基本信息展示（姓名、学号、性别、床位、班级、专业）
+- 学生评分项：
+  - 个人扣分（0-100分）
+  - 出勤状态（字典：`xg_student_attendance_status`）
+  - 学生评级（字典：`xg_dorm_hygiene_grade`）
+- 请假信息展示（如果有请假记录）
+- 违纪记录录入与管理
+
+**Props:**
+```javascript
+{
+  roomInfo: Object,        // 房间信息（必填）
+  checkInfo: Object,       // 检查基础信息（必填）
+  existingData: Object     // 编辑时的现有数据（可选）
+}
+```
+
+**Events:**
+```javascript
+{
+  submit: (data) => {},    // 保存检查结果
+  cancel: () => {}         // 取消操作
+}
+```
+
+**API接口：**
+- `GET /disciplineType/disciplineType/listByAreaType` - 加载违纪类型
+- `GET /dormBedStudent/dormBedStudent/getRoomStudents` - 加载房间学生信息
+- `GET /studentLeave/studentLeave/queryByCheckDate` - 查询学生请假信息
+- `POST /dormHygieneCheck/dormHygieneCheck/saveCompleteData` - 保存完整检查数据
+- `POST /resource/oss/upload` - 上传附件
+
+**字典类型：**
+- `xg_dorm_hygiene_grade` - 卫生等级
+- `xg_student_attendance_status` - 出勤状态
+
+---
+
+### 2. ViolationRecordDialog.vue - 违纪记录弹窗
+
+**功能说明：**
+- 学生违纪记录的录入和编辑弹窗
+- 支持新增和编辑两种模式
+
+**主要字段：**
+- 违纪类型（从API加载）
+- 扣分分数（自动填入最低扣分）
+- 违纪日期
+- 违纪地点
+- 违纪描述
+- 处理意见
+
+**Props:**
+```javascript
+{
+  visible: Boolean,        // 弹窗显示状态
+  studentInfo: Object,     // 学生信息
+  violationData: Object    // 违纪数据（编辑模式）
+}
+```
+
+**Events:**
+```javascript
+{
+  confirm: (data) => {},   // 确认保存
+  close: () => {}          // 关闭弹窗
+}
+```
+
+**API接口：**
+- `GET /disciplineType/disciplineType/listByAreaType` - 加载违纪类型
+
+---
+
+## 使用示例
+
+### 在 wsjcMainAdd.vue 中使用 SingleRoomCheck
+
+```vue
+<template>
+  <u-popup
+    :show="showRoomCheckPopup"
+    mode="bottom"
+    :round="20"
+    closeable
+    :safe-area-inset-bottom="true"
+    @close="handlePopupClose"
+  >
+    <view class="popup-container">
+      <view class="popup-header">
+        <text class="popup-title">
+          {{ currentRoom ? currentRoom.roomName : '' }} - 卫生检查
+        </text>
+      </view>
+
+      <scroll-view scroll-y class="popup-scroll" :style="{ height: popupHeight + 'px' }">
+        <SingleRoomCheck
+          v-if="showRoomCheckPopup && currentRoom"
+          :room-info="currentRoom"
+          :check-info="formData"
+          :existing-data="currentEditData"
+          @submit="handleSingleCheckSubmit"
+          @cancel="handlePopupClose"
+        />
+      </scroll-view>
+    </view>
+  </u-popup>
+</template>
+
+<script>
+import SingleRoomCheck from './components/SingleRoomCheck.vue';
+
+export default {
+  components: {
+    SingleRoomCheck,
+  },
+  // ...
+};
+</script>
+```
+
+---
+
+## 开发规范
+
+### 1. API调用
+- 统一使用 `mobile/src/common/request.js` 中的 `request` 方法
+- 附件上传使用 `smartUploadFile` 方法（自动适配微信环境）
+
+### 2. 字典数据
+- 使用 `mobile/src/common/dict.js` 中的方法
+  - `getDict(dictType)` - 获取字典数据
+  - `getDictLabel(dictData, value)` - 获取字典标签
+  - `getDictTagType(dictData, value)` - 获取u-tag类型
+
+### 3. 样式规范
+- 使用uview-ui 2.x组件
+- 字典数据用 `<u-tag>` 展示
+- 遵循移动端UI设计规范
+
+### 4. 数据提交
+- 与web端API接口完全一致
+- 参数名和数据结构保持一致
+- 返回数据格式相同
+
+---
+
+## 技术栈
+
+- Vue 2.6.14
+- uni-app 2.x
+- uview-ui 2.0.38
+- dayjs（日期处理）
+
+---
+
+## 注意事项
+
+1. **附件上传兼容性**
+   - 移动端附件功能兼容微信小程序
+   - 参考 `wsjcAdd.vue` 的附件实现
+   - 使用 `smartUploadFile` 方法自动适配环境
+
+2. **字典数据加载**
+   - 组件初始化时自动加载字典数据
+   - 使用缓存机制，避免重复请求
+
+3. **请假信息自动填充**
+   - 加载学生信息时自动查询请假记录
+   - 有请假记录的学生自动设置出勤状态为"请假"
+
+4. **违纪类型自动扣分**
+   - 选择违纪类型后自动填入最低扣分
+   - 用户可手动修改
+
+5. **数据验证**
+   - 扣分范围：0-100分
+   - 必填字段验证
+   - 表单提交前统一验证
+
+---
+
+## 更新日志
+
+**2025-01-24**
+- 创建 SingleRoomCheck.vue 组件
+- 创建 ViolationRecordDialog.vue 组件
+- 实现与web端完全一致的功能
+- 适配移动端UI和交互方式
+
diff --git a/mobile/src/pages/xgss/wsjc/components/SingleRoomCheck.vue b/mobile/src/pages/xgss/wsjc/components/SingleRoomCheck.vue
new file mode 100644
index 00000000..64eb75d9
--- /dev/null
+++ b/mobile/src/pages/xgss/wsjc/components/SingleRoomCheck.vue
@@ -0,0 +1,2212 @@
+<template>
+    <view class="single-room-check-container">
+        <!-- 宿舍整体情况 -->
+        <view class="section-card">
+            <view class="section-header">
+                <text class="section-title">宿舍整体情况</text>
+                <!-- 房间信息标签 - 使用简单文本样式 -->
+                <view v-if="getRoomDisplayName" class="room-tag">
+                    <text class="room-tag-text">{{ getRoomDisplayName }}</text>
+                </view>
+            </view>
+
+            <u-form ref="formRef" :model="formData" :rules="rules" label-width="100">
+                <!-- 违纪类型 -->
+                <u-form-item label="违纪类型" prop="disciplineTypeId">
+                    <view @click="showDisciplineTypePicker = true" style="width: 100%">
+                        <u-input
+                            :value="disciplineTypeDisplay"
+                            placeholder="请选择违纪类型"
+                            readonly
+                            border="none"
+                            suffix-icon="arrow-down"
+                            suffix-icon-style="color: #c8c9cc;"
+                            style="pointer-events: none"
+                        />
+                    </view>
+                    <u-picker
+                        :show="showDisciplineTypePicker && disciplineTypeOptions.length > 0"
+                        :columns="disciplineTypeColumns"
+                        keyName="text"
+                        @confirm="handleDisciplineTypeConfirm"
+                        @cancel="showDisciplineTypePicker = false"
+                    ></u-picker>
+                </u-form-item>
+
+                <!-- 违纪类型说明 -->
+                <view
+                    v-if="formData.disciplineTypeId && selectedDisciplineTypeRemark"
+                    class="discipline-type-remark"
+                >
+                    <u-icon name="info-circle" color="#909399" size="14"></u-icon>
+                    <text class="remark-text">类型说明:{{ selectedDisciplineTypeRemark }}</text>
+                </view>
+
+                <!-- 宿舍扣分 -->
+                <u-form-item label="宿舍扣分" prop="totalScore">
+                    <u-input
+                        v-model.number="formData.totalScore"
+                        type="digit"
+                        placeholder="请输入扣分（0-100分）"
+                        @input="handleTotalScoreChange"
+                    />
+                </u-form-item>
+
+                <!-- 卫生等级 -->
+                <u-form-item label="卫生等级" prop="hygieneGrade" required>
+                    <view @click="showHygieneGradePicker = true" style="width: 100%">
+                        <u-input
+                            :value="hygieneGradeDisplay"
+                            placeholder="请选择卫生等级"
+                            readonly
+                            border="none"
+                            suffix-icon="arrow-down"
+                            suffix-icon-style="color: #c8c9cc;"
+                            style="pointer-events: none"
+                        />
+                    </view>
+                    <u-picker
+                        :show="showHygieneGradePicker && xg_dorm_hygiene_grade.length > 0"
+                        :columns="hygieneGradeColumns"
+                        keyName="text"
+                        @confirm="handleHygieneGradeConfirm"
+                        @cancel="showHygieneGradePicker = false"
+                    ></u-picker>
+                </u-form-item>
+
+                <!-- 检查附件 -->
+                <u-form-item label="检查附件">
+                    <view class="upload-area">
+                        <!-- 图片展示区域 -->
+                        <view v-if="imageFiles.length > 0" class="image-section">
+                            <view class="image-title">图片附件</view>
+                            <view class="image-grid">
+                                <view
+                                    v-for="(image, index) in imageFiles"
+                                    :key="image.uid || index"
+                                    class="image-item"
+                                    @click="handleImageClick(image, index, $event)"
+                                >
+                                    <!-- 图片容器 -->
+                                    <view class="image-container">
+                                        <image
+                                            :src="image.blobUrl || image.url"
+                                            class="attachment-image"
+                                            mode="aspectFill"
+                                            @error="handleImageError"
+                                        ></image>
+
+                                        <!-- 上传状态遮罩 -->
+                                        <view
+                                            v-if="image.status === 'uploading'"
+                                            class="upload-overlay"
+                                        >
+                                            <u-loading-icon
+                                                mode="circle"
+                                                size="24"
+                                                color="#fff"
+                                            ></u-loading-icon>
+                                            <text class="upload-text">
+                                                {{ image.progress || 0 }}%
+                                            </text>
+                                        </view>
+
+                                        <!-- 错误状态遮罩 -->
+                                        <view v-if="image.status === 'error'" class="error-overlay">
+                                            <u-icon
+                                                name="close-circle"
+                                                size="24"
+                                                color="#fff"
+                                            ></u-icon>
+                                            <text class="error-text">上传失败</text>
+                                        </view>
+
+                                        <!-- 成功状态角标 -->
+                                        <view
+                                            v-if="image.status === 'success'"
+                                            class="success-badge"
+                                        >
+                                            <u-icon
+                                                name="checkmark-circle-fill"
+                                                size="18"
+                                                color="#52c41a"
+                                            ></u-icon>
+                                        </view>
+                                    </view>
+
+                                    <!-- 图片操作按钮 -->
+                                    <view class="image-actions" @click.stop>
+                                        <u-button
+                                            v-if="image.status === 'success'"
+                                            size="mini"
+                                            type="primary"
+                                            shape="round"
+                                            plain
+                                            @tap="handleImageDownload(image)"
+                                            @click.stop.prevent="
+                                                handleImageDownloadClick(image, $event)
+                                            "
+                                        >
+                                            下载
+                                        </u-button>
+                                        <u-button
+                                            v-if="image.status === 'error'"
+                                            size="mini"
+                                            type="warning"
+                                            shape="round"
+                                            plain
+                                            @click.stop.prevent="retryUploadFile(image, $event)"
+                                        >
+                                            重试
+                                        </u-button>
+                                        <u-button
+                                            size="mini"
+                                            type="error"
+                                            shape="round"
+                                            plain
+                                            @tap="handleImageDelete(image, index)"
+                                            @click.stop.prevent="
+                                                handleImageDeleteClick(image, index, $event)
+                                            "
+                                        >
+                                            删除
+                                        </u-button>
+                                    </view>
+
+                                    <!-- 文件名显示 -->
+                                    <view class="image-name">
+                                        <text>{{ getShortFileName(image.name) }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 微信图片上传进度条 -->
+                        <view
+                            v-if="uploadProgress > 0 && uploadProgress < 100"
+                            class="upload-progress"
+                        >
+                            <u-line-progress
+                                :percent="uploadProgress"
+                                :show-percent="true"
+                                active-color="#2979ff"
+                                inactive-color="#f0f0f0"
+                                height="8"
+                                :striped="true"
+                                :striped-active="true"
+                            ></u-line-progress>
+                            <text class="progress-text">
+                                微信图片上传进度: {{ uploadProgress }}%
+                            </text>
+                        </view>
+
+                        <!-- 统一附件上传按钮 -->
+                        <view class="doc-upload-section">
+                            <u-button
+                                type="info"
+                                shape="round"
+                                icon="plus"
+                                plain
+                                @click="handleDocUpload"
+                                style="margin-top: 20rpx; width: 100%"
+                            >
+                                添加证明材料
+                            </u-button>
+                        </view>
+
+                        <!-- 上传提示信息 -->
+                        <view class="upload-tips">
+                            <text class="tip-item">
+                                • 支持格式：JPG、PNG、PDF、Word等 • 单个文件不超过10MB •
+                                最多上传15个文件
+                            </text>
+                            <text class="tip-item">• 图片文件将以图片形式展示，支持预览和下载</text>
+                            <text v-if="isWechatBrowser" class="tip-item wechat-tip">
+                                • 在微信中使用可获得更好的图片选择体验
+                            </text>
+                        </view>
+                    </view>
+                </u-form-item>
+            </u-form>
+        </view>
+
+        <!-- 宿舍学生情况 -->
+        <view class="section-card">
+            <view class="section-header">
+                <text class="section-title">宿舍学生情况</text>
+                <view style="margin-left: auto">
+                    <u-button
+                        size="mini"
+                        type="primary"
+                        plain
+                        @click="loadRoomStudents"
+                        custom-style="padding: 0 20rpx;"
+                    >
+                        刷新学生信息
+                    </u-button>
+                </view>
+            </view>
+
+            <!-- 学生列表 -->
+            <view v-if="roomStudents.length > 0" class="students-list">
+                <view v-for="student in roomStudents" :key="student.studentId" class="student-card">
+                    <!-- 学生基本信息 -->
+                    <view class="student-header">
+                        <view class="student-basic-info">
+                            <view class="student-name-row">
+                                <text class="student-name">{{ student.studentName }}</text>
+                                <!-- 性别标签 -->
+                                <u-tag
+                                    v-if="
+                                        student.gender !== undefined &&
+                                        student.gender !== null &&
+                                        student.gender !== ''
+                                    "
+                                    :text="
+                                        student.gender === '0'
+                                            ? '男'
+                                            : student.gender === '1'
+                                            ? '女'
+                                            : '未知'
+                                    "
+                                    :type="
+                                        student.gender === '0'
+                                            ? 'primary'
+                                            : student.gender === '1'
+                                            ? 'error'
+                                            : 'warning'
+                                    "
+                                    size="mini"
+                                ></u-tag>
+                            </view>
+                            <text class="student-no">{{ student.studentNo }}</text>
+                        </view>
+                        <!-- 床位标签 -->
+                        <u-tag
+                            v-if="student.bedName"
+                            :text="student.bedName"
+                            type="info"
+                            size="mini"
+                        ></u-tag>
+                    </view>
+
+                    <!-- 学生详情 -->
+                    <view class="student-details">
+                        <text>班级：{{ student.className }} | 专业：{{ student.majorName }}</text>
+                    </view>
+
+                    <!-- 学生评分区域 -->
+                    <view class="student-score-section">
+                        <view class="score-row">
+                            <view class="score-col">
+                                <text class="score-label">个人扣分</text>
+                                <u-input
+                                    v-model="student.student_score"
+                                    type="digit"
+                                    placeholder="0-100分"
+                                    height="40"
+                                    custom-style="height: 40rpx; line-height: 40rpx; font-size: 14px;"
+                                    @input="handleStudentScoreChange(student)"
+                                    @blur="validateStudentScore(student)"
+                                />
+                            </view>
+                            <view class="score-col">
+                                <text class="score-label">出勤状态</text>
+                                <view @click="student.showAttendancePicker = true">
+                                    <u-input
+                                        :value="getAttendanceDisplay(student.attendance_status)"
+                                        placeholder="请选择"
+                                        readonly
+                                        border="none"
+                                        suffix-icon="arrow-down"
+                                        suffix-icon-style="color: #c8c9cc;"
+                                        height="40"
+                                        custom-style="height: 40rpx; line-height: 40rpx; font-size: 14px;"
+                                        style="pointer-events: none"
+                                    />
+                                </view>
+                                <u-picker
+                                    :show="
+                                        student.showAttendancePicker &&
+                                        xg_student_attendance_status.length > 0
+                                    "
+                                    :columns="attendanceStatusColumns"
+                                    keyName="text"
+                                    @confirm="(e) => handleAttendanceConfirm(e, student)"
+                                    @cancel="student.showAttendancePicker = false"
+                                ></u-picker>
+                            </view>
+                            <view class="score-col">
+                                <text class="score-label">学生评级</text>
+                                <view @click="student.showGradePicker = true">
+                                    <u-input
+                                        :value="getGradeDisplay(student.student_grade)"
+                                        placeholder="请选择"
+                                        readonly
+                                        border="none"
+                                        suffix-icon="arrow-down"
+                                        suffix-icon-style="color: #c8c9cc;"
+                                        height="40"
+                                        custom-style="height: 40rpx; line-height: 40rpx; font-size: 14px;"
+                                        style="pointer-events: none"
+                                    />
+                                </view>
+                                <u-picker
+                                    :show="
+                                        student.showGradePicker && xg_dorm_hygiene_grade.length > 0
+                                    "
+                                    :columns="hygieneGradeColumns"
+                                    keyName="text"
+                                    @confirm="(e) => handleStudentGradeConfirm(e, student)"
+                                    @cancel="student.showGradePicker = false"
+                                ></u-picker>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 请假信息 -->
+                    <view v-if="getStudentLeave(student.studentId)" class="leave-section">
+                        <view class="leave-header">
+                            <text class="leave-title">请假信息</text>
+                            <u-tag type="warning" size="mini">请假中</u-tag>
+                        </view>
+                        <view class="leave-info">
+                            <view class="leave-item">
+                                <text class="leave-label">发起时间：</text>
+                                <text class="leave-value">
+                                    {{
+                                        formatDateTime(
+                                            getStudentLeave(student.studentId) &&
+                                                getStudentLeave(student.studentId).createTime,
+                                        )
+                                    }}
+                                </text>
+                            </view>
+                            <view class="leave-item">
+                                <text class="leave-label">请假时间：</text>
+                                <text class="leave-value">
+                                    {{
+                                        formatDateTime(
+                                            getStudentLeave(student.studentId) &&
+                                                getStudentLeave(student.studentId).startTime,
+                                        )
+                                    }}
+                                    至
+                                    {{
+                                        formatDateTime(
+                                            getStudentLeave(student.studentId) &&
+                                                getStudentLeave(student.studentId).endTime,
+                                        )
+                                    }}
+                                </text>
+                            </view>
+                            <view class="leave-item">
+                                <text class="leave-label">请假类型：</text>
+                                <text class="leave-value">
+                                    {{
+                                        getStudentLeave(student.studentId) &&
+                                        getStudentLeave(student.studentId).leaveTypeName
+                                    }}
+                                </text>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 违纪情况 -->
+                    <view class="violation-section">
+                        <view class="violation-header">
+                            <text class="violation-title">违纪情况</text>
+                            <view style="margin-left: auto">
+                                <u-button
+                                    size="mini"
+                                    type="warning"
+                                    plain
+                                    @click="addViolationRecord(student)"
+                                    :disabled="!student.studentId"
+                                    custom-style="padding: 0 20rpx;"
+                                >
+                                    录入违纪
+                                </u-button>
+                            </view>
+                        </view>
+
+                        <!-- 违纪记录列表 -->
+                        <view
+                            v-if="getStudentViolations(student.studentId).length > 0"
+                            class="violations-list"
+                        >
+                            <view
+                                v-for="(violation, vIndex) in getStudentViolations(
+                                    student.studentId,
+                                )"
+                                :key="vIndex"
+                                class="violation-item"
+                            >
+                                <view class="violation-info">
+                                    <text class="violation-type">
+                                        {{ violation.disciplineTypeName }}
+                                    </text>
+                                    <text class="violation-score">
+                                        扣{{ violation.scoreDeduction }}分
+                                    </text>
+                                </view>
+                                <view class="violation-actions">
+                                    <u-button
+                                        size="mini"
+                                        type="primary"
+                                        plain
+                                        @click="editViolationRecord(student, violation, vIndex)"
+                                    >
+                                        编辑
+                                    </u-button>
+                                    <u-button
+                                        size="mini"
+                                        type="error"
+                                        plain
+                                        @click="removeViolationRecord(student.studentId, vIndex)"
+                                    >
+                                        删除
+                                    </u-button>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 暂无违纪记录 -->
+                        <view v-else class="no-violations">
+                            <text class="no-violations-text">暂无违纪记录</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 暂无学生 -->
+            <view v-else-if="!studentsLoading" class="empty-students">
+                <u-empty text="该房间暂无学生信息" mode="data"></u-empty>
+            </view>
+
+            <!-- 加载中 -->
+            <view v-if="studentsLoading" class="loading-container">
+                <u-loading-icon mode="circle"></u-loading-icon>
+                <text class="loading-text">加载学生信息中...</text>
+            </view>
+        </view>
+
+        <!-- 底部操作按钮 -->
+        <view class="bottom-actions">
+            <u-button type="info" @click="handleCancel" style="flex: 1; margin-right: 20rpx">
+                取消
+            </u-button>
+            <u-button type="primary" @click="handleSubmit" :loading="submitLoading" style="flex: 1">
+                保存检查结果
+            </u-button>
+        </view>
+
+        <!-- 违纪记录弹窗 -->
+        <ViolationRecordDialog
+            v-if="violationDialogVisible"
+            :visible="violationDialogVisible"
+            :student-info="currentStudent"
+            :violation-data="currentViolation"
+            @confirm="handleViolationConfirm"
+            @close="handleViolationClose"
+        />
+
+        <!-- 附件上传操作选择框（使用 u-action-sheet 以解决层级问题） -->
+        <u-action-sheet
+            :show="showUploadActionSheet"
+            :actions="uploadActions"
+            title="选择上传方式"
+            @select="handleUploadActionSelect"
+            @close="showUploadActionSheet = false"
+        ></u-action-sheet>
+    </view>
+</template>
+
+<script>
+import { request, smartUploadFile, downloadFile } from '@/common/request.js';
+import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
+import dayjs from 'dayjs';
+import weChatSDK from '@/utils/wechat.js';
+import ViolationRecordDialog from './ViolationRecordDialog.vue';
+
+export default {
+    name: 'SingleRoomCheck',
+    components: {
+        ViolationRecordDialog,
+    },
+    props: {
+        roomInfo: {
+            type: Object,
+            required: true,
+        },
+        checkInfo: {
+            type: Object,
+            required: true,
+        },
+        existingData: {
+            type: Object,
+            default: null,
+        },
+    },
+    data() {
+        return {
+            submitLoading: false,
+            studentsLoading: false,
+
+            // 表单数据
+            formData: {
+                disciplineTypeId: null,
+                disciplineTypeName: '',
+                totalScore: 0,
+                hygieneGrade: 'A',
+                checkRemarks: '',
+                attachmentIds: '',
+            },
+
+            // 表单验证规则
+            rules: {
+                hygieneGrade: [{ required: true, message: '请选择卫生等级', trigger: 'change' }],
+            },
+
+            // Picker显示状态
+            showDisciplineTypePicker: false,
+            showHygieneGradePicker: false,
+
+            // 违纪类型选项
+            disciplineTypeOptions: [],
+
+            // 字典数据
+            xg_dorm_hygiene_grade: [],
+            xg_student_attendance_status: [],
+
+            // 学生数据
+            roomStudents: [],
+            studentLeaves: new Map(),
+
+            // 违纪记录
+            violationRecords: new Map(),
+            violationDialogVisible: false,
+            currentStudent: null,
+            currentViolation: null,
+            currentViolationIndex: -1,
+
+            // 附件数据
+            attachmentList: [],
+
+            // 微信SDK相关
+            isWechatBrowser: false,
+            wechatInitializing: false,
+            uploadProgress: 0,
+
+            // 附件上传操作选择框
+            showUploadActionSheet: false,
+            uploadActions: [{ name: '选择图片' }],
+        };
+    },
+    computed: {
+        // 房间显示名称
+        getRoomDisplayName() {
+            if (!this.roomInfo) {
+                console.warn('⚠️ getRoomDisplayName: roomInfo 为空');
+                return '';
+            }
+
+            // 按优先级尝试获取房间名称
+            const name =
+                this.roomInfo.roomName || this.roomInfo.roomCode || this.roomInfo.name || '';
+
+            if (!name) {
+                console.warn('⚠️ getRoomDisplayName: 所有房间名称字段都为空', this.roomInfo);
+            } else {
+                console.log('✅ getRoomDisplayName: 找到房间名称 -', name);
+            }
+
+            return name;
+        },
+
+        // 违纪类型列
+        disciplineTypeColumns() {
+            return [
+                this.disciplineTypeOptions.map((item) => ({
+                    text: item.typeName,
+                    value: item.id,
+                })),
+            ];
+        },
+
+        // 违纪类型显示文本
+        disciplineTypeDisplay() {
+            if (!this.formData.disciplineTypeId) return '';
+            const item = this.disciplineTypeOptions.find(
+                (d) => d.id === this.formData.disciplineTypeId,
+            );
+            return item ? item.typeName : '';
+        },
+
+        // 违纪类型说明
+        selectedDisciplineTypeRemark() {
+            if (!this.formData.disciplineTypeId) return '';
+            const item = this.disciplineTypeOptions.find(
+                (d) => d.id === this.formData.disciplineTypeId,
+            );
+            return item ? item.remark : '';
+        },
+
+        // 卫生等级列
+        hygieneGradeColumns() {
+            return [
+                this.xg_dorm_hygiene_grade.map((item) => ({
+                    text: item.label,
+                    value: item.value,
+                })),
+            ];
+        },
+
+        // 卫生等级显示文本
+        hygieneGradeDisplay() {
+            const item = this.xg_dorm_hygiene_grade.find(
+                (d) => d.value === this.formData.hygieneGrade,
+            );
+            return item ? item.label : '';
+        },
+
+        // 出勤状态列
+        attendanceStatusColumns() {
+            return [
+                this.xg_student_attendance_status.map((item) => ({
+                    text: item.label,
+                    value: item.value,
+                })),
+            ];
+        },
+
+        // 图片文件
+        imageFiles() {
+            return this.attachmentList.filter((file) => this.isImageFile(file));
+        },
+    },
+    watch: {
+        roomInfo: {
+            handler(newVal) {
+                console.log('🔄 SingleRoomCheck - roomInfo 变化:', newVal);
+                console.log(
+                    '🔄 房间字段 - roomName:',
+                    newVal?.roomName,
+                    ', roomCode:',
+                    newVal?.roomCode,
+                    ', name:',
+                    newVal?.name,
+                );
+            },
+            immediate: true,
+            deep: true,
+        },
+    },
+    async mounted() {
+        // 打印房间信息用于调试
+        console.log('📍 SingleRoomCheck mounted - roomInfo:', this.roomInfo);
+        console.log('📍 SingleRoomCheck mounted - checkInfo:', this.checkInfo);
+        console.log('📍 计算属性 getRoomDisplayName:', this.getRoomDisplayName);
+
+        // 检查微信环境
+        await this.checkWechatEnvironment();
+        this.initComponent();
+    },
+    methods: {
+        // 检查微信环境并自动初始化SDK
+        async checkWechatEnvironment() {
+            try {
+                this.isWechatBrowser = weChatSDK.isWeChatBrowser();
+                if (this.isWechatBrowser) {
+                    await this.initWechatSDK();
+                }
+            } catch (error) {
+                console.error('微信环境检查失败:', error);
+            }
+        },
+
+        // 初始化微信SDK
+        async initWechatSDK() {
+            if (this.wechatInitializing) return;
+            this.wechatInitializing = true;
+            try {
+                await weChatSDK.init({
+                    debug: process.env.NODE_ENV === 'development',
+                    jsApiList: ['chooseImage', 'previewImage', 'getLocation', 'openLocation'],
+                });
+            } catch (error) {
+                console.error('微信SDK初始化失败:', error);
+            } finally {
+                this.wechatInitializing = false;
+            }
+        },
+
+        // 初始化组件
+        async initComponent() {
+            try {
+                // 加载字典数据
+                await this.loadDicts();
+
+                // 加载违纪类型
+                await this.loadDisciplineTypes();
+
+                // 加载房间学生信息
+                await this.loadRoomStudents();
+
+                // 如果有现有数据，加载编辑数据
+                if (this.existingData) {
+                    this.loadEditData();
+                }
+            } catch (error) {
+                console.error('初始化组件失败:', error);
+                uni.showToast({ title: '初始化失败', icon: 'none' });
+            }
+        },
+
+        // 加载字典数据
+        async loadDicts() {
+            try {
+                const [gradeData, attendanceData] = await Promise.all([
+                    getDict('xg_dorm_hygiene_grade'),
+                    getDict('xg_student_attendance_status'),
+                ]);
+
+                this.xg_dorm_hygiene_grade = gradeData || [];
+                this.xg_student_attendance_status = attendanceData || [];
+            } catch (error) {
+                console.error('加载字典数据失败:', error);
+            }
+        },
+
+        // 加载违纪类型
+        async loadDisciplineTypes() {
+            try {
+                const res = await request({
+                    url: '/disciplineType/disciplineType/listByAreaType',
+                    method: 'GET',
+                    params: {
+                        areaType: '1',
+                        status: '0',
+                    },
+                });
+
+                if (res.code === 200 && res.data) {
+                    this.disciplineTypeOptions = res.data;
+                } else {
+                    this.disciplineTypeOptions = [];
+                }
+            } catch (error) {
+                console.error('加载违纪类型失败:', error);
+                this.disciplineTypeOptions = [];
+            }
+        },
+
+        // 加载房间学生信息
+        async loadRoomStudents() {
+            if (!this.roomInfo || !this.roomInfo.id) {
+                this.roomStudents = [];
+                return;
+            }
+
+            this.studentsLoading = true;
+            try {
+                const res = await request({
+                    url: '/dormBedStudent/dormBedStudent/getRoomStudents',
+                    method: 'GET',
+                    params: { roomId: this.roomInfo.id },
+                });
+
+                if (res.code === 200 && res.data) {
+                    // 调试：查看后端返回的学生数据结构
+                    console.log('🔍 后端返回的学生数据:', res.data);
+                    if (res.data.length > 0) {
+                        console.log('🔍 第一个学生的完整数据:', res.data[0]);
+                    }
+
+                    this.roomStudents = res.data.map((student) => ({
+                        ...student,
+                        student_score: 0,
+                        attendance_status: '1',
+                        student_grade: 'A',
+                        showAttendancePicker: false,
+                        showGradePicker: false,
+                    }));
+
+                    // 加载学生请假信息
+                    await this.loadStudentLeaves();
+                } else {
+                    this.roomStudents = [];
+                }
+            } catch (error) {
+                console.error('加载房间学生信息失败:', error);
+                uni.showToast({ title: '加载学生信息失败', icon: 'none' });
+                this.roomStudents = [];
+            } finally {
+                this.studentsLoading = false;
+            }
+        },
+
+        // 加载学生请假信息
+        async loadStudentLeaves() {
+            if (!this.checkInfo || !this.checkInfo.checkDate || this.roomStudents.length === 0)
+                return;
+
+            try {
+                const studentIds = this.roomStudents.map((s) => s.studentId).join(',');
+                const res = await request({
+                    url: '/studentLeave/studentLeave/queryByCheckDate',
+                    method: 'GET',
+                    params: {
+                        studentIds,
+                        checkDate: this.checkInfo.checkDate,
+                    },
+                });
+
+                if (res.code === 200 && res.data) {
+                    this.studentLeaves.clear();
+                    Object.keys(res.data).forEach((studentId) => {
+                        this.studentLeaves.set(Number(studentId), res.data[studentId]);
+                        // 自动设置出勤状态为请假
+                        const student = this.roomStudents.find(
+                            (s) => s.studentId === Number(studentId),
+                        );
+                        if (student) {
+                            student.attendance_status = '3';
+                        }
+                    });
+                }
+            } catch (error) {
+                console.error('加载学生请假信息失败:', error);
+            }
+        },
+
+        // 加载编辑数据
+        loadEditData() {
+            // TODO: 加载现有检查数据进行编辑
+            console.log('加载编辑数据:', this.existingData);
+        },
+
+        // 违纪类型确认处理
+        handleDisciplineTypeConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                const selectedType = this.disciplineTypeOptions.find(
+                    (item) => item.id === e.value[0].value,
+                );
+                if (selectedType) {
+                    this.formData.disciplineTypeId = selectedType.id;
+                    this.formData.disciplineTypeName = selectedType.typeName;
+
+                    // 自动填入最低扣分
+                    if (selectedType.minScore !== null && selectedType.minScore !== undefined) {
+                        this.formData.totalScore = selectedType.minScore;
+                        uni.showToast({
+                            title: `已自动填入最低扣分：${selectedType.minScore}分`,
+                            icon: 'none',
+                        });
+                    }
+                }
+            }
+            this.showDisciplineTypePicker = false;
+        },
+
+        // 宿舍总分变化处理
+        handleTotalScoreChange() {
+            const score = parseFloat(this.formData.totalScore);
+            if (!isNaN(score) && (score < 0 || score > 100)) {
+                uni.showToast({ title: '宿舍扣分必须在0-100分之间', icon: 'none' });
+                this.formData.totalScore = 0;
+            }
+        },
+
+        // 卫生等级确认处理
+        handleHygieneGradeConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                this.formData.hygieneGrade = e.value[0].value;
+            }
+            this.showHygieneGradePicker = false;
+        },
+
+        // 统一附件上传方法（支持图片和文档）
+        handleDocUpload() {
+            console.log('=== 统一附件上传方法 ===');
+
+            // 检查文件数量限制
+            if (this.attachmentList.length >= 15) {
+                uni.showToast({
+                    title: '最多只能上传15个文件',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 显示选择文件类型的操作菜单（使用 u-action-sheet 解决弹窗内层级问题）
+            this.showUploadActionSheet = true;
+        },
+
+        // 处理附件上传操作选择
+        handleUploadActionSelect(index) {
+            console.log('=== 处理附件上传操作选择 ===', index);
+            this.showUploadActionSheet = false;
+
+            // 直接调用选择文档方法
+            this.chooseDocuments();
+        },
+
+        // 选择文档文件
+        chooseDocuments() {
+            // 使用uni.chooseImage选择图片
+            uni.chooseImage({
+                count: Math.min(5, 15 - this.attachmentList.length),
+                sizeType: ['original', 'compressed'],
+                sourceType: ['album', 'camera'],
+                success: (imageRes) => {
+                    console.log('选择图片成功 - 完整响应:', imageRes);
+                    console.log('🔍 tempFiles详细信息:', imageRes.tempFiles);
+
+                    const files = imageRes.tempFilePaths.map((path, index) => {
+                        const tempFile = imageRes.tempFiles && imageRes.tempFiles[index];
+
+                        // 🔴 关键修复：优先使用tempFile.name，避免从blob URL提取UUID
+                        let fileName = `image_${Date.now()}_${index}.jpg`; // 默认文件名
+
+                        if (tempFile && tempFile.name) {
+                            // 使用原始文件名
+                            fileName = tempFile.name;
+                        } else if (path && !path.startsWith('blob:')) {
+                            // 如果不是blob URL，才从路径提取文件名
+                            fileName = path.split('/').pop();
+                        }
+
+                        console.log(`📝 文件${index + 1}名称生成:`, {
+                            tempFileName: tempFile?.name,
+                            pathFileName: path?.split('/').pop(),
+                            finalFileName: fileName,
+                        });
+
+                        return {
+                            name: fileName,
+                            path: path,
+                            url: path,
+                            tempFilePath: path,
+                            size: (tempFile && tempFile.size) || 0,
+                            type: (tempFile && tempFile.type) || 'image/jpeg',
+                        };
+                    });
+
+                    // 检查文件大小
+                    const validFiles = files.filter((file) => {
+                        return this.checkFileSize(file);
+                    });
+
+                    if (validFiles.length > 0) {
+                        this.handleFileUpload({ tempFiles: validFiles });
+                    } else {
+                        console.log('所有文件都超过大小限制，取消上传');
+                    }
+                },
+                fail: (err) => {
+                    console.error('选择图片失败:', err);
+                    uni.showToast({
+                        title: '选择图片失败',
+                        icon: 'none',
+                    });
+                },
+            });
+        },
+
+        // 文件上传
+        handleFileUpload(event) {
+            console.log('文件上传事件触发:', event);
+
+            // 显示用户提示
+            uni.showToast({
+                title: '文件选择成功，开始上传...',
+                icon: 'loading',
+                duration: 2000,
+            });
+
+            // 兼容不同的事件格式
+            let files = [];
+
+            // 直接传递的tempFiles格式（文档上传等）
+            if (event.tempFiles) {
+                files = event.tempFiles;
+                console.log('✅ tempFiles格式解析结果:', files);
+                console.log('🔍 第一个文件详细信息:', files[0]);
+            }
+            // tempFilePaths格式（兼容旧版本）
+            else if (event.tempFilePaths) {
+                files = event.tempFilePaths.map((path, index) => ({
+                    url: path,
+                    path: path,
+                    tempFilePath: path,
+                    name: `文件${index + 1}`,
+                    type: '',
+                }));
+                console.log('✅ tempFilePaths格式解析结果:', files);
+            }
+
+            console.log('📋 最终解析得到的文件列表:', files);
+
+            if (files.length === 0) {
+                console.error('❌ 没有获取到文件数据');
+                uni.showToast({
+                    title: '未获取到文件，请重试',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 检查文件数量限制
+            if (this.attachmentList.length + files.length > 15) {
+                console.warn('⚠️ 文件数量超过限制');
+                uni.showToast({
+                    title: '最多只能上传15个文件',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 检查文件大小限制
+            const validFiles = files.filter((file) => {
+                const isValid = this.checkFileSize(file);
+                console.log(
+                    `文件大小检查 - ${file.name || '未知文件'}:`,
+                    isValid ? '✅ 通过' : '❌ 超限',
+                );
+                return isValid;
+            });
+
+            if (validFiles.length === 0) {
+                console.log('❌ 所有文件都超过大小限制，取消上传');
+                return;
+            }
+
+            // 处理有效文件
+            const newFiles = validFiles.map((file, index) => {
+                const filePath = file.url || file.tempFilePath || file.path;
+                const fileName =
+                    file.name ||
+                    (filePath && filePath.split('/').pop()) ||
+                    `检查附件${Date.now()}_${index}.jpg`;
+
+                return {
+                    ...file,
+                    uid: `upload_${Date.now()}_${index}`,
+                    name: fileName,
+                    url: filePath,
+                    path: filePath,
+                    tempFilePath: filePath,
+                    status: 'uploading',
+                    ossId: null,
+                    type: file.type || this.getFileTypeByName(fileName),
+                };
+            });
+
+            console.log('📊 处理后的新文件数量:', newFiles.length);
+
+            // 添加到附件列表
+            this.attachmentList.push(...newFiles);
+
+            // 显示上传提示
+            uni.showToast({
+                title: `开始上传 ${newFiles.length} 个文件`,
+                icon: 'loading',
+                duration: 1500,
+            });
+
+            // 逐个上传文件到服务器
+            console.log('🚀 开始逐个上传文件到服务器...');
+            newFiles.forEach((file, index) => {
+                console.log(`🚀 准备上传第 ${index + 1} 个文件: ${file.name}`);
+
+                this.uploadFileToServer(file)
+                    .then(() => {
+                        console.log(`✅ 文件 ${file.name} 上传完成`);
+                    })
+                    .catch((error) => {
+                        console.error(`❌ 文件 ${file.name} 上传失败:`, error);
+                    });
+            });
+        },
+
+        // 检查文件大小是否超过限制
+        checkFileSize(file) {
+            const maxSize = 10 * 1024 * 1024; // 10MB
+            const fileSize = file.size || 0;
+
+            if (fileSize > maxSize) {
+                const fileSizeMB = (fileSize / (1024 * 1024)).toFixed(2);
+                uni.showToast({
+                    title: `文件大小 ${fileSizeMB}MB，超过10MB限制`,
+                    icon: 'none',
+                    duration: 3000,
+                });
+                return false;
+            }
+            return true;
+        },
+
+        // 上传文件到服务器
+        async uploadFileToServer(file) {
+            try {
+                file.status = 'uploading';
+
+                // 🔴 关键修复：保存原始文件名，防止被后端UUID覆盖
+                const originalName = file.name;
+                console.log('📝 上传前文件名:', originalName);
+
+                const response = await smartUploadFile('/resource/oss/upload', file, {
+                    bizType: 'dorm_hygiene_check_attachment',
+                });
+
+                console.log('📡 上传响应:', response);
+                console.log('🔍 上传后file.name:', file.name);
+
+                if (response && response.code === 200) {
+                    file.url = response.data.url;
+                    file.ossId = response.data.ossId;
+                    file.status = 'success';
+                    // 🔴 恢复原始文件名，不使用后端返回的fileName（UUID）
+                    file.name = originalName;
+                    console.log('✅ 恢复文件名为:', file.name);
+                    uni.showToast({ title: '上传成功', icon: 'success', duration: 1500 });
+                } else {
+                    file.status = 'error';
+                    uni.showToast({
+                        title: (response && response.msg) || '上传失败',
+                        icon: 'none',
+                        duration: 2000,
+                    });
+                }
+            } catch (error) {
+                console.error('上传文件失败:', error);
+                file.status = 'error';
+                uni.showToast({ title: '上传失败', icon: 'none', duration: 2000 });
+            }
+        },
+
+        // 重试上传
+        async retryUploadFile(file, event) {
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
+
+            file.status = 'uploading';
+            file.progress = 0;
+
+            try {
+                await this.uploadFileToServer(file);
+                uni.showToast({
+                    title: '重新上传成功',
+                    icon: 'success',
+                    duration: 1500,
+                });
+            } catch (error) {
+                console.error('重试上传失败:', error);
+                file.status = 'error';
+                file.progress = 0;
+
+                uni.showToast({
+                    title: '重试失败，请稍后再试',
+                    icon: 'none',
+                    duration: 2000,
+                });
+            }
+        },
+
+        // 图片点击处理（智能判断是预览还是操作按钮）
+        handleImageClick(image, index, event) {
+            // 检查点击目标是否是操作按钮区域
+            const target = event.target;
+            const isActionButton =
+                target.closest('.image-actions') ||
+                target.closest('u-button') ||
+                target.tagName === 'BUTTON';
+
+            if (!isActionButton && image.status === 'success') {
+                // 点击图片本身，进行预览
+                this.handleImagePreview(image, index);
+            }
+        },
+
+        // 图片预览
+        handleImagePreview(image, index) {
+            if (image.status !== 'success') {
+                uni.showToast({
+                    title: '图片尚未上传完成',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 获取所有成功上传的图片URL
+            const imageUrls = this.imageFiles
+                .filter((file) => file.status === 'success')
+                .map((file) => file.blobUrl || file.url);
+
+            if (imageUrls.length === 0) {
+                uni.showToast({
+                    title: '暂无可预览的图片',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 找到当前图片在成功列表中的索引
+            const currentUrl = image.blobUrl || image.url;
+            const currentIndex = imageUrls.findIndex((url) => url === currentUrl);
+
+            uni.previewImage({
+                urls: imageUrls,
+                current: currentIndex >= 0 ? currentIndex : 0,
+                success: () => {
+                    // 预览成功
+                },
+                fail: (error) => {
+                    console.error('图片预览失败:', error);
+                    uni.showToast({
+                        title: '预览失败',
+                        icon: 'none',
+                    });
+                },
+            });
+        },
+
+        // 图片下载（带重试机制）
+        async handleImageDownload(image, event, retryCount = 0) {
+            // 事件阻止已由handleImageDownloadClick方法处理
+
+            if (image.status !== 'success') {
+                uni.showToast({
+                    title: '图片尚未上传完成',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 显示下载进度提示
+            uni.showLoading({
+                title: '正在下载图片...',
+                mask: true,
+            });
+
+            try {
+                // 如果有ossId，通过API下载
+                if (image.ossId) {
+                    const downloadUrl = `/resource/oss/download/${image.ossId}`;
+
+                    console.log('📥 下载文件信息:', {
+                        ossId: image.ossId,
+                        fileName: image.name,
+                        url: image.url,
+                        downloadUrl: downloadUrl,
+                    });
+
+                    // 调用下载接口并等待完成（直接使用image.name）
+                    const response = await downloadFile(downloadUrl, image.name);
+
+                    if (response.statusCode === 200) {
+                        uni.hideLoading();
+                        uni.saveFile({
+                            tempFilePath: response.tempFilePath,
+                            success: function (res) {
+                                uni.showToast({
+                                    title: '下载成功',
+                                    icon: 'success',
+                                });
+                            },
+                            fail: function () {
+                                uni.showToast({
+                                    title: '保存失败',
+                                    icon: 'none',
+                                });
+                            },
+                        });
+                    }
+                }
+            } catch (error) {
+                console.error('图片下载过程出错:', error);
+
+                // 确保隐藏loading状态
+                uni.hideLoading();
+
+                // 重试机制（最多重试2次）
+                if (retryCount < 2) {
+                    // 显示重试提示
+                    uni.showToast({
+                        title: `下载失败，正在重试(${retryCount + 1}/2)...`,
+                        icon: 'none',
+                        duration: 1500,
+                    });
+
+                    setTimeout(() => {
+                        this.handleImageDownload(image, event, retryCount + 1);
+                    }, 1500); // 延迟1.5秒后重试
+
+                    return;
+                }
+
+                // 超过重试次数，显示最终错误信息
+                const errorMsg =
+                    error.message && error.message.includes('网络')
+                        ? '网络连接失败，请检查网络后重试'
+                        : error.message && error.message.includes('timeout')
+                        ? '下载超时，请重试'
+                        : '下载失败，已重试2次，请检查网络或稍后重试';
+
+                uni.showToast({
+                    title: errorMsg,
+                    icon: 'none',
+                    duration: 3000,
+                });
+            }
+        },
+
+        // 图片下载按钮点击处理（更强的事件处理）
+        handleImageDownloadClick(image, event) {
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+                event.stopImmediatePropagation();
+            }
+
+            // 调用实际的下载方法
+            this.handleImageDownload(image, event);
+        },
+
+        // 删除按钮点击处理（更强的事件处理）
+        handleImageDeleteClick(image, index, event) {
+            console.log('删除按钮被点击:', image, index);
+
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+                event.stopImmediatePropagation();
+            }
+
+            // 调用实际的删除方法
+            this.handleImageDelete(image, index);
+        },
+
+        // 图片删除
+        handleImageDelete(image, index, event) {
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
+
+            uni.showModal({
+                title: '确认删除',
+                content: '确定要删除这张图片吗？删除后无法恢复。',
+                confirmColor: '#ff5722',
+                success: (res) => {
+                    if (res.confirm) {
+                        // 从附件列表中删除
+                        const attachmentIndex = this.attachmentList.findIndex(
+                            (file) =>
+                                file.uid === image.uid ||
+                                (file.ossId && file.ossId === image.ossId) ||
+                                (file.url && file.url === image.url),
+                        );
+
+                        if (attachmentIndex >= 0) {
+                            this.attachmentList.splice(attachmentIndex, 1);
+                        }
+
+                        // 清理blob URL，防止内存泄漏
+                        if (image.blobUrl && image.blobUrl.startsWith('blob:')) {
+                            URL.revokeObjectURL(image.blobUrl);
+                        }
+
+                        uni.showToast({
+                            title: '删除成功',
+                            icon: 'success',
+                        });
+                    }
+                },
+                fail: (err) => {
+                    console.error('删除确认对话框显示失败:', err);
+                },
+            });
+        },
+
+        // 获取文件名短格式
+        getShortFileName(fileName) {
+            if (!fileName) return '';
+
+            const lastDotIndex = fileName.lastIndexOf('.');
+            if (lastDotIndex === -1) {
+                // 没有后缀的文件名
+                return fileName.length > 12 ? fileName.substring(0, 12) + '...' : fileName;
+            }
+
+            const name = fileName.substring(0, lastDotIndex);
+            const ext = fileName.substring(lastDotIndex); // 包含点号的后缀
+
+            if (name.length <= 8) {
+                return fileName; // 文件名较短，直接返回
+            }
+
+            // 文件名较长，缩写中间部分，保留后缀
+            return name.substring(0, 8) + '...' + ext;
+        },
+
+        // 根据文件名获取文件类型
+        getFileTypeByName(fileName) {
+            if (!fileName) return '';
+            const ext =
+                (fileName.split('.').pop() && fileName.split('.').pop().toLowerCase()) || '';
+            const imageTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'];
+            if (imageTypes.includes(ext)) {
+                const mimeTypeMap = {
+                    jpg: 'image/jpeg',
+                    jpeg: 'image/jpeg',
+                    png: 'image/png',
+                    gif: 'image/gif',
+                    bmp: 'image/bmp',
+                    webp: 'image/webp',
+                };
+                return mimeTypeMap[ext] || `image/${ext}`;
+            }
+            return `file/${ext}`;
+        },
+
+        // 图片加载错误处理
+        handleImageError(event) {
+            console.warn('图片加载失败:', event);
+        },
+
+        // 判断是否为图片文件
+        isImageFile(file) {
+            const imageTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/bmp', 'image/webp'];
+            if (file.type) {
+                return imageTypes.includes(file.type);
+            }
+            const fileName = file.name || file.url || '';
+            return /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(fileName);
+        },
+
+        // 学生分数变化处理
+        handleStudentScoreChange(student) {
+            const score = parseFloat(student.student_score);
+            if (!isNaN(score) && (score < 0 || score > 100)) {
+                uni.showToast({ title: '个人扣分必须在0-100分之间', icon: 'none' });
+            }
+        },
+
+        // 验证学生分数
+        validateStudentScore(student) {
+            if (
+                student.student_score !== null &&
+                student.student_score !== undefined &&
+                student.student_score !== ''
+            ) {
+                const score = parseFloat(student.student_score);
+                if (isNaN(score) || score < 0 || score > 100) {
+                    uni.showToast({ title: '个人扣分必须在0-100分之间，已重置为0', icon: 'none' });
+                    student.student_score = 0;
+                } else {
+                    student.student_score = parseFloat(score.toFixed(2));
+                }
+            } else {
+                student.student_score = 0;
+            }
+        },
+
+        // 出勤状态确认
+        handleAttendanceConfirm(e, student) {
+            if (e && e.value && e.value.length > 0) {
+                student.attendance_status = e.value[0].value;
+            }
+            student.showAttendancePicker = false;
+        },
+
+        // 学生评级确认
+        handleStudentGradeConfirm(e, student) {
+            if (e && e.value && e.value.length > 0) {
+                student.student_grade = e.value[0].value;
+            }
+            student.showGradePicker = false;
+        },
+
+        // 获取出勤状态显示文本
+        getAttendanceDisplay(value) {
+            return getDictLabel(this.xg_student_attendance_status, value);
+        },
+
+        // 获取评级显示文本
+        getGradeDisplay(value) {
+            return getDictLabel(this.xg_dorm_hygiene_grade, value);
+        },
+
+        // 获取学生请假信息
+        getStudentLeave(studentId) {
+            return this.studentLeaves.get(studentId) || null;
+        },
+
+        // 格式化日期时间
+        formatDateTime(dateStr) {
+            if (!dateStr) return '';
+            return dayjs(dateStr).format('YYYY-MM-DD HH:mm');
+        },
+
+        // 添加违纪记录
+        addViolationRecord(student) {
+            this.currentStudent = student;
+            this.currentViolation = null;
+            this.currentViolationIndex = -1;
+            this.violationDialogVisible = true;
+        },
+
+        // 编辑违纪记录
+        editViolationRecord(student, violation, index) {
+            this.currentStudent = student;
+            this.currentViolation = violation;
+            this.currentViolationIndex = index;
+            this.violationDialogVisible = true;
+        },
+
+        // 删除违纪记录
+        removeViolationRecord(studentId, index) {
+            uni.showModal({
+                title: '确认删除',
+                content: '确认删除这条违纪记录吗？',
+                success: (res) => {
+                    if (res.confirm) {
+                        const violations = this.violationRecords.get(studentId) || [];
+                        violations.splice(index, 1);
+
+                        if (violations.length === 0) {
+                            this.violationRecords.delete(studentId);
+                        } else {
+                            this.violationRecords.set(studentId, violations);
+                        }
+
+                        uni.showToast({ title: '违纪记录删除成功', icon: 'success' });
+                    }
+                },
+            });
+        },
+
+        // 获取学生违纪记录
+        getStudentViolations(studentId) {
+            return this.violationRecords.get(studentId) || [];
+        },
+
+        // 违纪记录确认
+        handleViolationConfirm(violationData) {
+            const studentId = this.currentStudent.studentId;
+            const violations = this.violationRecords.get(studentId) || [];
+
+            if (this.currentViolationIndex >= 0) {
+                // 编辑模式
+                violations[this.currentViolationIndex] = violationData;
+            } else {
+                // 新增模式
+                violations.push(violationData);
+            }
+
+            this.violationRecords.set(studentId, violations);
+            this.violationDialogVisible = false;
+            uni.showToast({ title: '违纪记录保存成功', icon: 'success' });
+        },
+
+        // 违纪记录弹窗关闭
+        handleViolationClose() {
+            this.violationDialogVisible = false;
+        },
+
+        // 提交表单
+        async handleSubmit() {
+            try {
+                // 表单验证
+                await this.$refs.formRef.validate();
+
+                this.submitLoading = true;
+
+                // 处理附件数据
+                const attachmentOssIds = this.attachmentList
+                    .filter((file) => file.status === 'success' && file.ossId)
+                    .map((file) => file.ossId);
+                this.formData.attachmentIds = attachmentOssIds.join(',');
+
+                // 处理学生评分数据
+                const studentScores = this.roomStudents.map((student) => ({
+                    studentId: student.studentId,
+                    studentName: student.studentName,
+                    studentNo: student.studentNo,
+                    className: student.className,
+                    majorName: student.majorName,
+                    collegeName: student.collegeName,
+                    bedId: student.bedId,
+                    bedCode: student.bedCode,
+                    bedName: student.bedName,
+                    studentScore: student.student_score || 0,
+                    attendanceStatus: student.attendance_status || '1',
+                    studentGrade: student.student_grade || 'A',
+                    isResponsiblePerson: student.isResponsiblePerson || 0,
+                    scoreRemarks: student.scoreRemarks || '',
+                    improvementNotes: student.improvementNotes || '',
+                }));
+
+                // 处理违纪记录数据
+                const violationData = [];
+                this.violationRecords.forEach((violations, studentId) => {
+                    violations.forEach((violation) => {
+                        violationData.push({
+                            ...violation,
+                            studentId,
+                            violationSource: '1', // 宿舍卫生检查来源
+                        });
+                    });
+                });
+
+                // 构建完整提交数据
+                const submitData = {
+                    // 基础检查信息
+                    checkTitle: this.checkInfo.checkTitle,
+                    checkDate: this.checkInfo.checkDate,
+                    checkerId: this.checkInfo.checkerId,
+                    checkerName: this.checkInfo.checkerName,
+                    checkType: this.checkInfo.checkType,
+                    checkLevel: this.checkInfo.checkLevel,
+
+                    // 房间信息
+                    roomId: this.roomInfo.id,
+                    roomCode: this.roomInfo.roomCode || this.roomInfo.roomName,
+                    roomName: this.roomInfo.roomName,
+                    buildingId: this.checkInfo.buildingId,
+                    buildingName: this.checkInfo.buildingName,
+                    campusId: this.checkInfo.campusId,
+                    campusName: this.checkInfo.campusName,
+
+                    // 宿舍整体评分
+                    ...this.formData,
+
+                    // 学生评分数据
+                    studentScores,
+
+                    // 违纪记录数据
+                    violationData,
+                };
+
+                console.log('提交的数据:', submitData);
+
+                // 调用API
+                const response = await request({
+                    url: '/dormHygieneCheck/dormHygieneCheck/saveCompleteData',
+                    method: 'POST',
+                    data: submitData,
+                });
+
+                if (response.code === 200) {
+                    console.log('保存成功，返回数据:', response.data);
+
+                    const resultData = {
+                        ...submitData,
+                        id: (response.data && response.data.id) || response.data,
+                        checkId: (response.data && response.data.id) || response.data,
+                    };
+
+                    uni.showToast({ title: '保存检查结果成功', icon: 'success' });
+
+                    // 触发提交事件
+                    this.$emit('submit', resultData);
+                } else {
+                    console.error('保存失败:', response.msg);
+                    uni.showToast({ title: response.msg || '保存失败', icon: 'none' });
+                }
+            } catch (error) {
+                console.error('提交表单失败:', error);
+                uni.showToast({ title: '请检查表单填写是否完整', icon: 'none' });
+            } finally {
+                this.submitLoading = false;
+            }
+        },
+
+        // 取消
+        handleCancel() {
+            this.$emit('cancel');
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.single-room-check-container {
+    padding: 20rpx;
+}
+
+.section-card {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+    padding-bottom: 16rpx;
+    border-bottom: 2rpx solid #f0f0f0;
+}
+
+.section-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+/* 房间标签样式 */
+.room-tag {
+    display: inline-flex;
+    align-items: center;
+    padding: 4rpx 12rpx;
+    background-color: #ecf5ff;
+    border: 1px solid #d9ecff;
+    border-radius: 8rpx;
+}
+
+.room-tag-text {
+    font-size: 24rpx;
+    color: #409eff;
+    line-height: 1.5;
+}
+
+.discipline-type-remark {
+    display: flex;
+    align-items: flex-start;
+    margin-top: 10rpx;
+    margin-bottom: 20rpx;
+    padding: 16rpx;
+    background-color: #f8f9fa;
+    border-radius: 8rpx;
+}
+
+.remark-text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+    color: #606266;
+    line-height: 1.5;
+    flex: 1;
+}
+
+// 附件样式
+.upload-area {
+    padding: 20rpx 0;
+}
+
+.doc-upload-section {
+    margin-top: 20rpx;
+    padding: 20rpx 0;
+    border-top: 2rpx dashed #e0e0e0;
+}
+
+// 完善的上传进度条样式
+.upload-progress {
+    margin-top: 20rpx;
+    padding: 20rpx;
+    background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
+    border-radius: 12rpx;
+    border: 1px solid #e1e8ed;
+    box-shadow: 0 2px 8px rgba(41, 121, 255, 0.1);
+}
+
+.progress-text {
+    display: block;
+    text-align: center;
+    font-size: 26rpx !important;
+    color: #2979ff !important;
+    font-weight: 500;
+    margin-top: 12rpx;
+    animation: pulse 2s infinite;
+}
+
+@keyframes pulse {
+    0%,
+    100% {
+        opacity: 0.8;
+    }
+    50% {
+        opacity: 1;
+    }
+}
+
+// 图片展示区域样式
+.image-section {
+    margin-bottom: 30rpx;
+}
+
+.image-title {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 20rpx;
+    padding-left: 10rpx;
+    border-left: 4rpx solid #2979ff;
+}
+
+.image-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(280rpx, 1fr));
+    gap: 20rpx;
+}
+
+.image-item {
+    position: relative;
+    background: #fff;
+    border-radius: 12rpx;
+    overflow: hidden;
+    border: 2rpx solid #f0f0f0;
+    transition: all 0.3s ease;
+    cursor: pointer;
+}
+
+.image-item:active {
+    transform: scale(0.98);
+    border-color: #2979ff;
+}
+
+.image-container {
+    position: relative;
+    width: 100%;
+    height: 200rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.attachment-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    background-color: #f5f5f5;
+}
+
+.upload-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+}
+
+.upload-text {
+    font-size: 24rpx;
+    margin-top: 8rpx;
+    font-weight: 500;
+}
+
+.error-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(250, 53, 52, 0.8);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+}
+
+.error-text {
+    font-size: 24rpx;
+    margin-top: 8rpx;
+    font-weight: 500;
+}
+
+.success-badge {
+    position: absolute;
+    top: 8rpx;
+    right: 8rpx;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 50%;
+    padding: 4rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.image-actions {
+    display: flex;
+    gap: 6rpx;
+    padding: 8rpx 12rpx;
+    background: #fafafa;
+    border-top: 1rpx solid #f0f0f0;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    position: relative;
+    z-index: 10;
+    pointer-events: auto;
+}
+
+.image-actions .u-button {
+    flex: 1;
+    min-width: 60rpx;
+    font-size: 24rpx !important;
+    pointer-events: auto;
+    position: relative;
+    z-index: 11;
+}
+
+.image-name {
+    padding: 8rpx 12rpx;
+    background: #fff;
+    font-size: 22rpx;
+    color: #666;
+    text-align: center;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.upload-tips {
+    margin-top: 20rpx;
+    padding: 15rpx;
+    background: #f8f9fa;
+    border-radius: 8rpx;
+    border-left: 4rpx solid #17a2b8;
+}
+
+.tip-item {
+    display: block;
+    font-size: 24rpx;
+    color: #666;
+    line-height: 1.5;
+    margin-bottom: 8rpx;
+}
+
+.wechat-tip {
+    color: #2979ff;
+    font-weight: 500;
+    line-height: 1.5;
+}
+
+.students-list {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+}
+
+.student-card {
+    background-color: #f8f9fa;
+    border-radius: 12rpx;
+    padding: 24rpx;
+    border: 1rpx solid #e9ecef;
+}
+
+.student-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin-bottom: 16rpx;
+    padding-bottom: 16rpx;
+    border-bottom: 1rpx solid #e9ecef;
+}
+
+.student-basic-info {
+    flex: 1;
+}
+
+.student-name-row {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    margin-bottom: 8rpx;
+    flex-wrap: wrap;
+}
+
+.student-name {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.gender-tag {
+    margin-left: 4rpx;
+}
+
+.student-no {
+    font-size: 24rpx;
+    color: #606266;
+}
+
+.student-details {
+    margin-bottom: 16rpx;
+    font-size: 24rpx;
+    color: #666;
+    line-height: 1.6;
+}
+
+.student-score-section {
+    margin-bottom: 16rpx;
+}
+
+.score-row {
+    display: flex;
+    gap: 16rpx;
+}
+
+.score-col {
+    flex: 1;
+    min-width: 0;
+}
+
+.score-label {
+    display: block;
+    font-size: 22rpx;
+    color: #666;
+    margin-bottom: 8rpx;
+}
+
+.leave-section {
+    border-top: 1rpx solid #e9ecef;
+    padding-top: 16rpx;
+    margin-bottom: 16rpx;
+}
+
+.leave-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12rpx;
+}
+
+.leave-title {
+    font-size: 26rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.leave-info {
+    background: #fff;
+    padding: 12rpx;
+    border-radius: 8rpx;
+    border: 1rpx solid #e9ecef;
+}
+
+.leave-item {
+    display: flex;
+    margin-bottom: 8rpx;
+    font-size: 22rpx;
+}
+
+.leave-item:last-child {
+    margin-bottom: 0;
+}
+
+.leave-label {
+    color: #666;
+    min-width: 140rpx;
+    flex-shrink: 0;
+}
+
+.leave-value {
+    color: #303133;
+    flex: 1;
+}
+
+.violation-section {
+    border-top: 1rpx solid #e9ecef;
+    padding-top: 16rpx;
+}
+
+.violation-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12rpx;
+}
+
+.violation-title {
+    font-size: 26rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.violations-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+}
+
+.violation-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12rpx;
+    background: #fdf6ec;
+    border: 1rpx solid #faecd8;
+    border-radius: 8rpx;
+}
+
+.violation-info {
+    flex: 1;
+}
+
+.violation-type {
+    font-size: 24rpx;
+    color: #e6a23c;
+    font-weight: 500;
+}
+
+.violation-score {
+    font-size: 22rpx;
+    color: #f56c6c;
+    margin-left: 12rpx;
+}
+
+.violation-actions {
+    display: flex;
+    gap: 8rpx;
+}
+
+.no-violations {
+    text-align: center;
+    padding: 24rpx;
+}
+
+.no-violations-text {
+    font-size: 24rpx;
+    color: #909399;
+}
+
+.empty-students {
+    padding: 80rpx 0;
+}
+
+.loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 80rpx 0;
+}
+
+.loading-text {
+    margin-top: 20rpx;
+    font-size: 24rpx;
+    color: #909399;
+}
+
+.bottom-actions {
+    display: flex;
+    gap: 20rpx;
+    padding: 20rpx 30rpx;
+    padding-bottom: 40rpx;
+}
+</style>
diff --git a/mobile/src/pages/xgss/wsjc/components/ViolationRecordDialog.vue b/mobile/src/pages/xgss/wsjc/components/ViolationRecordDialog.vue
new file mode 100644
index 00000000..2a7ac3c6
--- /dev/null
+++ b/mobile/src/pages/xgss/wsjc/components/ViolationRecordDialog.vue
@@ -0,0 +1,1901 @@
+<template>
+    <u-popup
+        :show="visible"
+        mode="bottom"
+        :round="20"
+        closeable
+        :safe-area-inset-bottom="true"
+        @close="handleClose"
+    >
+        <view class="violation-dialog-container">
+            <view class="dialog-header">
+                <text class="dialog-title">违纪记录录入</text>
+            </view>
+
+            <scroll-view scroll-y class="dialog-scroll" :style="{ height: scrollHeight + 'px' }">
+                <view class="dialog-content">
+                    <u-form ref="formRef" :model="formData" :rules="rules" label-width="120">
+                        <!-- 学生信息显示 -->
+                        <view class="student-info-section">
+                            <view class="info-row">
+                                <text class="info-label">学生信息：</text>
+                                <view class="info-content">
+                                    <text class="student-name">
+                                        {{ studentInfo && studentInfo.studentName }}
+                                    </text>
+                                    <text class="student-detail">
+                                        （{{ studentInfo && studentInfo.studentNo }}）
+                                    </text>
+                                    <text class="student-detail">
+                                        {{ studentInfo && studentInfo.className }}
+                                    </text>
+                                    <text class="student-detail">
+                                        {{ studentInfo && studentInfo.bedName }}
+                                    </text>
+                                </view>
+                            </view>
+                        </view>
+
+                        <!-- 违纪类型选择 -->
+                        <u-form-item label="违纪类型" prop="disciplineTypeId" required>
+                            <view @click="handleDisciplineTypeClick" style="width: 100%">
+                                <u-input
+                                    :value="disciplineTypeDisplay"
+                                    placeholder="请选择违纪类型"
+                                    readonly
+                                    suffix-icon="arrow-down"
+                                    suffix-icon-style="color: #c8c9cc;"
+                                    @click.stop="handleDisciplineTypeClick"
+                                />
+                            </view>
+                        </u-form-item>
+
+                        <!-- 违纪类型选择器 -->
+                        <u-picker
+                            :show="showDisciplineTypePicker"
+                            :columns="disciplineTypeColumns"
+                            keyName="text"
+                            @confirm="handleDisciplineTypeConfirm"
+                            @cancel="showDisciplineTypePicker = false"
+                            @close="showDisciplineTypePicker = false"
+                        ></u-picker>
+
+                        <!-- 违纪类型说明 -->
+                        <view
+                            v-if="formData.disciplineTypeId && selectedDisciplineTypeRemark"
+                            class="discipline-type-remark"
+                        >
+                            <u-icon name="info-circle" color="#909399" size="14"></u-icon>
+                            <text class="remark-text">
+                                类型说明：{{ selectedDisciplineTypeRemark }}
+                            </text>
+                        </view>
+
+                        <!-- 违纪日期 -->
+                        <u-form-item label="违纪日期" prop="disciplineDate" required>
+                            <view @click="showDatePicker = true" style="width: 100%">
+                                <u-input
+                                    :value="disciplineDateDisplay"
+                                    placeholder="选择违纪日期"
+                                    readonly
+                                    border="none"
+                                    suffix-icon="arrow-down"
+                                    suffix-icon-style="color: #c8c9cc;"
+                                    style="pointer-events: none"
+                                />
+                            </view>
+                            <u-datetime-picker
+                                :show="showDatePicker"
+                                v-model="disciplineDateValue"
+                                mode="date"
+                                @confirm="handleDateConfirm"
+                                @cancel="showDatePicker = false"
+                            ></u-datetime-picker>
+                        </u-form-item>
+
+                        <!-- 扣分分值 -->
+                        <u-form-item label="扣分分值" prop="scoreDeduction" required>
+                            <u-input
+                                v-model.number="formData.scoreDeduction"
+                                type="digit"
+                                placeholder="请输入扣分"
+                                @input="handleScoreChange"
+                            />
+                        </u-form-item>
+
+                        <!-- 违纪原因 -->
+                        <u-form-item label="违纪原因" prop="disciplineReason" required>
+                            <u-textarea
+                                v-model="formData.disciplineReason"
+                                placeholder="请输入违纪原因"
+                                :maxlength="500"
+                                count
+                                :height="120"
+                            />
+                        </u-form-item>
+
+                        <!-- 处理要求 -->
+                        <u-form-item label="处理要求" prop="disciplineContent">
+                            <u-textarea
+                                v-model="formData.disciplineContent"
+                                placeholder="请输入处理要求或整改措施"
+                                :maxlength="500"
+                                count
+                                :height="100"
+                            />
+                        </u-form-item>
+
+                        <!-- 附件上传 -->
+                        <u-form-item label="相关附件">
+                            <view class="upload-area">
+                                <!-- 图片展示区域 -->
+                                <view v-if="imageFiles.length > 0" class="image-section">
+                                    <view class="image-title">图片附件</view>
+                                    <view class="image-grid">
+                                        <view
+                                            v-for="(image, index) in imageFiles"
+                                            :key="image.uid || index"
+                                            class="image-item"
+                                            @click="handleImageClick(image, index, $event)"
+                                        >
+                                            <!-- 图片容器 -->
+                                            <view class="image-container">
+                                                <image
+                                                    :src="image.blobUrl || image.url"
+                                                    class="attachment-image"
+                                                    mode="aspectFill"
+                                                    @error="handleImageError"
+                                                ></image>
+
+                                                <!-- 上传状态遮罩 -->
+                                                <view
+                                                    v-if="image.status === 'uploading'"
+                                                    class="upload-overlay"
+                                                >
+                                                    <u-loading-icon
+                                                        mode="circle"
+                                                        size="24"
+                                                        color="#fff"
+                                                    ></u-loading-icon>
+                                                    <text class="upload-text">
+                                                        {{ image.progress || 0 }}%
+                                                    </text>
+                                                </view>
+
+                                                <!-- 错误状态遮罩 -->
+                                                <view
+                                                    v-if="image.status === 'error'"
+                                                    class="error-overlay"
+                                                >
+                                                    <u-icon
+                                                        name="close-circle"
+                                                        size="24"
+                                                        color="#fff"
+                                                    ></u-icon>
+                                                    <text class="error-text">上传失败</text>
+                                                </view>
+
+                                                <!-- 成功状态角标 -->
+                                                <view
+                                                    v-if="image.status === 'success'"
+                                                    class="success-badge"
+                                                >
+                                                    <u-icon
+                                                        name="checkmark-circle-fill"
+                                                        size="18"
+                                                        color="#52c41a"
+                                                    ></u-icon>
+                                                </view>
+                                            </view>
+
+                                            <!-- 图片操作按钮 -->
+                                            <view class="image-actions" @click.stop>
+                                                <u-button
+                                                    v-if="image.status === 'success'"
+                                                    size="mini"
+                                                    type="primary"
+                                                    shape="round"
+                                                    plain
+                                                    @tap="handleImageDownload(image)"
+                                                    @click.stop.prevent="
+                                                        handleImageDownloadClick(image, $event)
+                                                    "
+                                                >
+                                                    下载
+                                                </u-button>
+                                                <u-button
+                                                    v-if="image.status === 'error'"
+                                                    size="mini"
+                                                    type="warning"
+                                                    shape="round"
+                                                    plain
+                                                    @click.stop.prevent="
+                                                        retryUploadFile(image, $event)
+                                                    "
+                                                >
+                                                    重试
+                                                </u-button>
+                                                <u-button
+                                                    size="mini"
+                                                    type="error"
+                                                    shape="round"
+                                                    plain
+                                                    @tap="handleImageDelete(image, index)"
+                                                    @click.stop.prevent="
+                                                        handleImageDeleteClick(image, index, $event)
+                                                    "
+                                                >
+                                                    删除
+                                                </u-button>
+                                            </view>
+
+                                            <!-- 文件名显示 -->
+                                            <view class="image-name">
+                                                <text>{{ getShortFileName(image.name) }}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+
+                                <!-- 微信图片上传进度条 -->
+                                <view
+                                    v-if="uploadProgress > 0 && uploadProgress < 100"
+                                    class="upload-progress"
+                                >
+                                    <u-line-progress
+                                        :percent="uploadProgress"
+                                        :show-percent="true"
+                                        active-color="#2979ff"
+                                        inactive-color="#f0f0f0"
+                                        height="8"
+                                        :striped="true"
+                                        :striped-active="true"
+                                    ></u-line-progress>
+                                    <text class="progress-text">
+                                        微信图片上传进度: {{ uploadProgress }}%
+                                    </text>
+                                </view>
+
+                                <!-- 统一附件上传按钮 -->
+                                <view class="doc-upload-section">
+                                    <u-button
+                                        type="info"
+                                        shape="round"
+                                        icon="plus"
+                                        plain
+                                        @click="handleDocUpload"
+                                        style="width: 100%"
+                                    >
+                                        添加证明材料（图片）
+                                    </u-button>
+                                </view>
+
+                                <!-- 上传提示信息 -->
+                                <view class="upload-tips">
+                                    <text class="tip-item">
+                                        • 支持格式：JPG、PNG等 • 单个文件不超过10MB •
+                                        最多上传5个文件
+                                    </text>
+                                    <text class="tip-item">
+                                        • 图片文件将以图片形式展示，支持预览和下载
+                                    </text>
+                                    <text v-if="isWechatBrowser" class="tip-item wechat-tip">
+                                        • 在微信中使用可获得更好的图片选择体验
+                                    </text>
+                                </view>
+                            </view>
+                        </u-form-item>
+                    </u-form>
+                </view>
+            </scroll-view>
+
+            <view class="dialog-footer">
+                <u-button type="info" @click="handleClose" style="flex: 1; margin-right: 20rpx">
+                    取消
+                </u-button>
+                <u-button
+                    type="primary"
+                    @click="handleConfirm"
+                    :loading="confirmLoading"
+                    style="flex: 1"
+                >
+                    确定
+                </u-button>
+            </view>
+        </view>
+
+        <!-- 附件上传操作选择框（使用 u-action-sheet 以解决层级问题） -->
+        <u-action-sheet
+            :show="showUploadActionSheet"
+            :actions="uploadActions"
+            title="选择上传方式"
+            @select="handleUploadActionSelect"
+            @close="showUploadActionSheet = false"
+        ></u-action-sheet>
+    </u-popup>
+</template>
+
+<script>
+import { request, smartUploadFile, downloadFile } from '@/common/request.js';
+import dayjs from 'dayjs';
+import weChatSDK from '@/utils/wechat.js';
+
+export default {
+    name: 'ViolationRecordDialog',
+    props: {
+        visible: {
+            type: Boolean,
+            default: false,
+        },
+        studentInfo: {
+            type: Object,
+            default: null,
+        },
+        violationData: {
+            type: Object,
+            default: null,
+        },
+    },
+    data() {
+        return {
+            confirmLoading: false,
+            scrollHeight: 500,
+
+            // 表单数据
+            formData: {
+                studentId: '',
+                studentNo: '',
+                studentName: '',
+                collegeId: '',
+                collegeName: '',
+                majorId: '',
+                majorName: '',
+                classId: '',
+                className: '',
+                disciplineTypeId: '',
+                disciplineTypeName: '',
+                disciplineDate: '',
+                disciplineReason: '',
+                disciplineContent: '',
+                scoreDeduction: 0,
+                attachmentOssIds: '',
+                violationSource: '1',
+            },
+
+            // 验证规则
+            rules: {
+                disciplineTypeId: [
+                    { required: true, message: '请选择违纪类型', trigger: 'change' },
+                ],
+                disciplineDate: [{ required: true, message: '请选择违纪日期', trigger: 'change' }],
+                scoreDeduction: [{ required: true, message: '请输入扣分分值', trigger: 'blur' }],
+                disciplineReason: [{ required: true, message: '请输入违纪原因', trigger: 'blur' }],
+            },
+
+            // Picker显示状态
+            showDisciplineTypePicker: false,
+            showDatePicker: false,
+
+            // 违纪日期
+            disciplineDateValue: Number(new Date()),
+            disciplineDateDisplay: dayjs().format('YYYY-MM-DD'),
+
+            // 所有违纪类型列表
+            allViolationTypes: [],
+
+            // 当前选择的违纪类型扣分范围
+            currentTypeMinScore: 0,
+            currentTypeMaxScore: 100,
+
+            // 微信SDK相关
+            wechatSDK: weChatSDK,
+            isWechatBrowser: false,
+            wechatInitializing: false,
+            uploadProgress: 0, // 微信图片上传进度
+
+            // 附件数据
+            attachmentList: [],
+
+            // 附件上传操作选择框
+            showUploadActionSheet: false,
+            uploadActions: [{ name: '选择图片' }],
+        };
+    },
+    computed: {
+        // 违纪类型列（带区域标签）
+        disciplineTypeColumns() {
+            return [
+                this.allViolationTypes.map((item) => ({
+                    text: this.getViolationTypeLabel(item),
+                    value: item.id,
+                    areaType: item.areaType,
+                    minScore: item.minScore,
+                    maxScore: item.maxScore,
+                })),
+            ];
+        },
+
+        // 违纪类型显示文本
+        disciplineTypeDisplay() {
+            if (!this.formData.disciplineTypeId) return '';
+            const item = this.allViolationTypes.find(
+                (d) => d.id === this.formData.disciplineTypeId,
+            );
+            return item ? this.getViolationTypeLabel(item) : '';
+        },
+
+        // 违纪类型说明
+        selectedDisciplineTypeRemark() {
+            if (!this.formData.disciplineTypeId) return '';
+            const item = this.allViolationTypes.find(
+                (d) => d.id === this.formData.disciplineTypeId,
+            );
+            return item ? item.remark : '';
+        },
+
+        // 图片文件
+        imageFiles() {
+            return this.attachmentList.filter((file) => this.isImageFile(file));
+        },
+    },
+    watch: {
+        visible(val) {
+            console.log('👁️ visible 监听器触发，val =', val);
+            if (val) {
+                this.initDialog();
+            }
+        },
+    },
+    async mounted() {
+        console.log('🔧 ViolationRecordDialog 组件已挂载');
+
+        // 初始化微信环境检查
+        await this.checkWechatEnvironment();
+
+        // 如果组件挂载时 visible 已经是 true，需要主动初始化
+        if (this.visible) {
+            console.log('⚠️ 组件挂载时 visible 已为 true，主动调用 initDialog');
+            this.initDialog();
+        }
+    },
+    methods: {
+        // === 微信SDK相关方法 ===
+
+        // 检查微信环境并自动初始化SDK
+        async checkWechatEnvironment() {
+            try {
+                // 检查是否在微信浏览器中
+                this.isWechatBrowser = this.wechatSDK.isWeChatBrowser();
+
+                if (this.isWechatBrowser) {
+                    console.log('✅ 检测到微信环境，开始初始化SDK');
+                    // 在微信环境中，自动初始化SDK
+                    await this.initWechatSDK();
+                } else {
+                    console.log('⚠️ 非微信环境，将使用普通上传方式');
+                }
+            } catch (error) {
+                console.error('微信环境检查失败:', error);
+            }
+        },
+
+        // 初始化微信SDK
+        async initWechatSDK() {
+            if (this.wechatInitializing) {
+                console.log('⚠️ 微信SDK正在初始化中，跳过重复初始化');
+                return;
+            }
+
+            this.wechatInitializing = true;
+
+            try {
+                // 使用微信SDK工具类进行初始化
+                await this.wechatSDK.init({
+                    debug: process.env.NODE_ENV === 'development',
+                    jsApiList: ['chooseImage', 'previewImage', 'uploadImage'],
+                });
+
+                console.log('✅ 微信SDK初始化成功');
+            } catch (error) {
+                console.error('❌ 微信SDK初始化失败:', error);
+            } finally {
+                this.wechatInitializing = false;
+            }
+        },
+
+        // 上传微信图片到OSS
+        async uploadWechatImageToOSS(localId) {
+            try {
+                this.uploadProgress = 10;
+
+                // 步骤1：上传到微信服务器（20%进度）
+                const wxUploadRes = await new Promise((resolve, reject) => {
+                    wx.uploadImage({
+                        localId: localId,
+                        isShowProgressTips: 1,
+                        success: (res) => resolve(res),
+                        fail: (err) => reject(err),
+                    });
+                });
+
+                if (!wxUploadRes.serverId) {
+                    throw new Error('微信服务器上传失败，未获取到serverId');
+                }
+
+                const mediaId = wxUploadRes.serverId;
+                this.uploadProgress = 30;
+
+                // 步骤2：保存到OSS（80%进度）
+                this.uploadProgress = 50;
+
+                const ossResponse = await request({
+                    url: '/system/wechat/downloadToOss',
+                    method: 'GET',
+                    params: {
+                        mediaId: mediaId,
+                    },
+                    timeout: 30000, // 30秒超时
+                });
+
+                this.uploadProgress = 90;
+
+                if (ossResponse.code === 200 && ossResponse.data) {
+                    this.uploadProgress = 100;
+
+                    // 重置进度
+                    setTimeout(() => {
+                        this.uploadProgress = 0;
+                    }, 1000);
+
+                    return {
+                        ossId: ossResponse.data.ossId,
+                        url: ossResponse.data.url,
+                        fileName: ossResponse.data.fileName,
+                        fileSize: ossResponse.data.fileSize,
+                    };
+                } else {
+                    throw new Error(ossResponse.msg || 'OSS保存失败');
+                }
+            } catch (error) {
+                console.error('微信图片上传失败:', error);
+                this.uploadProgress = 0;
+                throw error;
+            }
+        },
+
+        // === 弹窗初始化方法 ===
+
+        // 初始化弹窗
+        async initDialog() {
+            console.log('📋 初始化违纪记录弹窗...');
+            console.log('当前 allViolationTypes 长度:', this.allViolationTypes.length);
+
+            // 获取窗口高度，设置滚动区域高度
+            const systemInfo = uni.getSystemInfoSync();
+            this.scrollHeight = systemInfo.windowHeight * 0.6;
+
+            // 预加载所有违纪类型数据（弹窗打开时就加载，避免点击时才加载）
+            console.log('🔄 即将调用 getAllViolationTypes...');
+            await this.getAllViolationTypes();
+            console.log(
+                '🔄 getAllViolationTypes 调用完成，当前数据量:',
+                this.allViolationTypes.length,
+            );
+
+            // 初始化表单
+            this.initForm();
+
+            console.log('✅ 违纪记录弹窗初始化完成，最终数据量:', this.allViolationTypes.length);
+        },
+
+        // 获取所有违纪类型
+        async getAllViolationTypes() {
+            console.log('=== 开始获取违纪类型数据 ===');
+            try {
+                const res = await request({
+                    url: '/disciplineType/disciplineType/list',
+                    method: 'GET',
+                    params: {
+                        status: '0', // 启用状态
+                    },
+                });
+
+                console.log('违纪类型API响应:', res);
+
+                if (res.code === 200) {
+                    // 使用 res.rows 而不是 res.data
+                    const violationTypes = res.rows || [];
+                    console.log('获取到的原始违纪类型数据:', violationTypes);
+
+                    if (violationTypes.length === 0) {
+                        console.warn('⚠️ 违纪类型数据为空');
+                        uni.showToast({
+                            title: '暂无可用的违纪类型',
+                            icon: 'none',
+                            duration: 2000,
+                        });
+                    }
+
+                    // 按区域类型排序：1-宿舍区违纪优先，2-教学区违纪其次
+                    const sortedViolationTypes = violationTypes.sort((a, b) => {
+                        const aAreaType = a.areaType || '2';
+                        const bAreaType = b.areaType || '2';
+
+                        if (aAreaType !== bAreaType) {
+                            return aAreaType.localeCompare(bAreaType); // "1"在"2"前面
+                        }
+
+                        // 相同区域类型内部按排序号排序
+                        const aSortOrder = a.sortOrder || 999;
+                        const bSortOrder = b.sortOrder || 999;
+                        return aSortOrder - bSortOrder;
+                    });
+
+                    this.allViolationTypes = sortedViolationTypes;
+                    console.log('✅ 违纪类型数据加载成功，数量：', this.allViolationTypes.length);
+                    console.log('排序后的违纪类型:', this.allViolationTypes);
+                } else {
+                    console.error('❌ 获取违纪类型失败 - 错误码:', res.code, '错误信息:', res.msg);
+                    this.allViolationTypes = [];
+                    uni.showToast({
+                        title: res.msg || '获取违纪类型失败',
+                        icon: 'none',
+                        duration: 2000,
+                    });
+                }
+            } catch (error) {
+                console.error('❌ 获取违纪类型异常:', error);
+                console.error('错误详情:', JSON.stringify(error));
+                this.allViolationTypes = [];
+                uni.showToast({
+                    title: '获取违纪类型失败，请检查网络连接',
+                    icon: 'none',
+                    duration: 2000,
+                });
+            }
+        },
+
+        // 初始化表单数据
+        initForm() {
+            // 先设置默认日期（确保无论什么情况都有默认日期）
+            this.disciplineDateValue = Number(new Date());
+            this.disciplineDateDisplay = dayjs().format('YYYY-MM-DD');
+            this.formData.disciplineDate = dayjs().format('YYYY-MM-DD');
+
+            if (this.studentInfo) {
+                Object.assign(this.formData, {
+                    studentId: this.studentInfo.studentId,
+                    studentNo: this.studentInfo.studentNo,
+                    studentName: this.studentInfo.studentName,
+                    collegeId: this.studentInfo.collegeId || '',
+                    collegeName: this.studentInfo.collegeName || '',
+                    majorId: this.studentInfo.majorId || '',
+                    majorName: this.studentInfo.majorName || '',
+                    classId: this.studentInfo.classId || '',
+                    className: this.studentInfo.className || '',
+                    disciplineDate: dayjs().format('YYYY-MM-DD'), // 默认今天
+                    violationSource: '1',
+                });
+            }
+
+            if (this.violationData) {
+                console.log('违纪记录：编辑模式，violationData:', this.violationData);
+
+                // 处理违纪数据回显
+                const violationDataCopy = { ...this.violationData };
+
+                // 确保scoreDeduction是数值类型
+                if (
+                    violationDataCopy.scoreDeduction !== null &&
+                    violationDataCopy.scoreDeduction !== undefined
+                ) {
+                    violationDataCopy.scoreDeduction =
+                        parseFloat(violationDataCopy.scoreDeduction) || 0;
+                }
+
+                // 格式化日期
+                if (violationDataCopy.disciplineDate) {
+                    const dateStr = violationDataCopy.disciplineDate.toString();
+                    if (dateStr.includes(' ')) {
+                        violationDataCopy.disciplineDate = dateStr.split(' ')[0];
+                    } else if (dateStr.includes('T')) {
+                        violationDataCopy.disciplineDate = dateStr.split('T')[0];
+                    }
+
+                    // 设置日期显示
+                    const date = new Date(violationDataCopy.disciplineDate);
+                    this.disciplineDateValue = date.getTime();
+                    this.disciplineDateDisplay = dayjs(date).format('YYYY-MM-DD');
+                }
+
+                Object.assign(this.formData, violationDataCopy);
+
+                // 如果有违纪类型ID，触发违纪类型变化事件以设置扣分范围
+                if (this.formData.disciplineTypeId) {
+                    this.$nextTick(() => {
+                        this.handleDisciplineTypeChange(this.formData.disciplineTypeId);
+                    });
+                }
+
+                // 如果是编辑模式，处理附件数据
+                if (this.violationData.attachmentOssIds) {
+                    console.log(
+                        '违纪记录：发现附件数据，准备回显:',
+                        this.violationData.attachmentOssIds,
+                    );
+                    this.handleAttachmentData(this.violationData.attachmentOssIds);
+                } else {
+                    console.log('违纪记录：编辑模式但无附件数据');
+                    this.attachmentList = [];
+                }
+            } else {
+                console.log('违纪记录：新增模式，重置附件列表');
+                // 重置附件列表
+                this.attachmentList = [];
+            }
+        },
+
+        // 处理附件数据
+        async handleAttachmentData(ossIds) {
+            try {
+                if (!ossIds || !ossIds.trim()) {
+                    console.log('违纪记录：没有附件数据，清空附件列表');
+                    this.attachmentList = [];
+                    return;
+                }
+
+                console.log('违纪记录：开始处理附件数据:', ossIds);
+
+                const ossIdsArray = ossIds
+                    .split(',')
+                    .map((id) => id.trim())
+                    .filter((id) => id);
+                if (ossIdsArray.length === 0) {
+                    this.attachmentList = [];
+                    return;
+                }
+
+                const response = await request({
+                    url: `/resource/oss/listByIds/${ossIdsArray.join(',')}`,
+                    method: 'GET',
+                });
+
+                if (response.code === 200 && response.data) {
+                    console.log('违纪记录：获取到的附件信息:', response.data);
+
+                    const attachmentFiles = response.data.map((item, index) => ({
+                        uid: `existing_${index}_${Date.now()}`,
+                        name: item.originalName || `附件${index + 1}`,
+                        url: item.url,
+                        ossId: item.ossId,
+                        status: 'success',
+                        type: this.getFileTypeByName(item.originalName),
+                    }));
+
+                    this.attachmentList = attachmentFiles;
+                    console.log('违纪记录：设置附件列表成功:', this.attachmentList);
+                } else {
+                    console.warn('违纪记录：获取附件信息失败:', response.msg);
+                    this.attachmentList = [];
+                }
+            } catch (error) {
+                console.error('违纪记录：处理附件数据失败:', error);
+                this.attachmentList = [];
+            }
+        },
+
+        // 获取违纪类型完整标签（用于显示）
+        getViolationTypeLabel(item) {
+            const areaText = this.getAreaTypeText(item.areaType);
+            return `[${areaText}] ${item.typeName}`;
+        },
+
+        // 获取区域类型文本
+        getAreaTypeText(areaType) {
+            switch (areaType) {
+                case '1':
+                    return '宿舍';
+                case '2':
+                    return '教学';
+                default:
+                    return '其他';
+            }
+        },
+
+        // 违纪类型点击处理
+        handleDisciplineTypeClick() {
+            console.log('=== 违纪类型点击 ===');
+            console.log('违纪类型数据量:', this.allViolationTypes.length);
+            console.log('违纪类型数据:', this.allViolationTypes);
+            console.log('列数据:', this.disciplineTypeColumns);
+
+            if (this.allViolationTypes.length === 0) {
+                // 数据已在弹窗打开时加载，如果还是空说明确实没有数据或加载失败
+                uni.showToast({
+                    title: '暂无可用的违纪类型',
+                    icon: 'none',
+                    duration: 2000,
+                });
+                return;
+            }
+
+            // 直接打开选择器
+            this.showDisciplineTypePicker = true;
+        },
+
+        // 违纪类型变化处理
+        handleDisciplineTypeChange(typeId) {
+            const selectedType = this.allViolationTypes.find((item) => item.id === typeId);
+            if (selectedType) {
+                // 处理扣分范围
+                let minScore = 0;
+                let maxScore = 100;
+
+                if (selectedType.minScore !== null && selectedType.minScore !== undefined) {
+                    minScore =
+                        typeof selectedType.minScore === 'number'
+                            ? selectedType.minScore
+                            : parseFloat(selectedType.minScore.toString()) || 0;
+                }
+
+                if (selectedType.maxScore !== null && selectedType.maxScore !== undefined) {
+                    maxScore =
+                        typeof selectedType.maxScore === 'number'
+                            ? selectedType.maxScore
+                            : parseFloat(selectedType.maxScore.toString()) || 100;
+                }
+
+                // 设置参考范围
+                this.currentTypeMinScore = minScore;
+                this.currentTypeMaxScore = maxScore;
+            } else {
+                // 重置为默认值
+                this.currentTypeMinScore = 0;
+                this.currentTypeMaxScore = 100;
+            }
+        },
+
+        // 违纪类型确认处理
+        handleDisciplineTypeConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                const selectedType = this.allViolationTypes.find(
+                    (item) => item.id === e.value[0].value,
+                );
+                if (selectedType) {
+                    this.formData.disciplineTypeId = selectedType.id;
+                    this.formData.disciplineTypeName = selectedType.typeName;
+
+                    // 自动填入最低扣分
+                    if (selectedType.minScore !== null && selectedType.minScore !== undefined) {
+                        this.formData.scoreDeduction = selectedType.minScore;
+                        uni.showToast({
+                            title: `已自动填入最低扣分：${selectedType.minScore}分`,
+                            icon: 'none',
+                        });
+                    }
+
+                    // 触发类型变化处理
+                    this.handleDisciplineTypeChange(selectedType.id);
+                }
+            }
+            this.showDisciplineTypePicker = false;
+        },
+
+        // 扣分变化处理
+        handleScoreChange() {
+            const score = parseFloat(this.formData.scoreDeduction);
+            if (!isNaN(score) && score < 0) {
+                uni.showToast({ title: '扣分分数不能小于0', icon: 'none' });
+                this.formData.scoreDeduction = 0;
+            }
+        },
+
+        // 日期确认处理
+        handleDateConfirm(e) {
+            this.disciplineDateValue = e.value;
+            const date = new Date(e.value);
+            this.disciplineDateDisplay = dayjs(date).format('YYYY-MM-DD');
+            this.formData.disciplineDate = this.disciplineDateDisplay;
+            this.showDatePicker = false;
+        },
+
+        // 统一附件上传方法
+        handleDocUpload() {
+            console.log('=== 统一附件上传方法 ===');
+
+            // 检查文件数量限制
+            if (this.attachmentList.length >= 5) {
+                uni.showToast({
+                    title: '最多只能上传5个文件',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 显示选择文件类型的操作菜单（使用 u-action-sheet 解决弹窗内层级问题）
+            this.showUploadActionSheet = true;
+        },
+
+        // 处理附件上传操作选择
+        handleUploadActionSelect(index) {
+            console.log('=== 处理附件上传操作选择 ===', index);
+            this.showUploadActionSheet = false;
+
+            // 优先使用微信方式，降级使用普通方式
+            if (this.isWechatBrowser && this.wechatSDK.isInitialized) {
+                console.log('✅ 使用微信方式选择图片');
+                this.chooseWechatImages();
+            } else {
+                console.log('⚠️ 使用普通方式选择图片');
+                this.chooseDocuments();
+            }
+        },
+
+        // 使用微信API选择图片
+        async chooseWechatImages() {
+            try {
+                console.log('🔄 调用微信chooseImage API...');
+
+                const count = Math.min(5, 5 - this.attachmentList.length);
+                const res = await this.wechatSDK.chooseImage({
+                    count: count,
+                    sizeType: ['original', 'compressed'],
+                    sourceType: ['album', 'camera'],
+                });
+
+                console.log('✅ 微信选择图片成功:', res);
+
+                if (!res.localIds || res.localIds.length === 0) {
+                    console.warn('⚠️ 未选择任何图片');
+                    return;
+                }
+
+                // 处理微信图片
+                this.handleWechatImages(res.localIds);
+            } catch (error) {
+                console.error('❌ 微信选择图片失败:', error);
+                uni.showToast({
+                    title: '选择图片失败，请重试',
+                    icon: 'none',
+                });
+
+                // 降级使用普通方式
+                console.log('⚠️ 降级使用普通方式选择图片');
+                this.chooseDocuments();
+            }
+        },
+
+        // 处理微信图片
+        async handleWechatImages(localIds) {
+            console.log('📋 处理微信图片:', localIds);
+
+            if (!localIds || localIds.length === 0) {
+                return;
+            }
+
+            // 创建临时文件对象
+            const newFiles = localIds.map((localId, index) => {
+                const fileName = `微信图片_${index + 1}.jpg`;
+                return {
+                    uid: `wechat_${Date.now()}_${index}`,
+                    name: fileName,
+                    localId: localId,
+                    source: 'wechat',
+                    status: 'uploading',
+                    progress: 0,
+                    type: 'image/jpeg',
+                    url: localId, // 微信本地ID作为临时URL
+                };
+            });
+
+            // 添加到附件列表
+            this.attachmentList.push(...newFiles);
+
+            // 逐个上传到OSS
+            for (const file of newFiles) {
+                try {
+                    console.log(`🚀 开始上传微信图片: ${file.name}`);
+
+                    const uploadResult = await this.uploadWechatImageToOSS(file.localId);
+
+                    // 更新文件信息（保持name不变，不用UUID覆盖）
+                    file.status = 'success';
+                    file.ossId = uploadResult.ossId;
+                    file.url = uploadResult.url;
+                    // 保持原始的file.name不变，用于下载时显示正确的文件名
+                    file.size = uploadResult.fileSize || 0;
+                    file.progress = 100;
+
+                    console.log(`✅ 微信图片上传成功: ${file.name}`);
+
+                    uni.showToast({
+                        title: '上传成功',
+                        icon: 'success',
+                        duration: 1500,
+                    });
+                } catch (error) {
+                    console.error(`❌ 微信图片上传失败: ${file.name}`, error);
+                    file.status = 'error';
+                    file.progress = 0;
+
+                    uni.showToast({
+                        title: `上传失败: ${file.name}`,
+                        icon: 'none',
+                        duration: 2000,
+                    });
+                }
+            }
+        },
+
+        // 选择文档文件（普通方式）
+        chooseDocuments() {
+            // 使用uni.chooseImage选择图片
+            uni.chooseImage({
+                count: Math.min(5, 5 - this.attachmentList.length),
+                sizeType: ['original', 'compressed'],
+                sourceType: ['album', 'camera'],
+                success: (imageRes) => {
+                    console.log('选择图片成功 - 完整响应:', imageRes);
+                    const files = imageRes.tempFilePaths.map((path, index) => {
+                        const fileName =
+                            path.split('/').pop() || `image_${Date.now()}_${index}.jpg`;
+                        const tempFile = imageRes.tempFiles && imageRes.tempFiles[index];
+                        return {
+                            name: fileName,
+                            path: path,
+                            url: path,
+                            tempFilePath: path,
+                            size: (tempFile && tempFile.size) || 0,
+                            type: (tempFile && tempFile.type) || 'image/jpeg',
+                        };
+                    });
+
+                    // 检查文件大小
+                    const validFiles = files.filter((file) => {
+                        return this.checkFileSize(file);
+                    });
+
+                    if (validFiles.length > 0) {
+                        this.handleFileUpload({ tempFiles: validFiles });
+                    } else {
+                        console.log('所有文件都超过大小限制，取消上传');
+                    }
+                },
+                fail: (err) => {
+                    console.error('选择图片失败:', err);
+                    uni.showToast({
+                        title: '选择图片失败',
+                        icon: 'none',
+                    });
+                },
+            });
+        },
+
+        // 文件上传
+        handleFileUpload(event) {
+            console.log('文件上传事件触发:', event);
+
+            uni.showToast({
+                title: '文件选择成功，开始上传...',
+                icon: 'loading',
+                duration: 2000,
+            });
+
+            // 兼容不同的事件格式
+            let files = [];
+
+            if (event.tempFiles) {
+                files = event.tempFiles;
+                console.log('✅ tempFiles格式解析结果:', files);
+            } else if (event.tempFilePaths) {
+                files = event.tempFilePaths.map((path, index) => ({
+                    url: path,
+                    path: path,
+                    tempFilePath: path,
+                    name: `文件${index + 1}`,
+                    type: '',
+                }));
+                console.log('✅ tempFilePaths格式解析结果:', files);
+            }
+
+            console.log('📋 最终解析得到的文件列表:', files);
+
+            if (files.length === 0) {
+                console.error('❌ 没有获取到文件数据');
+                uni.showToast({
+                    title: '未获取到文件，请重试',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 检查文件数量限制
+            if (this.attachmentList.length + files.length > 5) {
+                console.warn('⚠️ 文件数量超过限制');
+                uni.showToast({
+                    title: '最多只能上传5个文件',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 检查文件大小限制
+            const validFiles = files.filter((file) => {
+                const isValid = this.checkFileSize(file);
+                console.log(
+                    `文件大小检查 - ${file.name || '未知文件'}:`,
+                    isValid ? '✅ 通过' : '❌ 超限',
+                );
+                return isValid;
+            });
+
+            if (validFiles.length === 0) {
+                console.log('❌ 所有文件都超过大小限制，取消上传');
+                return;
+            }
+
+            // 处理有效文件
+            const newFiles = validFiles.map((file, index) => {
+                const filePath = file.url || file.tempFilePath || file.path;
+                const fileName =
+                    file.name ||
+                    (filePath && filePath.split('/').pop()) ||
+                    `违纪附件${Date.now()}_${index}.jpg`;
+
+                return {
+                    ...file,
+                    uid: `upload_${Date.now()}_${index}`,
+                    name: fileName,
+                    url: filePath,
+                    path: filePath,
+                    tempFilePath: filePath,
+                    status: 'uploading',
+                    ossId: null,
+                    type: file.type || this.getFileTypeByName(fileName),
+                };
+            });
+
+            console.log('📊 处理后的新文件数量:', newFiles.length);
+
+            // 添加到附件列表
+            this.attachmentList.push(...newFiles);
+
+            // 显示上传提示
+            uni.showToast({
+                title: `开始上传 ${newFiles.length} 个文件`,
+                icon: 'loading',
+                duration: 1500,
+            });
+
+            // 逐个上传文件到服务器
+            console.log('🚀 开始逐个上传文件到服务器...');
+            newFiles.forEach((file, index) => {
+                console.log(`🚀 准备上传第 ${index + 1} 个文件: ${file.name}`);
+
+                this.uploadFileToServer(file)
+                    .then(() => {
+                        console.log(`✅ 文件 ${file.name} 上传完成`);
+                    })
+                    .catch((error) => {
+                        console.error(`❌ 文件 ${file.name} 上传失败:`, error);
+                    });
+            });
+        },
+
+        // 检查文件大小是否超过限制
+        checkFileSize(file) {
+            const maxSize = 10 * 1024 * 1024; // 10MB
+            const fileSize = file.size || 0;
+
+            if (fileSize > maxSize) {
+                const fileSizeMB = (fileSize / (1024 * 1024)).toFixed(2);
+                uni.showToast({
+                    title: `文件大小 ${fileSizeMB}MB，超过10MB限制`,
+                    icon: 'none',
+                    duration: 3000,
+                });
+                return false;
+            }
+            return true;
+        },
+
+        // 上传文件到服务器
+        async uploadFileToServer(file) {
+            try {
+                file.status = 'uploading';
+
+                const response = await smartUploadFile('/resource/oss/upload', file, {
+                    bizType: 'dorm_violation_attachment',
+                });
+
+                if (response && response.code === 200) {
+                    file.url = response.data.url;
+                    file.ossId = response.data.ossId;
+                    file.status = 'success';
+                    // 保持原始的file.name不变，不用后端返回的fileName（UUID）覆盖
+                    uni.showToast({ title: '上传成功', icon: 'success', duration: 1500 });
+                } else {
+                    file.status = 'error';
+                    uni.showToast({
+                        title: (response && response.msg) || '上传失败',
+                        icon: 'none',
+                        duration: 2000,
+                    });
+                }
+            } catch (error) {
+                console.error('上传文件失败:', error);
+                file.status = 'error';
+                uni.showToast({ title: '上传失败', icon: 'none', duration: 2000 });
+            }
+        },
+
+        // 重试上传
+        async retryUploadFile(file, event) {
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
+
+            file.status = 'uploading';
+            file.progress = 0;
+
+            try {
+                // 根据文件来源选择不同的上传方式
+                if (file.source === 'wechat' && file.localId) {
+                    // 微信图片重新上传
+                    const uploadResult = await this.uploadWechatImageToOSS(file.localId);
+
+                    // 更新文件信息（保持name不变，不用UUID覆盖）
+                    file.status = 'success';
+                    file.ossId = uploadResult.ossId;
+                    file.url = uploadResult.url;
+                    // 保持原始的file.name不变，用于下载时显示正确的文件名
+                    file.size = uploadResult.fileSize || 0;
+                    file.progress = 100;
+                } else {
+                    // 普通文件重新上传
+                    await this.uploadFileToServer(file);
+                }
+
+                uni.showToast({
+                    title: '重新上传成功',
+                    icon: 'success',
+                    duration: 1500,
+                });
+            } catch (error) {
+                console.error('重试上传失败:', error);
+                file.status = 'error';
+                file.progress = 0;
+
+                uni.showToast({
+                    title: '重试失败，请稍后再试',
+                    icon: 'none',
+                    duration: 2000,
+                });
+            }
+        },
+
+        // 图片点击处理
+        handleImageClick(image, index, event) {
+            const target = event.target;
+            const isActionButton =
+                target.closest('.image-actions') ||
+                target.closest('u-button') ||
+                target.tagName === 'BUTTON';
+
+            if (!isActionButton && image.status === 'success') {
+                this.handleImagePreview(image, index);
+            }
+        },
+
+        // 图片预览
+        handleImagePreview(image, index) {
+            if (image.status !== 'success') {
+                uni.showToast({
+                    title: '图片尚未上传完成',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            const imageUrls = this.imageFiles
+                .filter((file) => file.status === 'success')
+                .map((file) => file.blobUrl || file.url);
+
+            if (imageUrls.length === 0) {
+                uni.showToast({
+                    title: '暂无可预览的图片',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            const currentUrl = image.blobUrl || image.url;
+            const currentIndex = imageUrls.findIndex((url) => url === currentUrl);
+
+            // 优先使用微信预览，否则使用uni预览
+            if (this.isWechatBrowser && this.wechatSDK.isInitialized) {
+                this.wechatSDK
+                    .previewImage({
+                        current: currentUrl,
+                        urls: imageUrls,
+                    })
+                    .catch((error) => {
+                        console.error('微信预览失败，使用普通预览:', error);
+                        uni.previewImage({
+                            urls: imageUrls,
+                            current: currentIndex >= 0 ? currentIndex : 0,
+                        });
+                    });
+            } else {
+                uni.previewImage({
+                    urls: imageUrls,
+                    current: currentIndex >= 0 ? currentIndex : 0,
+                });
+            }
+        },
+
+        // 图片下载（带重试机制）
+        async handleImageDownload(image, event, retryCount = 0) {
+            // 事件阻止已由handleImageDownloadClick方法处理
+
+            if (image.status !== 'success') {
+                uni.showToast({
+                    title: '图片尚未上传完成',
+                    icon: 'none',
+                });
+                return;
+            }
+
+            // 显示下载进度提示
+            uni.showLoading({
+                title: '正在下载图片...',
+                mask: true,
+            });
+
+            try {
+                // 如果有ossId，通过API下载
+                if (image.ossId) {
+                    const downloadUrl = `/resource/oss/download/${image.ossId}`;
+
+                    // 调用下载接口并等待完成（直接使用image.name）
+                    const response = await downloadFile(downloadUrl, image.name);
+
+                    if (response.statusCode === 200) {
+                        uni.hideLoading();
+                        uni.saveFile({
+                            tempFilePath: response.tempFilePath,
+                            success: function (res) {
+                                uni.showToast({
+                                    title: '下载成功',
+                                    icon: 'success',
+                                });
+                            },
+                            fail: function () {
+                                uni.showToast({
+                                    title: '保存失败',
+                                    icon: 'none',
+                                });
+                            },
+                        });
+                    }
+                }
+            } catch (error) {
+                console.error('图片下载过程出错:', error);
+
+                // 确保隐藏loading状态
+                uni.hideLoading();
+
+                // 重试机制（最多重试2次）
+                if (retryCount < 2) {
+                    // 显示重试提示
+                    uni.showToast({
+                        title: `下载失败，正在重试(${retryCount + 1}/2)...`,
+                        icon: 'none',
+                        duration: 1500,
+                    });
+
+                    setTimeout(() => {
+                        this.handleImageDownload(image, event, retryCount + 1);
+                    }, 1500); // 延迟1.5秒后重试
+
+                    return;
+                }
+
+                // 超过重试次数，显示最终错误信息
+                const errorMsg = error.message?.includes('网络')
+                    ? '网络连接失败，请检查网络后重试'
+                    : error.message?.includes('timeout')
+                    ? '下载超时，请重试'
+                    : '下载失败，已重试2次，请检查网络或稍后重试';
+
+                uni.showToast({
+                    title: errorMsg,
+                    icon: 'none',
+                    duration: 3000,
+                });
+            }
+        },
+
+        // 图片下载按钮点击处理（更强的事件处理）
+        handleImageDownloadClick(image, event) {
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+                event.stopImmediatePropagation();
+            }
+
+            // 调用实际的下载方法
+            this.handleImageDownload(image, event);
+        },
+
+        // 删除按钮点击处理（更强的事件处理）
+        handleImageDeleteClick(image, index, event) {
+            console.log('删除按钮被点击:', image, index);
+
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+                event.stopImmediatePropagation();
+            }
+
+            // 调用实际的删除方法
+            this.handleImageDelete(image, index);
+        },
+
+        // 图片删除
+        handleImageDelete(image, index, event) {
+            // 强制阻止事件冒泡和默认行为
+            if (event) {
+                event.stopPropagation();
+                event.preventDefault();
+            }
+
+            uni.showModal({
+                title: '确认删除',
+                content: '确定要删除这张图片吗？删除后无法恢复。',
+                confirmColor: '#ff5722',
+                success: (res) => {
+                    if (res.confirm) {
+                        // 从附件列表中查找并删除
+                        const attachmentIndex = this.attachmentList.findIndex(
+                            (file) =>
+                                file.uid === image.uid ||
+                                (file.ossId && file.ossId === image.ossId) ||
+                                (file.url && file.url === image.url),
+                        );
+
+                        if (attachmentIndex >= 0) {
+                            this.attachmentList.splice(attachmentIndex, 1);
+                        }
+
+                        // 释放blob URL（如果存在）
+                        if (image.blobUrl && image.blobUrl.startsWith('blob:')) {
+                            URL.revokeObjectURL(image.blobUrl);
+                        }
+
+                        uni.showToast({
+                            title: '删除成功',
+                            icon: 'success',
+                        });
+                    }
+                },
+            });
+        },
+
+        // 获取文件名短格式
+        getShortFileName(fileName) {
+            if (!fileName) return '';
+
+            const lastDotIndex = fileName.lastIndexOf('.');
+            if (lastDotIndex === -1) {
+                return fileName.length > 12 ? fileName.substring(0, 12) + '...' : fileName;
+            }
+
+            const name = fileName.substring(0, lastDotIndex);
+            const ext = fileName.substring(lastDotIndex);
+
+            if (name.length <= 8) {
+                return fileName;
+            }
+
+            return name.substring(0, 8) + '...' + ext;
+        },
+
+        // 根据文件名获取文件类型
+        getFileTypeByName(fileName) {
+            if (!fileName) return '';
+            const ext =
+                (fileName.split('.').pop() && fileName.split('.').pop().toLowerCase()) || '';
+            const imageTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'];
+            if (imageTypes.includes(ext)) {
+                const mimeTypeMap = {
+                    jpg: 'image/jpeg',
+                    jpeg: 'image/jpeg',
+                    png: 'image/png',
+                    gif: 'image/gif',
+                    bmp: 'image/bmp',
+                    webp: 'image/webp',
+                };
+                return mimeTypeMap[ext] || `image/${ext}`;
+            }
+            return `file/${ext}`;
+        },
+
+        // 图片加载错误处理
+        handleImageError(event) {
+            console.warn('图片加载失败:', event);
+        },
+
+        // 判断是否为图片文件
+        isImageFile(file) {
+            const imageTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/bmp', 'image/webp'];
+            if (file.type) {
+                return imageTypes.includes(file.type);
+            }
+            const fileName = file.name || file.url || '';
+            return /\.(jpg|jpeg|png|gif|bmp|webp)$/i.test(fileName);
+        },
+
+        // 确定
+        async handleConfirm() {
+            try {
+                // 表单验证
+                await this.$refs.formRef.validate();
+
+                this.confirmLoading = true;
+
+                // 处理附件数据
+                const attachmentOssIds = this.attachmentList
+                    .filter((file) => file.status === 'success' && file.ossId)
+                    .map((file) => file.ossId);
+                this.formData.attachmentOssIds = attachmentOssIds.join(',');
+
+                this.$emit('confirm', { ...this.formData });
+            } catch (error) {
+                console.error('提交失败:', error);
+                uni.showToast({ title: '请检查表单填写是否完整', icon: 'none' });
+            } finally {
+                this.confirmLoading = false;
+            }
+        },
+
+        // 关闭
+        handleClose() {
+            this.$emit('close');
+            // 重置表单
+            this.resetForm();
+        },
+
+        // 重置表单
+        resetForm() {
+            // 保留学生基本信息
+            const preserveStudentInfo = this.studentInfo
+                ? {
+                      studentId: this.studentInfo.studentId || '',
+                      studentNo: this.studentInfo.studentNo || '',
+                      studentName: this.studentInfo.studentName || '',
+                      collegeId: this.studentInfo.collegeId || '',
+                      collegeName: this.studentInfo.collegeName || '',
+                      majorId: this.studentInfo.majorId || '',
+                      majorName: this.studentInfo.majorName || '',
+                      classId: this.studentInfo.classId || '',
+                      className: this.studentInfo.className || '',
+                  }
+                : {
+                      studentId: '',
+                      studentNo: '',
+                      studentName: '',
+                      collegeId: '',
+                      collegeName: '',
+                      majorId: '',
+                      majorName: '',
+                      classId: '',
+                      className: '',
+                  };
+
+            Object.assign(this.formData, {
+                ...preserveStudentInfo,
+                disciplineTypeId: '',
+                disciplineTypeName: '',
+                disciplineDate: dayjs().format('YYYY-MM-DD'),
+                disciplineReason: '',
+                disciplineContent: '',
+                scoreDeduction: 0,
+                attachmentOssIds: '',
+                violationSource: '1',
+            });
+
+            this.attachmentList = [];
+            this.currentTypeMinScore = 0;
+            this.currentTypeMaxScore = 100;
+            this.disciplineDateDisplay = dayjs().format('YYYY-MM-DD');
+            this.disciplineDateValue = Number(new Date());
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.violation-dialog-container {
+    background-color: #fff;
+    border-radius: 20rpx 20rpx 0 0;
+}
+
+.dialog-header {
+    padding: 30rpx;
+    border-bottom: 2rpx solid #f0f0f0;
+}
+
+.dialog-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.dialog-scroll {
+    overflow-y: auto;
+}
+
+.dialog-content {
+    padding: 30rpx;
+}
+
+// 学生信息展示
+.student-info-section {
+    margin-bottom: 30rpx;
+    padding: 20rpx;
+    background-color: #f8f9fa;
+    border-radius: 12rpx;
+}
+
+.info-row {
+    display: flex;
+    align-items: flex-start;
+}
+
+.info-label {
+    font-size: 26rpx;
+    color: #606266;
+    min-width: 140rpx;
+    flex-shrink: 0;
+}
+
+.info-content {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8rpx;
+    font-size: 26rpx;
+}
+
+.student-name {
+    font-weight: 600;
+    color: #303133;
+}
+
+.student-detail {
+    color: #666;
+}
+
+// 表单行
+.form-row {
+    display: flex;
+    gap: 20rpx;
+    margin-bottom: 20rpx;
+}
+
+.form-col {
+    flex: 1;
+}
+
+// 违纪类型说明
+.discipline-type-remark {
+    display: flex;
+    align-items: flex-start;
+    margin-top: 10rpx;
+    margin-bottom: 20rpx;
+    padding: 16rpx;
+    background-color: #f8f9fa;
+    border-radius: 8rpx;
+}
+
+.remark-text {
+    margin-left: 10rpx;
+    font-size: 24rpx;
+    color: #606266;
+    line-height: 1.5;
+    flex: 1;
+}
+
+// 附件样式
+.upload-area {
+    padding: 20rpx 0;
+}
+
+// 微信图片上传进度
+.upload-progress {
+    margin-top: 20rpx;
+    padding: 20rpx;
+    background-color: #f8f9fa;
+    border-radius: 12rpx;
+}
+
+.progress-text {
+    display: block;
+    margin-top: 10rpx;
+    font-size: 24rpx;
+    color: #606266;
+    text-align: center;
+}
+
+.doc-upload-section {
+    margin-top: 20rpx;
+    padding: 20rpx 0;
+    border-top: 2rpx dashed #e0e0e0;
+}
+
+// 图片展示区域样式
+.image-section {
+    margin-bottom: 30rpx;
+}
+
+.image-title {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 20rpx;
+    padding-left: 10rpx;
+    border-left: 4rpx solid #2979ff;
+}
+
+.image-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(280rpx, 1fr));
+    gap: 20rpx;
+}
+
+.image-item {
+    position: relative;
+    background: #fff;
+    border-radius: 12rpx;
+    overflow: hidden;
+    border: 2rpx solid #f0f0f0;
+    transition: all 0.3s ease;
+    cursor: pointer;
+}
+
+.image-item:active {
+    transform: scale(0.98);
+    border-color: #2979ff;
+}
+
+.image-container {
+    position: relative;
+    width: 100%;
+    height: 200rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.attachment-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    background-color: #f5f5f5;
+}
+
+.upload-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+}
+
+.upload-text {
+    font-size: 24rpx;
+    margin-top: 8rpx;
+    font-weight: 500;
+}
+
+.error-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(250, 53, 52, 0.8);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+}
+
+.error-text {
+    font-size: 24rpx;
+    margin-top: 8rpx;
+    font-weight: 500;
+}
+
+.success-badge {
+    position: absolute;
+    top: 8rpx;
+    right: 8rpx;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 50%;
+    padding: 4rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.image-actions {
+    display: flex;
+    gap: 6rpx;
+    padding: 8rpx 12rpx;
+    background: #fafafa;
+    border-top: 1rpx solid #f0f0f0;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    position: relative;
+    z-index: 10;
+    pointer-events: auto;
+}
+
+.image-actions .u-button {
+    flex: 1;
+    min-width: 60rpx;
+    font-size: 24rpx !important;
+    pointer-events: auto;
+    position: relative;
+    z-index: 11;
+}
+
+.image-name {
+    padding: 8rpx 12rpx;
+    background: #fff;
+    font-size: 22rpx;
+    color: #666;
+    text-align: center;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.upload-tips {
+    margin-top: 20rpx;
+    padding: 15rpx;
+    background: #f8f9fa;
+    border-radius: 8rpx;
+    border-left: 4rpx solid #17a2b8;
+}
+
+.tip-item {
+    display: block;
+    font-size: 24rpx;
+    color: #666;
+    line-height: 1.5;
+    margin-bottom: 8rpx;
+}
+
+.wechat-tip {
+    color: #2979ff;
+    font-weight: 500;
+}
+
+.dialog-footer {
+    display: flex;
+    gap: 20rpx;
+    padding: 20rpx 30rpx;
+    padding-bottom: 40rpx;
+    border-top: 2rpx solid #f0f0f0;
+}
+</style>
diff --git a/mobile/src/pages/xgss/wsjc/wsjc.vue b/mobile/src/pages/xgss/wsjc/wsjc.vue
index fe4531ce..81d5b182 100644
--- a/mobile/src/pages/xgss/wsjc/wsjc.vue
+++ b/mobile/src/pages/xgss/wsjc/wsjc.vue
@@ -450,7 +450,7 @@ export default {
         // 新增检查
         handleAdd() {
             uni.navigateTo({
-                url: '/pages/xgss/wsjc/wsjcAdd?type=add',
+                url: '/pages/xgss/wsjc/wsjcMainAdd',
             });
         },
 
diff --git a/mobile/src/pages/xgss/wsjc/wsjcMainAdd.vue b/mobile/src/pages/xgss/wsjc/wsjcMainAdd.vue
new file mode 100644
index 00000000..acecd989
--- /dev/null
+++ b/mobile/src/pages/xgss/wsjc/wsjcMainAdd.vue
@@ -0,0 +1,971 @@
+<template>
+    <view class="page-container">
+        <!-- 顶部导航 -->
+        <u-navbar
+            title="宿舍卫生检查"
+            :border-bottom="false"
+            bg-color="#0051d9"
+            :titleStyle="{ color: '#fff' }"
+        >
+            <view slot="left" @click="goBack">
+                <u-icon name="arrow-left" color="#fff" size="22"></u-icon>
+            </view>
+        </u-navbar>
+
+        <!-- 加载状态 -->
+        <u-loading-page :loading="pageLoading" loading-text="加载中..."></u-loading-page>
+
+        <!-- 表单内容 -->
+        <view v-if="!pageLoading" class="content-container">
+            <!-- 基础信息卡片 -->
+            <view class="info-card">
+                <view class="card-title">检查基础信息</view>
+                <u-form ref="formRef" :model="formData" :rules="rules" label-width="100">
+                    <!-- 检查标题 -->
+                    <u-form-item label="检查标题" prop="checkTitle" required>
+                        <u-input v-model="formData.checkTitle" placeholder="请输入检查标题" />
+                    </u-form-item>
+
+                    <!-- 检查日期 -->
+                    <u-form-item label="检查日期" prop="checkDate" required>
+                        <view @click="showDatePicker = true" style="width: 100%">
+                            <u-input
+                                v-model="checkDateDisplay"
+                                placeholder="请选择检查日期"
+                                readonly
+                                border="none"
+                                suffix-icon="arrow-down"
+                                suffix-icon-style="color: #c8c9cc;"
+                                style="pointer-events: none"
+                            />
+                        </view>
+                        <u-datetime-picker
+                            :show="showDatePicker"
+                            v-model="checkDateValue"
+                            mode="datetime"
+                            @confirm="handleDateConfirm"
+                            @cancel="showDatePicker = false"
+                        ></u-datetime-picker>
+                    </u-form-item>
+
+                    <!-- 检查员 -->
+                    <u-form-item label="检查员" prop="checkerName" required>
+                        <u-input v-model="formData.checkerName" placeholder="检查员姓名" readonly />
+                    </u-form-item>
+
+                    <!-- 检查类型 -->
+                    <u-form-item label="检查类型" prop="checkType" required>
+                        <view @click="showCheckTypePicker = true" style="width: 100%">
+                            <u-input
+                                v-model="checkTypeDisplay"
+                                placeholder="请选择检查类型"
+                                readonly
+                                border="none"
+                                suffix-icon="arrow-down"
+                                suffix-icon-style="color: #c8c9cc;"
+                                style="pointer-events: none"
+                            />
+                        </view>
+                        <u-picker
+                            :show="showCheckTypePicker && xg_dorm_hygiene_check_type.length > 0"
+                            :columns="checkTypeColumns"
+                            :defaultIndex="checkTypeDefaultIndex"
+                            keyName="text"
+                            @confirm="handleCheckTypeConfirm"
+                            @cancel="showCheckTypePicker = false"
+                        ></u-picker>
+                    </u-form-item>
+
+                    <!-- 检查级别 -->
+                    <u-form-item label="检查级别" prop="checkLevel" required>
+                        <view @click="showCheckLevelPicker = true" style="width: 100%">
+                            <u-input
+                                v-model="checkLevelDisplay"
+                                placeholder="请选择检查级别"
+                                readonly
+                                border="none"
+                                suffix-icon="arrow-down"
+                                suffix-icon-style="color: #c8c9cc;"
+                                style="pointer-events: none"
+                            />
+                        </view>
+                        <u-picker
+                            :show="showCheckLevelPicker && xg_dorm_hygiene_check_level.length > 0"
+                            :columns="checkLevelColumns"
+                            :defaultIndex="checkLevelDefaultIndex"
+                            keyName="text"
+                            @confirm="handleCheckLevelConfirm"
+                            @cancel="showCheckLevelPicker = false"
+                        ></u-picker>
+                    </u-form-item>
+
+                    <!-- 校区 -->
+                    <u-form-item label="校区" prop="campusId" required>
+                        <view @click="showCampusPicker = true" style="width: 100%">
+                            <u-input
+                                v-model="formData.campusName"
+                                placeholder="请选择校区"
+                                readonly
+                                border="none"
+                                suffix-icon="arrow-down"
+                                suffix-icon-style="color: #c8c9cc;"
+                                style="pointer-events: none"
+                            />
+                        </view>
+                        <u-picker
+                            :show="showCampusPicker"
+                            :columns="campusColumns"
+                            keyName="text"
+                            @confirm="handleCampusConfirm"
+                            @cancel="showCampusPicker = false"
+                        ></u-picker>
+                    </u-form-item>
+
+                    <!-- 宿舍楼 -->
+                    <u-form-item label="宿舍楼" prop="buildingId" required>
+                        <view @click="handleBuildingClick" style="width: 100%">
+                            <u-input
+                                v-model="formData.buildingName"
+                                placeholder="请选择宿舍楼"
+                                readonly
+                                border="none"
+                                suffix-icon="arrow-down"
+                                suffix-icon-style="color: #c8c9cc;"
+                                :disabled="!formData.campusId"
+                                style="pointer-events: none"
+                            />
+                        </view>
+                        <u-picker
+                            :show="showBuildingPicker"
+                            :columns="buildingColumns"
+                            keyName="text"
+                            @confirm="handleBuildingConfirm"
+                            @cancel="showBuildingPicker = false"
+                        ></u-picker>
+                    </u-form-item>
+                </u-form>
+            </view>
+
+            <!-- 房间列表区域 -->
+            <view v-if="formData.buildingId && floorRooms.length > 0" class="rooms-section">
+                <view class="rooms-header">
+                    <text class="rooms-title">宿舍房间列表</text>
+                    <view class="rooms-stats">
+                        <text>总房间: {{ totalRoomsCount }}</text>
+                        <text style="margin-left: 20rpx">已检查: {{ completedRoomsCount }}</text>
+                    </view>
+                </view>
+
+                <view class="hint-text">
+                    <u-icon name="info-circle" color="#ff9900" size="16"></u-icon>
+                    <text style="margin-left: 10rpx; color: #ff9900">点击房间卡片开始检查</text>
+                </view>
+
+                <!-- 楼层和房间展示 -->
+                <view class="floors-container">
+                    <view
+                        v-for="floorData in floorRooms"
+                        :key="floorData.floor"
+                        class="floor-section"
+                    >
+                        <view class="floor-header">
+                            <view class="floor-name">{{ floorData.floor }}楼</view>
+                            <view class="floor-stats">
+                                已检查: {{ getFloorCompletedCount(floorData.floor) }} /
+                                {{ floorData.rooms.length }}
+                            </view>
+                        </view>
+
+                        <view class="rooms-grid">
+                            <view
+                                v-for="room in floorData.rooms"
+                                :key="room.id"
+                                class="room-card"
+                                :class="{ completed: completedRooms.has(room.id) }"
+                                @click="handleRoomClick(room)"
+                            >
+                                <view class="room-card-content">
+                                    <view class="room-name">{{ room.roomName }}</view>
+                                    <view class="room-code">
+                                        {{ room.roomCode || room.roomName }}
+                                    </view>
+                                    <view class="room-status">
+                                        <u-icon
+                                            v-if="completedRooms.has(room.id)"
+                                            name="checkmark-circle-fill"
+                                            color="#19be6b"
+                                            size="18"
+                                        ></u-icon>
+                                        <u-icon
+                                            v-else
+                                            name="calendar"
+                                            color="#c8c9cc"
+                                            size="18"
+                                        ></u-icon>
+                                    </view>
+                                </view>
+                                <view class="room-hint">
+                                    <text v-if="completedRooms.has(room.id)" class="completed-text">
+                                        已检查
+                                    </text>
+                                    <text v-else class="pending-text">点击检查</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 空状态 -->
+            <view
+                v-if="formData.buildingId && floorRooms.length === 0 && !roomsLoading"
+                class="empty-container"
+            >
+                <u-empty text="该宿舍楼暂无房间信息" mode="data"></u-empty>
+            </view>
+        </view>
+
+        <!-- 单个房间检查弹窗 -->
+        <u-popup
+            :show="showRoomCheckPopup"
+            mode="bottom"
+            :round="20"
+            closeable
+            :safe-area-inset-bottom="true"
+            @close="handlePopupClose"
+        >
+            <view class="popup-container">
+                <view class="popup-header">
+                    <text class="popup-title">
+                        {{ currentRoom ? currentRoom.roomName : '' }} - 卫生检查
+                    </text>
+                </view>
+
+                <scroll-view scroll-y class="popup-scroll" :style="{ height: popupHeight + 'px' }">
+                    <SingleRoomCheck
+                        v-if="showRoomCheckPopup && currentRoom"
+                        :room-info="currentRoom"
+                        :check-info="formData"
+                        :existing-data="currentEditData"
+                        @submit="handleSingleCheckSubmit"
+                        @cancel="handlePopupClose"
+                    />
+                </scroll-view>
+            </view>
+        </u-popup>
+    </view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import { getDict, getDictLabel, getDictTagType } from '@/common/dict.js';
+import { request } from '@/common/request.js';
+import dayjs from 'dayjs';
+import SingleRoomCheck from './components/SingleRoomCheck.vue';
+
+export default {
+    name: 'WsjcMainAdd',
+    components: {
+        SingleRoomCheck,
+    },
+    data() {
+        return {
+            pageLoading: true,
+            roomsLoading: false,
+
+            // 表单数据
+            formData: {
+                checkTitle: '',
+                checkDate: '',
+                checkerId: '',
+                checkerName: '',
+                checkType: '1',
+                checkLevel: '1',
+                campusId: '',
+                campusName: '',
+                buildingId: '',
+                buildingName: '',
+            },
+
+            // 验证规则
+            rules: {
+                checkTitle: [{ required: true, message: '请输入检查标题', trigger: 'blur' }],
+                checkDate: [{ required: true, message: '请选择检查日期', trigger: 'change' }],
+                checkerName: [{ required: true, message: '请选择检查员', trigger: 'change' }],
+                checkType: [{ required: true, message: '请选择检查类型', trigger: 'change' }],
+                checkLevel: [{ required: true, message: '请选择检查级别', trigger: 'change' }],
+                campusId: [{ required: true, message: '请选择校区', trigger: 'change' }],
+                buildingId: [{ required: true, message: '请选择宿舍楼', trigger: 'change' }],
+            },
+
+            // Picker显示状态
+            showDatePicker: false,
+            showCheckTypePicker: false,
+            showCheckLevelPicker: false,
+            showCampusPicker: false,
+            showBuildingPicker: false,
+            showRoomCheckPopup: false,
+
+            // 日期时间
+            checkDateValue: Date.now(),
+            checkDateDisplay: '',
+
+            // 字典数据
+            xg_dorm_hygiene_check_type: [],
+            xg_dorm_hygiene_check_level: [],
+
+            // 选项数据
+            campusOptions: [],
+            buildingOptions: [],
+
+            // 房间相关数据
+            floorRooms: [],
+            allRooms: [],
+            completedRooms: new Set(),
+            roomCheckIds: new Map(),
+
+            // 当前操作的房间
+            currentRoom: null,
+            currentEditData: null,
+
+            // 弹窗高度
+            popupHeight: 600,
+        };
+    },
+    computed: {
+        ...mapState(['userInfo']),
+
+        // 检查类型列
+        checkTypeColumns() {
+            return [
+                this.xg_dorm_hygiene_check_type.map((item) => ({
+                    text: item.label,
+                    value: item.value,
+                })),
+            ];
+        },
+
+        // 检查类型默认索引
+        checkTypeDefaultIndex() {
+            const index = this.xg_dorm_hygiene_check_type.findIndex(
+                (item) => item.value === this.formData.checkType,
+            );
+            return [index >= 0 ? index : 0];
+        },
+
+        // 检查类型显示文本
+        checkTypeDisplay() {
+            const item = this.xg_dorm_hygiene_check_type.find(
+                (d) => d.value === this.formData.checkType,
+            );
+            return item ? item.label : '';
+        },
+
+        // 检查级别列
+        checkLevelColumns() {
+            return [
+                this.xg_dorm_hygiene_check_level.map((item) => ({
+                    text: item.label,
+                    value: item.value,
+                })),
+            ];
+        },
+
+        // 检查级别默认索引
+        checkLevelDefaultIndex() {
+            const index = this.xg_dorm_hygiene_check_level.findIndex(
+                (item) => item.value === this.formData.checkLevel,
+            );
+            return [index >= 0 ? index : 0];
+        },
+
+        // 检查级别显示文本
+        checkLevelDisplay() {
+            const item = this.xg_dorm_hygiene_check_level.find(
+                (d) => d.value === this.formData.checkLevel,
+            );
+            return item ? item.label : '';
+        },
+
+        // 校区列
+        campusColumns() {
+            return [this.campusOptions.map((item) => ({ text: item.campusName, value: item.id }))];
+        },
+
+        // 宿舍楼列
+        buildingColumns() {
+            return [
+                this.buildingOptions.map((item) => ({
+                    text: this.getBuildingDisplayName(item),
+                    value: item.id,
+                })),
+            ];
+        },
+
+        // 总房间数
+        totalRoomsCount() {
+            return this.allRooms.length;
+        },
+
+        // 已完成房间数
+        completedRoomsCount() {
+            return this.completedRooms.size;
+        },
+    },
+    onLoad() {
+        this.initPage();
+    },
+    onReady() {
+        // 计算弹窗高度（屏幕高度的70%）
+        const systemInfo = uni.getSystemInfoSync();
+        this.popupHeight = systemInfo.windowHeight * 0.7;
+    },
+    methods: {
+        // 初始化页面
+        async initPage() {
+            try {
+                this.pageLoading = true;
+
+                // 初始化检查标题和日期
+                this.generateDefaultCheckTitle();
+                this.formData.checkDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+                this.checkDateDisplay = this.formData.checkDate;
+                this.checkDateValue = Date.now();
+
+                // 获取当前用户信息
+                await this.fetchCurrentUserInfo();
+
+                // 加载字典数据
+                await this.loadDicts();
+
+                // 加载校区选项
+                await this.loadCampusOptions();
+            } catch (error) {
+                console.error('初始化页面失败:', error);
+                this.$u.toast('初始化页面失败');
+            } finally {
+                this.pageLoading = false;
+            }
+        },
+
+        // 生成默认检查标题
+        generateDefaultCheckTitle() {
+            const now = new Date();
+            const year = now.getFullYear();
+            const month = String(now.getMonth() + 1).padStart(2, '0');
+            const day = String(now.getDate()).padStart(2, '0');
+            this.formData.checkTitle = `${year}${month}${day}宿舍卫生检查`;
+        },
+
+        // 获取当前用户信息
+        async fetchCurrentUserInfo() {
+            try {
+                const res = await request({
+                    url: '/system/user/getInfo',
+                    method: 'GET',
+                });
+                if (res.code === 200 && res.data?.user) {
+                    const user = res.data.user;
+                    this.formData.checkerId = user.userId;
+                    this.formData.checkerName = user.nickName || user.userName;
+                }
+            } catch (error) {
+                console.warn('获取用户信息失败:', error);
+            }
+        },
+
+        // 加载字典数据
+        async loadDicts() {
+            try {
+                const [checkTypeData, checkLevelData] = await Promise.all([
+                    getDict('xg_dorm_hygiene_check_type'),
+                    getDict('xg_dorm_hygiene_check_level'),
+                ]);
+
+                this.xg_dorm_hygiene_check_type = checkTypeData || [];
+                this.xg_dorm_hygiene_check_level = checkLevelData || [];
+            } catch (error) {
+                console.error('加载字典数据失败:', error);
+            }
+        },
+
+        // 加载校区选项
+        async loadCampusOptions() {
+            try {
+                const res = await request({
+                    url: '/xqxx/dormCampus/list',
+                    method: 'GET',
+                });
+                this.campusOptions = res.rows || [];
+            } catch (error) {
+                console.error('加载校区选项失败:', error);
+                uni.showToast({ title: '加载校区选项失败', icon: 'none' });
+            }
+        },
+
+        // 加载宿舍楼选项
+        async loadBuildingOptions(campusId) {
+            try {
+                const res = await request({
+                    url: '/sslxx/dormBuilding/list',
+                    method: 'GET',
+                    params: { campusId },
+                });
+                this.buildingOptions = res.rows || [];
+            } catch (error) {
+                console.error('加载宿舍楼选项失败:', error);
+                uni.showToast({ title: '加载宿舍楼选项失败', icon: 'none' });
+            }
+        },
+
+        // 加载房间列表
+        async loadRoomsByFloor(buildingId) {
+            try {
+                this.roomsLoading = true;
+                const res = await request({
+                    url: '/xgss/dormRoom/list',
+                    method: 'GET',
+                    params: { buildingId },
+                });
+
+                if (res.code === 200 && res.rows) {
+                    this.allRooms = res.rows;
+
+                    // 按楼层分组
+                    const floorMap = new Map();
+                    res.rows.forEach((room) => {
+                        const floor = room.floorNum || '1';
+                        if (!floorMap.has(floor)) {
+                            floorMap.set(floor, []);
+                        }
+                        floorMap.get(floor).push(room);
+                    });
+
+                    // 转换为数组并排序
+                    this.floorRooms = Array.from(floorMap.entries())
+                        .map(([floor, rooms]) => ({ floor, rooms }))
+                        .sort((a, b) => parseInt(a.floor) - parseInt(b.floor));
+                }
+            } catch (error) {
+                console.error('加载房间失败:', error);
+                uni.showToast({ title: '加载房间失败', icon: 'none' });
+            } finally {
+                this.roomsLoading = false;
+            }
+        },
+
+        // 日期确认处理
+        handleDateConfirm(e) {
+            this.formData.checkDate = dayjs(e.value).format('YYYY-MM-DD HH:mm:ss');
+            this.checkDateDisplay = this.formData.checkDate;
+            this.showDatePicker = false;
+        },
+
+        // 检查类型确认处理
+        handleCheckTypeConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                this.formData.checkType = e.value[0].value;
+            }
+            this.showCheckTypePicker = false;
+        },
+
+        // 检查级别确认处理
+        handleCheckLevelConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                this.formData.checkLevel = e.value[0].value;
+            }
+            this.showCheckLevelPicker = false;
+        },
+
+        // 校区确认处理
+        async handleCampusConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                const campus = this.campusOptions.find((item) => item.id === e.value[0].value);
+                if (campus) {
+                    this.formData.campusId = campus.id;
+                    this.formData.campusName = campus.campusName;
+
+                    // 清空下级选项
+                    this.formData.buildingId = '';
+                    this.formData.buildingName = '';
+                    this.buildingOptions = [];
+                    this.floorRooms = [];
+                    this.allRooms = [];
+                    this.completedRooms.clear();
+                    this.roomCheckIds.clear();
+
+                    await this.loadBuildingOptions(campus.id);
+                }
+            }
+            this.showCampusPicker = false;
+        },
+
+        // 宿舍楼点击处理
+        handleBuildingClick() {
+            if (!this.formData.campusId) {
+                this.$u.toast('请先选择校区');
+                return;
+            }
+            this.showBuildingPicker = true;
+        },
+
+        // 宿舍楼确认处理
+        async handleBuildingConfirm(e) {
+            if (e && e.value && e.value.length > 0) {
+                const building = this.buildingOptions.find((item) => item.id === e.value[0].value);
+                if (building) {
+                    this.formData.buildingId = building.id;
+                    this.formData.buildingName = building.buildingName;
+
+                    // 清空房间数据
+                    this.floorRooms = [];
+                    this.allRooms = [];
+                    this.completedRooms.clear();
+                    this.roomCheckIds.clear();
+
+                    await this.loadRoomsByFloor(building.id);
+                }
+            }
+            this.showBuildingPicker = false;
+        },
+
+        // 房间点击处理
+        async handleRoomClick(room) {
+            console.log('🔍 handleRoomClick - 点击的房间数据:', room);
+            console.log(
+                '🔍 房间字段 - roomName:',
+                room.roomName,
+                ', roomCode:',
+                room.roomCode,
+                ', name:',
+                room.name,
+            );
+
+            // 验证基础信息是否完整
+            if (
+                !this.formData.checkTitle ||
+                !this.formData.checkDate ||
+                !this.formData.checkerName ||
+                !this.formData.checkType ||
+                !this.formData.checkLevel
+            ) {
+                uni.showToast({ title: '请先完善检查基础信息', icon: 'none' });
+                return;
+            }
+
+            this.currentRoom = room;
+            console.log('✅ currentRoom已赋值:', this.currentRoom);
+
+            // 检查是否已有记录ID
+            const checkId = this.roomCheckIds.get(room.id);
+
+            if (checkId) {
+                // 已检查过，加载数据用于编辑
+                try {
+                    const response = await request({
+                        url: `/dormHygieneCheck/dormHygieneCheck/${checkId}`,
+                        method: 'GET',
+                    });
+                    if (response.code === 200 && response.data) {
+                        this.currentEditData = response.data;
+                    }
+                } catch (error) {
+                    console.error('查询检查记录详情失败:', error);
+                    uni.showToast({ title: '查询检查记录失败', icon: 'none' });
+                    return;
+                }
+            } else {
+                this.currentEditData = null;
+            }
+
+            this.showRoomCheckPopup = true;
+        },
+
+        // 单个房间检查提交处理
+        handleSingleCheckSubmit(data) {
+            // 标记房间为已完成
+            this.completedRooms.add(this.currentRoom.id);
+
+            // 保存检查记录ID
+            if (data.id) {
+                this.roomCheckIds.set(this.currentRoom.id, data.id);
+            }
+
+            uni.showToast({ title: `${this.currentRoom.roomName} 检查完成`, icon: 'success' });
+            this.showRoomCheckPopup = false;
+            this.currentRoom = null;
+            this.currentEditData = null;
+        },
+
+        // 弹窗关闭处理
+        handlePopupClose() {
+            this.showRoomCheckPopup = false;
+            this.currentRoom = null;
+            this.currentEditData = null;
+        },
+
+        // 获取楼层已完成数量
+        getFloorCompletedCount(floor) {
+            const floorData = this.floorRooms.find((f) => f.floor === floor);
+            if (!floorData) return 0;
+            return floorData.rooms.filter((room) => this.completedRooms.has(room.id)).length;
+        },
+
+        // 宿舍楼显示名称
+        getBuildingDisplayName(building) {
+            let displayName = building.buildingName;
+            if (building.buildingType) {
+                if (building.buildingType === '1') {
+                    displayName = `（男）${displayName}`;
+                } else if (building.buildingType === '2') {
+                    displayName = `（女）${displayName}`;
+                }
+            }
+            return displayName;
+        },
+
+        // 返回
+        goBack() {
+            console.log('🔙 goBack - 点击返回按钮');
+
+            // 检查是否有未保存的数据
+            if (this.completedRoomsCount > 0) {
+                uni.showModal({
+                    title: '提示',
+                    content: `已检查 ${this.completedRoomsCount} 个房间，确定要返回吗？`,
+                    success: (res) => {
+                        if (res.confirm) {
+                            uni.navigateBack({
+                                delta: 1,
+                                fail: (err) => {
+                                    console.error('❌ navigateBack失败:', err);
+                                    // 如果navigateBack失败，尝试使用redirectTo
+                                    uni.redirectTo({
+                                        url: '/pages/xgss/wsjc/wsjc',
+                                        fail: (err2) => {
+                                            console.error('❌ redirectTo也失败:', err2);
+                                            uni.showToast({ title: '返回失败', icon: 'none' });
+                                        },
+                                    });
+                                },
+                            });
+                        }
+                    },
+                });
+            } else {
+                uni.navigateBack({
+                    delta: 1,
+                    fail: (err) => {
+                        console.error('❌ navigateBack失败:', err);
+                        // 如果navigateBack失败，尝试使用redirectTo
+                        uni.redirectTo({
+                            url: '/pages/xgss/wsjc/wsjc',
+                            fail: (err2) => {
+                                console.error('❌ redirectTo也失败:', err2);
+                                uni.showToast({ title: '返回失败', icon: 'none' });
+                            },
+                        });
+                    },
+                });
+            }
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #f5f6f7;
+}
+
+.content-container {
+    padding: 20rpx;
+    padding-top: 100rpx; /* 为导航栏预留空间 */
+}
+
+.info-card {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+}
+
+.card-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #303133;
+    margin-bottom: 20rpx;
+    padding-left: 20rpx;
+    border-left: 6rpx solid #0051d9;
+}
+
+.rooms-section {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 30rpx;
+}
+
+.rooms-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
+
+.rooms-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.rooms-stats {
+    font-size: 24rpx;
+    color: #909399;
+    display: flex;
+    flex-wrap: nowrap;
+    white-space: nowrap;
+}
+
+.hint-text {
+    display: flex;
+    align-items: center;
+    padding: 16rpx;
+    background-color: #fff8e6;
+    border-radius: 8rpx;
+    margin-bottom: 20rpx;
+    font-size: 24rpx;
+}
+
+.floors-container {
+    margin-top: 20rpx;
+}
+
+.floor-section {
+    margin-bottom: 40rpx;
+}
+
+.floor-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx 0;
+    border-bottom: 2rpx solid #3c9cff;
+    margin-bottom: 20rpx;
+    min-height: 60rpx;
+}
+
+.floor-name {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #3c9cff;
+    flex: 1;
+    margin-right: 20rpx;
+}
+
+.floor-stats {
+    font-size: 24rpx;
+    color: #909399;
+    min-width: 240rpx;
+    text-align: right;
+    white-space: nowrap;
+    flex-shrink: 0;
+    display: inline-block;
+}
+
+.rooms-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 20rpx;
+}
+
+.room-card {
+    background-color: #fff;
+    border: 2rpx solid #e4e7ed;
+    border-radius: 12rpx;
+    padding: 20rpx;
+    position: relative;
+    transition: all 0.3s;
+}
+
+.room-card.completed {
+    border-color: #19be6b;
+    background-color: #f0f9ff;
+}
+
+.room-card-content {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    min-height: 80rpx;
+}
+
+.room-name {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #303133;
+    text-align: center;
+    padding-right: 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 50rpx;
+}
+
+.room-code {
+    font-size: 22rpx;
+    color: #909399;
+    text-align: center;
+    margin-top: 4rpx;
+}
+
+.room-status {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 50rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.room-hint {
+    text-align: center;
+    margin-top: 8rpx;
+    font-size: 22rpx;
+}
+
+.completed-text {
+    color: #19be6b;
+    font-weight: 500;
+}
+
+.pending-text {
+    color: #909399;
+}
+
+.empty-container {
+    padding: 100rpx 0;
+}
+
+.popup-container {
+    background-color: #fff;
+    border-radius: 20rpx 20rpx 0 0;
+}
+
+.popup-header {
+    padding: 30rpx;
+    border-bottom: 2rpx solid #f0f0f0;
+}
+
+.popup-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #303133;
+}
+
+.popup-scroll {
+    overflow-y: auto;
+}
+</style>
diff --git a/mobile/src/utils/upload.js b/mobile/src/utils/upload.js
new file mode 100644
index 00000000..c9fa566a
--- /dev/null
+++ b/mobile/src/utils/upload.js
@@ -0,0 +1,308 @@
+// 文件上传工具 - 移动端适配
+import { request } from '@/common/request.js';
+import { REQUEST_CONFIG } from '@/common/config.js';
+
+/**
+ * 获取token
+ */
+function getToken() {
+    try {
+        const token = uni.getStorageSync('access_token');
+        return token ? `Bearer ${token}` : '';
+    } catch (e) {
+        console.error('❌ 获取Token失败:', e);
+        return '';
+    }
+}
+
+/**
+ * 构建完整的上传URL
+ */
+function buildUploadUrl(url) {
+    let fullUrl;
+    if (REQUEST_CONFIG.baseURL.startsWith('/')) {
+        // 开发环境，baseURL是'/api'，需要使用完整的服务器URL
+        fullUrl = `${REQUEST_CONFIG.serverUrl}${url}`;
+    } else {
+        // 生产环境，直接拼接
+        fullUrl = REQUEST_CONFIG.baseURL + url;
+    }
+    return fullUrl;
+}
+
+/**
+ * 上传单个文件
+ * @param {string} url - 上传接口URL
+ * @param {Object} options - 上传选项
+ * @param {string} options.filePath - 文件路径
+ * @param {string} options.name - 文件字段名，默认'file'
+ * @param {Object} options.formData - 额外的表单数据
+ * @param {Function} options.onProgress - 进度回调
+ * @returns {Promise}
+ */
+export function uploadFile(url, options = {}) {
+    return new Promise((resolve, reject) => {
+        const { filePath, name = 'file', formData = {}, onProgress } = options;
+
+        if (!filePath) {
+            return reject(new Error('文件路径不能为空'));
+        }
+
+        const token = getToken();
+        const clientid = uni.getStorageSync('clientid') || REQUEST_CONFIG.clientId;
+        const fullUrl = buildUploadUrl(url);
+
+        console.log('🚀 开始上传文件:', {
+            url: fullUrl,
+            filePath,
+            name,
+        });
+
+        const uploadTask = uni.uploadFile({
+            url: fullUrl,
+            filePath,
+            name,
+            formData,
+            header: {
+                authorization: token,
+                clientid: clientid,
+            },
+            success: (res) => {
+                console.log('✅ 文件上传成功:', res);
+
+                if (res.statusCode === 200) {
+                    try {
+                        const data = JSON.parse(res.data);
+                        if (data.code === 200) {
+                            resolve(data);
+                        } else {
+                            uni.showToast({
+                                title: data.msg || '上传失败',
+                                icon: 'none',
+                            });
+                            reject(new Error(data.msg || '上传失败'));
+                        }
+                    } catch (error) {
+                        console.error('❌ 解析上传响应失败:', error);
+                        reject(new Error('解析响应数据失败'));
+                    }
+                } else {
+                    reject(new Error(`上传失败: HTTP ${res.statusCode}`));
+                }
+            },
+            fail: (err) => {
+                console.error('❌ 文件上传失败:', err);
+                uni.showToast({
+                    title: '上传失败',
+                    icon: 'none',
+                });
+                reject(new Error(err.errMsg || '上传失败'));
+            },
+        });
+
+        // 监听上传进度
+        if (onProgress && typeof onProgress === 'function') {
+            uploadTask.onProgressUpdate((res) => {
+                onProgress(res);
+            });
+        }
+    });
+}
+
+/**
+ * 上传多个文件
+ * @param {string} url - 上传接口URL
+ * @param {Array} files - 文件列表
+ * @param {Object} options - 上传选项
+ * @returns {Promise<Array>}
+ */
+export function uploadFiles(url, files, options = {}) {
+    const uploadPromises = files.map((file, index) => {
+        return uploadFile(url, {
+            ...options,
+            filePath: file.tempFilePath || file.path || file.url,
+            onProgress: (progress) => {
+                if (options.onProgress) {
+                    options.onProgress({
+                        ...progress,
+                        fileIndex: index,
+                        totalFiles: files.length,
+                    });
+                }
+            },
+        });
+    });
+
+    return Promise.all(uploadPromises);
+}
+
+/**
+ * 选择并上传图片
+ * @param {string} url - 上传接口URL
+ * @param {Object} options - 选择和上传选项
+ * @returns {Promise}
+ */
+export function chooseAndUploadImage(url, options = {}) {
+    return new Promise((resolve, reject) => {
+        const {
+            count = 1,
+            sizeType = ['compressed'],
+            sourceType = ['album', 'camera'],
+            ...uploadOptions
+        } = options;
+
+        uni.chooseImage({
+            count,
+            sizeType,
+            sourceType,
+            success: (chooseRes) => {
+                console.log('📷 选择图片成功:', chooseRes);
+
+                if (count === 1) {
+                    // 单张图片上传
+                    uploadFile(url, {
+                        ...uploadOptions,
+                        filePath: chooseRes.tempFilePaths[0],
+                    })
+                        .then(resolve)
+                        .catch(reject);
+                } else {
+                    // 多张图片上传
+                    uploadFiles(url, chooseRes.tempFiles, uploadOptions)
+                        .then(resolve)
+                        .catch(reject);
+                }
+            },
+            fail: (err) => {
+                console.error('❌ 选择图片失败:', err);
+                reject(new Error(err.errMsg || '选择图片失败'));
+            },
+        });
+    });
+}
+
+/**
+ * 选择并上传文件
+ * @param {string} url - 上传接口URL
+ * @param {Object} options - 选择和上传选项
+ * @returns {Promise}
+ */
+export function chooseAndUploadFile(url, options = {}) {
+    return new Promise((resolve, reject) => {
+        const { count = 1, type = 'all', extension = [], ...uploadOptions } = options;
+
+        // #ifdef MP-WEIXIN
+        // 微信小程序使用 wx.chooseMessageFile
+        uni.chooseMessageFile({
+            count,
+            type,
+            extension,
+            success: (chooseRes) => {
+                console.log('📁 选择文件成功:', chooseRes);
+
+                if (count === 1) {
+                    uploadFile(url, {
+                        ...uploadOptions,
+                        filePath: chooseRes.tempFiles[0].path,
+                    })
+                        .then(resolve)
+                        .catch(reject);
+                } else {
+                    uploadFiles(url, chooseRes.tempFiles, uploadOptions)
+                        .then(resolve)
+                        .catch(reject);
+                }
+            },
+            fail: (err) => {
+                console.error('❌ 选择文件失败:', err);
+                reject(new Error(err.errMsg || '选择文件失败'));
+            },
+        });
+        // #endif
+
+        // #ifndef MP-WEIXIN
+        // H5和其他平台使用普通文件选择
+        uni.chooseFile({
+            count,
+            type,
+            extension,
+            success: (chooseRes) => {
+                console.log('📁 选择文件成功:', chooseRes);
+
+                if (count === 1) {
+                    uploadFile(url, {
+                        ...uploadOptions,
+                        filePath: chooseRes.tempFilePaths[0],
+                    })
+                        .then(resolve)
+                        .catch(reject);
+                } else {
+                    uploadFiles(url, chooseRes.tempFiles, uploadOptions)
+                        .then(resolve)
+                        .catch(reject);
+                }
+            },
+            fail: (err) => {
+                console.error('❌ 选择文件失败:', err);
+                reject(new Error(err.errMsg || '选择文件失败'));
+            },
+        });
+        // #endif
+    });
+}
+
+/**
+ * 压缩图片
+ * @param {string} src - 图片路径
+ * @param {Object} options - 压缩选项
+ * @returns {Promise}
+ */
+export function compressImage(src, options = {}) {
+    return new Promise((resolve, reject) => {
+        const { quality = 80, compressedWidth, compressedHeight } = options;
+
+        uni.compressImage({
+            src,
+            quality,
+            compressedWidth,
+            compressedHeight,
+            success: (res) => {
+                console.log('✅ 图片压缩成功:', res);
+                resolve(res.tempFilePath);
+            },
+            fail: (err) => {
+                console.error('❌ 图片压缩失败:', err);
+                reject(new Error(err.errMsg || '图片压缩失败'));
+            },
+        });
+    });
+}
+
+/**
+ * 获取图片信息
+ * @param {string} src - 图片路径
+ * @returns {Promise}
+ */
+export function getImageInfo(src) {
+    return new Promise((resolve, reject) => {
+        uni.getImageInfo({
+            src,
+            success: (res) => {
+                resolve(res);
+            },
+            fail: (err) => {
+                reject(new Error(err.errMsg || '获取图片信息失败'));
+            },
+        });
+    });
+}
+
+// 默认导出
+export default {
+    uploadFile,
+    uploadFiles,
+    chooseAndUploadImage,
+    chooseAndUploadFile,
+    compressImage,
+    getImageInfo,
+};