diff --git a/manifest.json b/manifest.json index 20de3bb..295fa45 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__933D519", "description" : "", "versionName" : "1.2.0", - "versionCode" : "31", + "versionCode" : "32", "transformPx" : false, /* 小程序特有相关 */ "mp-weixin" : { diff --git a/pages/autoLock/autoLock.vue b/pages/autoLock/autoLock.vue index 36c5590..5df0ec2 100644 --- a/pages/autoLock/autoLock.vue +++ b/pages/autoLock/autoLock.vue @@ -101,7 +101,7 @@ check.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLock === 1 value.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLockSecond const index = columns.value[0].findIndex(item => item.value === value.value) - if (index === -1) { + if (check.value && index === -1) { custom.value = true picker.value = [5] text.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLockSecond.toString() diff --git a/pages/createCard/createCard.vue b/pages/createCard/createCard.vue index 043c19c..cc5925e 100644 --- a/pages/createCard/createCard.vue +++ b/pages/createCard/createCard.vue @@ -210,7 +210,6 @@ const setTime = () => { const now = new Date() - now.setMinutes(0, 0, 0) return now.getTime() } diff --git a/pages/createFace/createFace.vue b/pages/createFace/createFace.vue index cdb902e..8c1be34 100644 --- a/pages/createFace/createFace.vue +++ b/pages/createFace/createFace.vue @@ -182,7 +182,6 @@ const setTime = () => { const now = new Date() - now.setMinutes(0, 0, 0) return now.getTime() } diff --git a/pages/createFingerprint/createFingerprint.vue b/pages/createFingerprint/createFingerprint.vue index bf771dc..9c7116a 100644 --- a/pages/createFingerprint/createFingerprint.vue +++ b/pages/createFingerprint/createFingerprint.vue @@ -210,7 +210,6 @@ const setTime = () => { const now = new Date() - now.setMinutes(0, 0, 0) return now.getTime() } diff --git a/pages/createPalmVein/createPalmVein.vue b/pages/createPalmVein/createPalmVein.vue index 134e4be..458a0e9 100644 --- a/pages/createPalmVein/createPalmVein.vue +++ b/pages/createPalmVein/createPalmVein.vue @@ -211,7 +211,6 @@ const setTime = () => { const now = new Date() - now.setMinutes(0, 0, 0) return now.getTime() } diff --git a/pages/createRemote/createRemote.vue b/pages/createRemote/createRemote.vue index 90f6cdd..787e32b 100644 --- a/pages/createRemote/createRemote.vue +++ b/pages/createRemote/createRemote.vue @@ -158,7 +158,6 @@ const setTime = () => { const now = new Date() - now.setMinutes(0, 0, 0) return now.getTime() } diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue index 7dda053..4eaf735 100644 --- a/pages/lockDetail/lockDetail.vue +++ b/pages/lockDetail/lockDetail.vue @@ -57,7 +57,10 @@ class="menu-main-view" @click="routeJump({ name: 'keyList' })" > - + 电子钥匙 - + @@ -115,10 +121,13 @@ class="menu-main-view" @click="routeJump({ name: 'adminList' })" > - + 授权管理员 - + 操作记录 @@ -526,8 +535,8 @@ .menu-main-image { margin-bottom: 10rpx; - width: 60rpx; - height: 60rpx; + width: 40rpx; + height: 40rpx; } } } @@ -558,8 +567,8 @@ .setting-image { margin-left: 32rpx; - width: 48rpx; - height: 48rpx; + width: 40rpx; + height: 40rpx; } } diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index c79845f..f309cf1 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -27,7 +27,7 @@