diff --git a/pages/keyList/keyList.vue b/pages/keyList/keyList.vue index fd41edf..5fe1e34 100644 --- a/pages/keyList/keyList.vue +++ b/pages/keyList/keyList.vue @@ -277,6 +277,9 @@ page { font-size: 32rpx; font-weight: bold; padding-bottom: 6rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .key-right-bottom { diff --git a/pages/passwordList/passwordList.vue b/pages/passwordList/passwordList.vue index 0f0a63f..d398ea6 100644 --- a/pages/passwordList/passwordList.vue +++ b/pages/passwordList/passwordList.vue @@ -20,7 +20,12 @@ - {{ password.keyboardPwdName }} + + {{ password.keyboardPwdName }} + + {{ getPasswordStatus(password.keyboardPwdStatus) }} + + {{ password.timeText }} @@ -81,7 +86,7 @@ export default { }, methods: { ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo']), - ...mapActions(useLockStore, ['getPasswordList', 'updateCurrentPasswordInfo', 'updatePasswordSearch']), + ...mapActions(useLockStore, ['getPasswordList', 'updateCurrentPasswordInfo', 'updatePasswordSearch', 'getPasswordStatus']), ...mapActions(useBluetoothStore, ['resetLockPassword', 'setLockPassword']), toPasswordDetail(password) { this.updateCurrentPasswordInfo(password) @@ -299,12 +304,13 @@ page { .password-right { margin-right: 32rpx; + margin-left: 32rpx; + width: 574rpx; .password-right-top { font-size: 32rpx; font-weight: bold; - padding-bottom: 10rpx; - width: 600rpx; + padding-bottom: 6rpx; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -335,4 +341,10 @@ page { font-size: 32rpx; color: #999999; } + +.key-status { + margin-left: auto; + font-size: 26rpx; + color: #df282d; +} diff --git a/stores/lock.js b/stores/lock.js index 362c94a..996d90f 100644 --- a/stores/lock.js +++ b/stores/lock.js @@ -101,6 +101,15 @@ export const useLockStore = defineStore('lock', { return '' } }, + getPasswordStatus(passwordStatus) { + if(passwordStatus === 2) { + return '已过期' + } else if(passwordStatus === 3) { + return '未生效' + } else { + return '' + } + }, getTimeLimit(keyType) { if(keyType === 1) { return '永久'