diff --git a/src/assets/img/1.png b/src/assets/img/1.png
index 362df03..c024270 100644
Binary files a/src/assets/img/1.png and b/src/assets/img/1.png differ
diff --git a/src/assets/img/2.png b/src/assets/img/2.png
index dd804c0..7eb0640 100644
Binary files a/src/assets/img/2.png and b/src/assets/img/2.png differ
diff --git a/src/assets/img/3.png b/src/assets/img/3.png
index c8e3173..222197f 100644
Binary files a/src/assets/img/3.png and b/src/assets/img/3.png differ
diff --git a/src/assets/img/4.png b/src/assets/img/4.png
index 801134a..f7e9b9b 100644
Binary files a/src/assets/img/4.png and b/src/assets/img/4.png differ
diff --git a/src/assets/img/add.png b/src/assets/img/add.png
index 8c2cf1c..f4758e6 100644
Binary files a/src/assets/img/add.png and b/src/assets/img/add.png differ
diff --git a/src/assets/img/alarm.png b/src/assets/img/alarm.png
index 7ef5441..2e66bc1 100644
Binary files a/src/assets/img/alarm.png and b/src/assets/img/alarm.png differ
diff --git a/src/assets/img/alert.png b/src/assets/img/alert.png
index 8a4a771..d07ddb8 100644
Binary files a/src/assets/img/alert.png and b/src/assets/img/alert.png differ
diff --git a/src/assets/img/avator.d7401229.png b/src/assets/img/avator.d7401229.png
index 574f03f..6a76eea 100644
Binary files a/src/assets/img/avator.d7401229.png and b/src/assets/img/avator.d7401229.png differ
diff --git a/src/assets/img/beijingtu01.png b/src/assets/img/beijingtu01.png
index ce92c30..ea01373 100644
Binary files a/src/assets/img/beijingtu01.png and b/src/assets/img/beijingtu01.png differ
diff --git a/src/assets/img/beijingtu24.jpg b/src/assets/img/beijingtu24.jpg
index 24535c2..2924a03 100644
Binary files a/src/assets/img/beijingtu24.jpg and b/src/assets/img/beijingtu24.jpg differ
diff --git a/src/assets/img/beijingtu59.jpg b/src/assets/img/beijingtu59.jpg
index 4aa8b2f..63feda9 100644
Binary files a/src/assets/img/beijingtu59.jpg and b/src/assets/img/beijingtu59.jpg differ
diff --git a/src/assets/img/beijingtu60.jpg b/src/assets/img/beijingtu60.jpg
index 5360dfd..9731305 100644
Binary files a/src/assets/img/beijingtu60.jpg and b/src/assets/img/beijingtu60.jpg differ
diff --git a/src/assets/img/bgBox.png b/src/assets/img/bgBox.png
index dcd452c..0e471cd 100644
Binary files a/src/assets/img/bgBox.png and b/src/assets/img/bgBox.png differ
diff --git a/src/assets/img/bgfixed.jpg b/src/assets/img/bgfixed.jpg
index ee8a060..2bbb131 100644
Binary files a/src/assets/img/bgfixed.jpg and b/src/assets/img/bgfixed.jpg differ
diff --git a/src/assets/img/blkmqx.png b/src/assets/img/blkmqx.png
index 13c9d20..6471aaa 100644
Binary files a/src/assets/img/blkmqx.png and b/src/assets/img/blkmqx.png differ
diff --git a/src/assets/img/bytz.png b/src/assets/img/bytz.png
index b619d01..70671c8 100644
Binary files a/src/assets/img/bytz.png and b/src/assets/img/bytz.png differ
diff --git a/src/assets/img/byxrz.png b/src/assets/img/byxrz.png
index dac936d..ee60d24 100644
Binary files a/src/assets/img/byxrz.png and b/src/assets/img/byxrz.png differ
diff --git a/src/assets/img/check.png b/src/assets/img/check.png
index 00f3efa..14c0320 100644
Binary files a/src/assets/img/check.png and b/src/assets/img/check.png differ
diff --git a/src/assets/img/check1.png b/src/assets/img/check1.png
index b22f51e..647b771 100644
Binary files a/src/assets/img/check1.png and b/src/assets/img/check1.png differ
diff --git a/src/assets/img/choose.1fda8508.png b/src/assets/img/choose.1fda8508.png
index 426b92e..9a55095 100644
Binary files a/src/assets/img/choose.1fda8508.png and b/src/assets/img/choose.1fda8508.png differ
diff --git a/src/assets/img/czl.png b/src/assets/img/czl.png
index a36f147..b27111b 100644
Binary files a/src/assets/img/czl.png and b/src/assets/img/czl.png differ
diff --git a/src/assets/img/dd.png b/src/assets/img/dd.png
index 97373bf..15be42a 100644
Binary files a/src/assets/img/dd.png and b/src/assets/img/dd.png differ
diff --git a/src/assets/img/dk.png b/src/assets/img/dk.png
index e052795..3383a94 100644
Binary files a/src/assets/img/dk.png and b/src/assets/img/dk.png differ
diff --git a/src/assets/img/dpzs.png b/src/assets/img/dpzs.png
index dbad1a2..e39a25d 100644
Binary files a/src/assets/img/dpzs.png and b/src/assets/img/dpzs.png differ
diff --git a/src/assets/img/dpzs1.png b/src/assets/img/dpzs1.png
index 9e3f234..94611e5 100644
Binary files a/src/assets/img/dpzs1.png and b/src/assets/img/dpzs1.png differ
diff --git a/src/assets/img/dpzs2.png b/src/assets/img/dpzs2.png
index fcb762b..9d52f8e 100644
Binary files a/src/assets/img/dpzs2.png and b/src/assets/img/dpzs2.png differ
diff --git a/src/assets/img/dpzs3.png b/src/assets/img/dpzs3.png
index 691ac7e..2ca5bc3 100644
Binary files a/src/assets/img/dpzs3.png and b/src/assets/img/dpzs3.png differ
diff --git a/src/views/boYu/byRoom.vue b/src/views/boYu/byRoom.vue
index ce44625..b91754e 100644
--- a/src/views/boYu/byRoom.vue
+++ b/src/views/boYu/byRoom.vue
@@ -26,6 +26,9 @@
     <el-table :data="tableData" border stripe class="table" ref="multipleTable" height="600"
       header-cell-class-name="table-header" @selection-change="handleSelectionChange" empty-text="无">
       <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" label="ID"></el-table-column>
