From b311ea74139c4cc213179b50ef11dd0c3bc6a5f4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 21 May 2025 14:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E5=8A=9E=E7=90=86=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E7=AC=AC=E4=B8=80=E6=AD=A5=E6=8F=92=E5=85=A5=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=AF=95=E4=B8=9A=E7=94=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mz/housetype_facilities/index.vue | 10 +++++++++-
 src/views/residence/checkIn/index.vue       |  7 ++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/mz/housetype_facilities/index.vue b/src/views/mz/housetype_facilities/index.vue
index 3885330..9050631 100644
--- a/src/views/mz/housetype_facilities/index.vue
+++ b/src/views/mz/housetype_facilities/index.vue
@@ -115,7 +115,7 @@
         <el-form-item label="图标" prop="icon">
         <el-upload class="upload-video" :headers="$getElUploadHeaders()" :action="uploadUlr" :on-remove="handleRemove"
                       :on-success="(response, file, fileList) => onSuccessImage(response, file, fileList, index)"
-                       :limit="1" :file-list="images" accept="image/*">
+                       :limit="1" :file-list="images" accept="image/*" >
                       <el-button size="small" type="primary">点击上传</el-button>
                     </el-upload>
       </el-form-item>
@@ -230,6 +230,14 @@ export default {
       const id = row.id || this.ids
       getFacilities(id).then(response => {
         this.form = response.data;
+        const match = response.data.icon.match(/\/([^\/]+)$/);
+        const fileName = match ? match[1] : response.data.icon;
+        this.images = [
+          {
+            url: response.data.icon,
+            name: fileName,
+          }
+        ]
         this.open = true;
         this.title = "修改室内配套设施";
       });
diff --git a/src/views/residence/checkIn/index.vue b/src/views/residence/checkIn/index.vue
index 7d7b093..53a0038 100644
--- a/src/views/residence/checkIn/index.vue
+++ b/src/views/residence/checkIn/index.vue
@@ -319,7 +319,7 @@ export default {
       }
     },
     // 下一步操作
-    handleNextStep() {
+    async handleNextStep() {
       if (this.currentStep < this.dataList.length) {
         if(this.currentStep === 1){
           if(!this.userInfo.checkInTime || !this.userInfo.checkOutTime){
@@ -328,8 +328,9 @@ export default {
           }
           this.updateMzGraduateInfo(); // 更新时间
           this.currentStep++;
+          await this.createMzGraduateInfo()
+          this.handleQuery()
           this.stepCompleted[0] = true;
-          this.createMzGraduateInfo()
           return;
         }
         if (this.currentStep == 2) {
@@ -427,7 +428,7 @@ export default {
     // 这里可以监听数据变化
     $route:{
       handler: function (newVal, oldVal) {
-        if (newVal.query) {
+        if (newVal.query.idCard) {
          this.$nextTick(()=>{
           this.checnInForm.idCard = newVal.query.idCard;
           this.handleQuery()