Merge branch 'wyx' of http://120.46.222.128:10021/elink-star/epmet-apartment-pc into wyx

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 = "修改室内配套设施";
       });

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()