+      <el-table-column prop="roomId" label="roomID"></el-table-column>
+      <el-table-column prop="did" label="did"></el-table-column>
       <el-table-column prop="storeName" label="门店名称"></el-table-column>
       <el-table-column prop="buildingName" label="楼栋名称"></el-table-column>
       <el-table-column prop="unitName" label="单元名称"></el-table-column>
@@ -266,16 +269,16 @@ export default {
       content = content.concat(results.list);
       if (results) {
         content = content.concat(results.list);
-        let total = results.total;//获取总条数
-        let page = Math.ceil(total / this.pageSize);//计算需要多少页
-        if (page > 1) {
-          for (let i = 2; i <= page; i++) {
-            this.pageNum = i;//更改页码
-            let newResults = await this.getRoomList();
+        // let total = results.total;//获取总条数
+        // let page = Math.ceil(total / this.pageSize);//计算需要多少页
+        // if (page > 1) {
+        //   for (let i = 2; i <= page; i++) {
+        //     this.pageNum = i;//更改页码
+        //     let newResults = await this.getRoomList();
             //将第2、3、4...页数据放入content数组中
-            content = content.concat(newResults.list);
-          }
-        }
+            // content = content.concat(newResults.list);
+          // }
+        // }
         await this.processingData(content)
       }
     },
diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue
index 262e1d9..c8936fd 100644
--- a/src/views/userManagement.vue
+++ b/src/views/userManagement.vue
@@ -111,8 +111,8 @@
               <el-input v-model="query.phone" size="small" placeholder="手机号" class="handle-input width-3rem mr10"
                 :clearable="true">
               </el-input>
-              <el-cascader style="width: 100%;" size="small" :options="roomlistZNodes" collapse-tags
-                @change="checkNodeSearch" :props="{ multiple: true }" :clearable="true" class="width-3rem"></el-cascader>
+<!--              <el-cascader style="width: 100%;" size="small" :options="roomlistZNodes" collapse-tags-->
+<!--                @change="checkNodeSearch" :props="{ multiple: true }" :clearable="true" class="width-3rem"></el-cascader>-->
               <el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch"
                 style="background: #FA8E00; border: none;">查询</el-button>
             </div>
@@ -371,11 +371,11 @@
                 <span v-if="scope.row.type == 14">密码</span>
               </template>
             </el-table-column>
-            <!--            <el-table-column prop="number" width="400" label="凭证有效期">-->
-            <!--              <template #default="scope">-->
-            <!--                <span>{{ scope.row.startTimeText }} - {{ scope.row.endTimeText }}</span>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
+<!--                        <el-table-column prop="number" width="400" label="凭证有效期">-->
+<!--                          <template #default="scope">-->
+<!--                            <span>{{ scope.row.startTimeText }} - {{ scope.row.endTimeText }}</span>-->
+<!--                          </template>-->
+<!--                        </el-table-column>-->
             <el-table-column label="创建时间" prop="createAt" width="200"></el-table-column>
             <el-table-column label="操作" width="400" align="center" class-name="tablebutton">
               <template #default="scope">
