diff --git a/src/views/administrator/detail/index.vue b/src/views/administrator/detail/index.vue
index c53e135..08d4a46 100644
--- a/src/views/administrator/detail/index.vue
+++ b/src/views/administrator/detail/index.vue
@@ -16,6 +16,10 @@
         <span class="text"> {{ equipmentInfo.devCode }}</span>
       </div>
       <div class="text-area">
+        <span class="text-title">手机号： </span>
+        <span class="text"> {{ equipmentInfo.simid }}</span>
+      </div>
+      <div class="text-area">
         <span class="text-title">设备状态： </span>
         <span :class="equipmentInfo.status === '正常' ? 'online' : equipmentInfo.status === '离线' ? 'offline' : equipmentInfo.status === '报警' ? 'alarm' : 'text'"> {{ equipmentInfo.status }}</span>
       </div>
@@ -35,11 +39,13 @@
   latitude: "", //纬度
   longtitude: "", // 经度
   status: "", // 设备状态
+  simid:"", //手机号
 })
 onMounted(() => {
   equipmentInfo.value.devCode = $route.query.devCode as string  // 设备编号
   equipmentInfo.value.doorName = $route.query.doorName as string  // 设备名称
   equipmentInfo.value.position = $route.query.position as string  // 详细地址
+  equipmentInfo.value.simid = $route.query.simid as string  // 手机号
   position.value = [$route.query.longtitude as string, $route.query.latitude as string] // 经纬度
   equipmentInfo.value.status = $route.query.status as string  // 设备状态
 })

diff --git a/src/views/administrator/detail/index.vue b/src/views/administrator/detail/index.vue
index c53e135..08d4a46 100644
--- a/src/views/administrator/detail/index.vue
+++ b/src/views/administrator/detail/index.vue
@@ -16,6 +16,10 @@
         <span class="text"> {{ equipmentInfo.devCode }}</span>
       </div>
       <div class="text-area">
+        <span class="text-title">手机号： </span>
+        <span class="text"> {{ equipmentInfo.simid }}</span>
+      </div>
+      <div class="text-area">
         <span class="text-title">设备状态： </span>
         <span :class="equipmentInfo.status === '正常' ? 'online' : equipmentInfo.status === '离线' ? 'offline' : equipmentInfo.status === '报警' ? 'alarm' : 'text'"> {{ equipmentInfo.status }}</span>
       </div>
@@ -35,11 +39,13 @@
   latitude: "", //纬度
   longtitude: "", // 经度
   status: "", // 设备状态
+  simid:"", //手机号
 })
 onMounted(() => {
   equipmentInfo.value.devCode = $route.query.devCode as string  // 设备编号
   equipmentInfo.value.doorName = $route.query.doorName as string  // 设备名称
   equipmentInfo.value.position = $route.query.position as string  // 详细地址
+  equipmentInfo.value.simid = $route.query.simid as string  // 手机号
   position.value = [$route.query.longtitude as string, $route.query.latitude as string] // 经纬度
   equipmentInfo.value.status = $route.query.status as string  // 设备状态
 })
diff --git a/src/views/administrator/equipment/index.vue b/src/views/administrator/equipment/index.vue
index a313cf5..0cbea5c 100644
--- a/src/views/administrator/equipment/index.vue
+++ b/src/views/administrator/equipment/index.vue
@@ -98,11 +98,10 @@
   console.log(window.scrollY, windowHeight, scrollHeight - 60);
   
   if (Number(window.scrollY) + windowHeight >= scrollHeight - 60) {
-    showLoading.value = true
+    // showLoading.value = true
     onBottom()
   }
 };
