From f7ea8e13ec84e2e3264b949c8c26cc05491627a6 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 18 Apr 2025 16:05:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=94=81=E5=B1=8F?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81Basd64=E7=BC=96=E7=A0=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E5=AF=86=E7=A0=81=E7=9B=B4=E6=8E=A5=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ForcePasswdChange/index.vue | 1 -
 src/i18n/locales/en-US.ts                  | 2 +-
 src/i18n/locales/zh-CN.ts                  | 2 +-
 src/store/modules/mask.ts                  | 4 ++--
 src/views/tool/lockScreen/index.vue        | 7 +++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/ForcePasswdChange/index.vue b/src/components/ForcePasswdChange/index.vue
index 52d65f2f..c433ad35 100644
--- a/src/components/ForcePasswdChange/index.vue
+++ b/src/components/ForcePasswdChange/index.vue
@@ -122,7 +122,6 @@ onMounted(() => {
         } else {
           data.alertHours = (data.alertHours / 24).toFixed(2);
         }
-        console.log(data);
         modalState.passwdExpire = data;
         modalState.passwdExpireEnable = data.expHours > 0;
       } catch (error) {
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 73f9aecb..81eda374 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -130,7 +130,7 @@ export default {
     },
     LockScreen: {
       inputPlacePwd:'Lock Screen Password',
-      validSucc:'Validation Passed',
+      enter:'Enter',
       validError:'Validation Failure',
       backLogin:'Logout to Relogin',
       backReload:'Restarting now, please wait...',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 1ff6ecb5..7409e77c 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -130,7 +130,7 @@ export default {
     },
     LockScreen: {
       inputPlacePwd:'请输入锁屏密码',
-      validSucc:'校验通过',
+      enter:'进入',
       validError:'校验失败',
       backLogin:'退出并重新登录',
       backReload:'正在重启，请稍等...',
diff --git a/src/store/modules/mask.ts b/src/store/modules/mask.ts
index dc6a03c7..5e4a6a5f 100644
--- a/src/store/modules/mask.ts
+++ b/src/store/modules/mask.ts
@@ -20,7 +20,7 @@ type MaskStateType = {
 const useMaskStore = defineStore('mask', {
   state: (): MaskStateType => ({
     type: (localGet(CACHE_LOCAL_MASK) || 'none') as MaskStateType['type'],
-    lockPasswd: localGet(CACHE_LOCAL_LOCK_PASSWD) || '',
+    lockPasswd: atob(localGet(CACHE_LOCAL_LOCK_PASSWD) || ''),
     lockTimeout: 0,
   }),
   getters: {},
@@ -59,7 +59,7 @@ const useMaskStore = defineStore('mask', {
         }, 5_000);
       }
       if (type === 'lock') {
-        localSet(CACHE_LOCAL_LOCK_PASSWD, this.lockPasswd);
+        localSet(CACHE_LOCAL_LOCK_PASSWD, btoa(this.lockPasswd));
       } else {
         localRemove(CACHE_LOCAL_LOCK_PASSWD);
       }
diff --git a/src/views/tool/lockScreen/index.vue b/src/views/tool/lockScreen/index.vue
index 4199e56f..60232810 100644
--- a/src/views/tool/lockScreen/index.vue
+++ b/src/views/tool/lockScreen/index.vue
@@ -29,7 +29,6 @@ const password = ref('');
 /**解锁 */
 function handleUnlock() {
   if (maskStore.lockPasswd === password.value) {
-    message.success(t('components.LockScreen.validSucc'), 3);
     password.value = '';
     maskStore.handleMaskType('none');
     const redirectPath = route.query?.redirect || '/index';
@@ -79,7 +78,7 @@ onMounted(() => {
         </span>
       </div>
       <div class="lock-screen_login-from">
-        <a-input-group compact>
+        <a-input-group compact v-if="maskStore.lockPasswd">
           <a-input
             type="password"
             v-model:value="password"
@@ -92,6 +91,10 @@ onMounted(() => {
             <LoginOutlined />
           </a-button>
         </a-input-group>
+        <a-button type="primary" block @click="handleUnlock" v-else>
+          {{ t('components.LockScreen.enter') }}
+        </a-button>
+
         <a-button type="text" class="logout" @click="handleBackLogin">
           {{ t('components.LockScreen.backLogin') }}
         </a-button>