@@ -1149,29 +1149,11 @@ export default {
   mounted() {
     // 获取全部合同
     this.getLeasesList()
-    // document.addEventListener('keydown', this.keyDown)
+    document.addEventListener('keydown', this.keyDown)
+    var that = this
     setTimeout(() => {
-      this.handleSearch()
-      var q = {};
-      var data = {
-        pageNum: 0,
-        pageSize: 0,
-        orderBy: "create_time desc",
-        q: JSON.stringify(q),
-      };
-      let roomAbout = this.$store.state.roomAbout
-      httpPost(data, this.$api.getlistNum).then((res1) => {
-        res1.data.list.map((li, index) => {
-          this.$store.commit("increment", 1);
-          li['rommNameText'] = this.screenRoomName(li.id)
-          if (li["rommNameText"] != '') {
-            this.isCheckin++
-          } else {
-            this.noshowNum++
-          }
-        });
-      });
-    }, 800)
+      that.handleSearch()
+    }, 1000)
   },
   beforeDestroy() {
     this.$store.commit("increment", 1);
@@ -1226,7 +1208,7 @@ export default {
       let data3 = {
         code: "/zg/offlinepassword/limit",
         data: {
-          userName: JSON.parse(this.drawerRow.info).userId,
+          userName: this.drawerRow.info.userId,
           lockId: row.deviceNum,
           startTime: startTime,
           endTime: endTime
@@ -1257,7 +1239,7 @@ export default {
       let data3 = {
         code: "/zg/offlinepassword/correctTime",
         data: {
-          userName: JSON.parse(this.drawerRow.info).userId,
+          userName: this.drawerRow.info.userId,
           lockId: row.deviceNum,
         },
       };
@@ -1286,7 +1268,7 @@ export default {
       let data3 = {
         code: "/zg/offlinepassword/clear",
         data: {
-          userName: JSON.parse(this.drawerRow.info).userId,
+          userName: this.drawerRow.info.userId,
           lockId: row.deviceNum,
           startTime: startTime,
           // endTime:endTime,
@@ -1318,7 +1300,7 @@ export default {
       let data3 = {
         code: "/zg/offlinepassword/forever",
         data: {
-          userName: JSON.parse(this.drawerRow.info).userId,
+          userName: this.drawerRow.info.userId,
           lockId: row.deviceNum,
           startTime: startTime,
           // endTime:endTime,
@@ -2900,8 +2882,8 @@ export default {
         phone: this.query.phone,
       };
       var data = {
-        pageNum: 1,
-        pageSize: 10,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
         orderBy: "create_time desc",
         q: JSON.stringify(q),
       };
@@ -2909,7 +2891,7 @@ export default {
       let roomAbout = this.$store.state.roomAbout
       httpPost(data, this.$api.getlistNum).then((res1) => {
         console.log(res1);
-        let para = [];
+        let para = [], searchCardIds=[];
         res1.data.list.map((li, index) => {
           let userTelephone = JSON.parse(li.info) ? JSON.parse(li.info).userTelephone : ''
           let str = {
@@ -2918,15 +2900,30 @@ export default {
             password: "",
             operateMode: 1,
           };
-          para.push(str);
+          // para.push(str);
           this.$store.commit("increment", 1);
           li.status = 3;
           li['rommNameText'] = this.screenRoomName(li.id)
+          searchCardIds.push(li.id)
+          if(li.info){
+            li.info = JSON.parse(li.info)
+          }
         });
+        this.searchCardIds = searchCardIds
+        this.getAboutRoom()
+        let list = res1.data.list
+        setTimeout(()=>{
+          list.map(li=>{
+            li['rommNameText'] = this.screenRoomName(li.id)
+          })
+          this.currentPage4 = 1
+          this.userlist = list;
+          this.total = res1.data.total;
+        },500)
         // this.getallstatus(para);
-        console.log(res1.data.list);
-        this.userlist = res1.data.list;
-        this.total = res1.data.total;
+        // console.log(res1.data.list);
+        // this.userlist = res1.data.list;
+        // this.total = res1.data.total;
       });
     },
     // 获取人员列表
@@ -3126,8 +3123,8 @@ export default {
           var roomName = this.zNodes.filter(item => li.roomId === item.id)
           if (resultArr) {
             if (resultArr.manufactureId == 101) {
-              var userTelephone = JSON.parse(this.drawerRow.info).userTelephone;
-              var userPassword = JSON.parse(this.drawerRow.info).userPassword;
+              var userTelephone = this.drawerRow.info.userTelephone;
+              var userPassword = this.drawerRow.info.userPassword;
               resultArr.roomName = roomName[0].name
               var data = {
                 deviceNum: resultArr.deviceNum,
@@ -3261,7 +3258,7 @@ export default {
     sendVoucher() {
       var SelectedListbind = this.SelectedList
       var roomAbout = this.$store.state.roomAbout
-      var infostr = JSON.parse(this.drawerRow.info);
+      var infostr = this.drawerRow.info;
       var fjid = [];
       if (this.value2[0] == '' || this.value2[1] == '') {
         this.$message.error("请选择开始结束时间")
@@ -3750,8 +3747,8 @@ export default {
           lockerId: resultArr.deviceNum,
           imei: resultArr.imei,
           order: 6216,
-          lockerUserId: JSON.parse(this.drawerRow.info).userPassword,
-          keyId: JSON.parse(this.drawerRow.info).userPassword,
+          lockerUserId: this.drawerRow.info.userPassword,
+          keyId: this.drawerRow.info.userPassword,
           fingerType: 0,
           file: fingerprint1,
           cardName: row.name + '-' + (pzname ? pzname : ''),
@@ -4909,10 +4906,10 @@ export default {
         str = {
           username: this.voucher.username,
           pzname: pzname,
-          userTelephone: JSON.parse(this.drawerRow.info).userTelephone,
-          userPassword: JSON.parse(this.drawerRow.info).userPassword,
-          keyId: JSON.parse(this.drawerRow.info).keyId || '',
-          userId: JSON.parse(this.drawerRow.info).userId || '',
+          userTelephone: this.drawerRow.info.userTelephone,
+          userPassword: this.drawerRow.info.userPassword,
+          keyId: this.drawerRow.info.keyId || '',
+          userId: this.drawerRow.info.userId || '',
           fingerprintAlias: this.voucher.fingerprintAlias,
           password: "",
           passwordStartTime: moment(this.value2[0]).format('YYYYMMDDHHmmss'),
@@ -4937,10 +4934,10 @@ export default {
         str = {
           username: this.voucher.username,
           pzname: pzname,
-          userTelephone: JSON.parse(this.drawerRow.info).userTelephone,
-          userPassword: JSON.parse(this.drawerRow.info).userPassword,
-          keyId: JSON.parse(this.drawerRow.info).keyId || '',
-          userId: JSON.parse(this.drawerRow.info).userId || '',
+          userTelephone: this.drawerRow.info.userTelephone,
+          userPassword: this.drawerRow.info.userPassword,
+          keyId: this.drawerRow.info.keyId || '',
+          userId: this.drawerRow.info.userId || '',
           operateMode: 13,
           order: 6213,
           password: arr2.toUpperCase(), //this.voucher.idcard,
@@ -4973,10 +4970,10 @@ export default {
           pzname: pzname,
           operateMode: 10,
           order: 6210,
-          userTelephone: JSON.parse(this.drawerRow.info).userTelephone,
-          userPassword: JSON.parse(this.drawerRow.info).userPassword,
-          keyId: JSON.parse(this.drawerRow.info).keyId || '',
-          userId: JSON.parse(this.drawerRow.info).userId || '',
+          userTelephone: this.drawerRow.info.userTelephone,
+          userPassword: this.drawerRow.info.userPassword,
+          keyId: this.drawerRow.info.keyId || '',
+          userId: this.drawerRow.info.userId || '',
           password: nfc.toUpperCase(), //this.voucher.nfc,
           passwordStartTime: moment(this.value2[0]).format('YYYYMMDDHHmmss'),
           passwordEndTime: moment(this.value2[1]).format('YYYYMMDDHHmmss'),
@@ -4998,10 +4995,10 @@ export default {
           pzname: pzname,
           // imei: this.deviceList[0].imei,
           password: this.voucher.password,
-          userTelephone: JSON.parse(this.drawerRow.info).userTelephone,
-          userPassword: JSON.parse(this.drawerRow.info).userPassword,
-          keyId: JSON.parse(this.drawerRow.info).keyId || '',
-          userId: JSON.parse(this.drawerRow.info).userId || '',
+          userTelephone: this.drawerRow.info.userTelephone,
+          userPassword: this.drawerRow.info.userPassword,
+          keyId: this.drawerRow.info.keyId || '',
+          userId: this.drawerRow.info.userId || '',
           operateMode: 7,
           order: 6207,
           passwordStartTime: moment(this.value2[0]).format('YYYYMMDDHHmmss'),
@@ -5488,7 +5485,13 @@ export default {
     },
     // 清理房间
     qlfj() {
-      var info = JSON.parse(this.drawerRow.info);
+      // var info = JSON.parse(this.drawerRow.info);
+      let info = ''//JSON.parse(this.drawerRow.info);
+      if(typeof(this.drawerRow.info) == 'object'){
+        info = this.drawerRow.info
+      }else if(typeof(this.drawerRow.info) == 'string'){
+        info = JSON.parse(this.drawerRow.info)
+      }
       var info1 = {
         roomIds: [],
         userPassword: info.userPassword,