-
 // 确定选择状态
 const onConfirm = (val: string[]) => {
   const typeTest = val[0]
@@ -113,6 +112,7 @@
 
 function onBottom() { // 触底加载
   if ((listQuery.value.pageNo * listQuery.value.pageSize) < total.value) {
+    showLoading.value = true
     listQuery.value.pageNo++
     fetchEquipmentList(true)
   } 
@@ -125,6 +125,7 @@
     listQuery.value.pageNo = 1
   }
   getEquipmentList(listQuery.value).then((res) => {
+    showLoading.value = true
     if(isNowPage) {
       list.value = list.value.concat(res.data.records)
     } else {

diff --git a/src/views/administrator/detail/index.vue b/src/views/administrator/detail/index.vue
index c53e135..08d4a46 100644
--- a/src/views/administrator/detail/index.vue
+++ b/src/views/administrator/detail/index.vue
@@ -16,6 +16,10 @@
         <span class="text"> {{ equipmentInfo.devCode }}</span>
       </div>
       <div class="text-area">
+        <span class="text-title">手机号： </span>
+        <span class="text"> {{ equipmentInfo.simid }}</span>
+      </div>
+      <div class="text-area">
         <span class="text-title">设备状态： </span>
         <span :class="equipmentInfo.status === '正常' ? 'online' : equipmentInfo.status === '离线' ? 'offline' : equipmentInfo.status === '报警' ? 'alarm' : 'text'"> {{ equipmentInfo.status }}</span>
       </div>
@@ -35,11 +39,13 @@
   latitude: "", //纬度
   longtitude: "", // 经度
   status: "", // 设备状态
+  simid:"", //手机号
 })
 onMounted(() => {
   equipmentInfo.value.devCode = $route.query.devCode as string  // 设备编号
   equipmentInfo.value.doorName = $route.query.doorName as string  // 设备名称
   equipmentInfo.value.position = $route.query.position as string  // 详细地址
+  equipmentInfo.value.simid = $route.query.simid as string  // 手机号
   position.value = [$route.query.longtitude as string, $route.query.latitude as string] // 经纬度
   equipmentInfo.value.status = $route.query.status as string  // 设备状态
 })
diff --git a/src/views/administrator/equipment/index.vue b/src/views/administrator/equipment/index.vue
index a313cf5..0cbea5c 100644
--- a/src/views/administrator/equipment/index.vue
+++ b/src/views/administrator/equipment/index.vue
@@ -98,11 +98,10 @@
   console.log(window.scrollY, windowHeight, scrollHeight - 60);
   
   if (Number(window.scrollY) + windowHeight >= scrollHeight - 60) {
-    showLoading.value = true
+    // showLoading.value = true
     onBottom()
   }
 };
-
 // 确定选择状态
 const onConfirm = (val: string[]) => {
   const typeTest = val[0]
@@ -113,6 +112,7 @@
 
 function onBottom() { // 触底加载
   if ((listQuery.value.pageNo * listQuery.value.pageSize) < total.value) {
+    showLoading.value = true
     listQuery.value.pageNo++
     fetchEquipmentList(true)
   } 
@@ -125,6 +125,7 @@
     listQuery.value.pageNo = 1
   }
   getEquipmentList(listQuery.value).then((res) => {
+    showLoading.value = true
     if(isNowPage) {
       list.value = list.value.concat(res.data.records)
     } else {
diff --git a/src/views/user/device/index.vue b/src/views/user/device/index.vue
index 0da5a42..05fbf06 100644
--- a/src/views/user/device/index.vue
+++ b/src/views/user/device/index.vue
@@ -93,7 +93,7 @@
   padding: 20px;
   padding-top: 58px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .device {

diff --git a/src/views/administrator/detail/index.vue b/src/views/administrator/detail/index.vue
index c53e135..08d4a46 100644
--- a/src/views/administrator/detail/index.vue
+++ b/src/views/administrator/detail/index.vue
@@ -16,6 +16,10 @@
         <span class="text"> {{ equipmentInfo.devCode }}</span>
       </div>
       <div class="text-area">
+        <span class="text-title">手机号： </span>
+        <span class="text"> {{ equipmentInfo.simid }}</span>
+      </div>
+      <div class="text-area">
         <span class="text-title">设备状态： </span>
         <span :class="equipmentInfo.status === '正常' ? 'online' : equipmentInfo.status === '离线' ? 'offline' : equipmentInfo.status === '报警' ? 'alarm' : 'text'"> {{ equipmentInfo.status }}</span>
       </div>
@@ -35,11 +39,13 @@
   latitude: "", //纬度
   longtitude: "", // 经度
   status: "", // 设备状态
+  simid:"", //手机号
 })
 onMounted(() => {
   equipmentInfo.value.devCode = $route.query.devCode as string  // 设备编号
   equipmentInfo.value.doorName = $route.query.doorName as string  // 设备名称
   equipmentInfo.value.position = $route.query.position as string  // 详细地址
+  equipmentInfo.value.simid = $route.query.simid as string  // 手机号
   position.value = [$route.query.longtitude as string, $route.query.latitude as string] // 经纬度
   equipmentInfo.value.status = $route.query.status as string  // 设备状态
 })
diff --git a/src/views/administrator/equipment/index.vue b/src/views/administrator/equipment/index.vue
index a313cf5..0cbea5c 100644
--- a/src/views/administrator/equipment/index.vue
+++ b/src/views/administrator/equipment/index.vue
@@ -98,11 +98,10 @@
   console.log(window.scrollY, windowHeight, scrollHeight - 60);
   
   if (Number(window.scrollY) + windowHeight >= scrollHeight - 60) {
-    showLoading.value = true
+    // showLoading.value = true
     onBottom()
   }
 };
-
 // 确定选择状态
 const onConfirm = (val: string[]) => {
   const typeTest = val[0]
@@ -113,6 +112,7 @@
 
 function onBottom() { // 触底加载
   if ((listQuery.value.pageNo * listQuery.value.pageSize) < total.value) {
+    showLoading.value = true
     listQuery.value.pageNo++
     fetchEquipmentList(true)
   } 
@@ -125,6 +125,7 @@
     listQuery.value.pageNo = 1
   }
   getEquipmentList(listQuery.value).then((res) => {
+    showLoading.value = true
     if(isNowPage) {
       list.value = list.value.concat(res.data.records)
     } else {
diff --git a/src/views/user/device/index.vue b/src/views/user/device/index.vue
index 0da5a42..05fbf06 100644
--- a/src/views/user/device/index.vue
+++ b/src/views/user/device/index.vue
@@ -93,7 +93,7 @@
   padding: 20px;
   padding-top: 58px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .device {
diff --git a/src/views/user/deviceLogs/index.vue b/src/views/user/deviceLogs/index.vue
index de9efbd..091bb5c 100644
--- a/src/views/user/deviceLogs/index.vue
+++ b/src/views/user/deviceLogs/index.vue
@@ -40,7 +40,7 @@
   console.log(window.scrollY, windowHeight, scrollHeight - 60);
   
   if (Number(window.scrollY) + windowHeight >= scrollHeight - 60) {
-    showLoading.value = true
+    // showLoading.value = true
     onBottom()
   }
   };
@@ -57,6 +57,7 @@
 }
   function onBottom() { // 触底加载
   if ((listQuery.value.pageNo * listQuery.value.pageSize) < total.value) {
+    showLoading.value = true
     listQuery.value.pageNo++
     getLogsList()
   }