From ab960f8edd8bf73ae1813ba17b13d90ab0cc884d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 18:36:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=8A=B6=E6=80=81=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/keyList/keyList.vue           |  3 +++
 pages/passwordList/passwordList.vue | 20 ++++++++++++++++----
 stores/lock.js                      |  9 +++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

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 @@
               <view class="password" @click="toPasswordDetail(password)">
                 <image class="password-left" src="/static/images/icon_lock_transparent.png" mode="aspectFill"></image>
                 <view class="password-right">
-                  <view class="password-right-top">{{ password.keyboardPwdName }}</view>
+                  <view style="display: flex; align-items: center">
+                    <view class="password-right-top">{{ password.keyboardPwdName }}</view>
+                    <view class="key-status">
+                      {{ getPasswordStatus(password.keyboardPwdStatus) }}
+                    </view>
+                  </view>
                   <view class="password-right-bottom">{{ password.timeText }}</view>
                 </view>
               </view>
@@ -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;
+}
 </style>
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 '永久'