diff --git a/pages/addDevice/searchDevice.vue b/pages/addDevice/searchDevice.vue
index e2519db..07cdffc 100644
--- a/pages/addDevice/searchDevice.vue
+++ b/pages/addDevice/searchDevice.vue
@@ -4,7 +4,7 @@
v-if="deviceInfo"
class="scroll-view"
scroll-y="true"
- :style="{ height: deviceInfo.screenHeight - deviceInfo.statusBarHeight + 'px' }"
+ :style="{ height: deviceInfo.windowHeight - deviceInfo.statusBarHeight + 'px' }"
>
.search {
- padding: 32rpx;
width: 686rpx !important;
+ padding: 32rpx;
}
.item {
display: flex;
align-items: center;
- background-color: #ffffff;
- height: 120rpx;
width: 750rpx;
+ height: 120rpx;
+ background-color: #ffffff;
.item-left {
- margin-left: 32rpx;
width: 80rpx;
height: 80rpx;
+ margin-left: 32rpx;
}
.item-right {
+ width: 574rpx;
margin-right: 32rpx;
margin-left: 32rpx;
- width: 574rpx;
.item-right-top {
max-width: 400rpx;
- font-size: 32rpx;
- font-weight: bold;
padding-bottom: 6rpx;
- white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ font-size: 32rpx;
+ font-weight: bold;
+ white-space: nowrap;
}
.item-right-bottom {
@@ -266,9 +266,9 @@
}
.empty-list-text {
- text-align: center;
font-size: 32rpx;
color: #999999;
+ text-align: center;
}
.status {
diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue
index 2bb62fb..bd24e25 100644
--- a/pages/main/lockDetail.vue
+++ b/pages/main/lockDetail.vue
@@ -3,7 +3,7 @@
diff --git a/pages/setting/openDoorNotice.vue b/pages/setting/openDoorNotice.vue
index 46d158e..0ef7310 100644
--- a/pages/setting/openDoorNotice.vue
+++ b/pages/setting/openDoorNotice.vue
@@ -8,7 +8,7 @@
scroll-y="true"
:style="{
height:
- deviceInfo.screenHeight -
+ deviceInfo.windowHeight -
deviceInfo.safeArea.top -
(deviceInfo.screenWidth / 750) * 128 +
'px'
diff --git a/pages/setting/selectGroup.vue b/pages/setting/selectGroup.vue
index 71364b3..53c15ad 100644
--- a/pages/setting/selectGroup.vue
+++ b/pages/setting/selectGroup.vue
@@ -3,7 +3,7 @@