diff --git a/admin-web/src/views/ChangePassword.vue b/admin-web/src/views/ChangePassword.vue
index 3d6e876..27a14e8 100644
--- a/admin-web/src/views/ChangePassword.vue
+++ b/admin-web/src/views/ChangePassword.vue
@@ -9,7 +9,11 @@ const form = reactive({ currentPassword: '', newPassword: '', confirmPassword: '
 const loading = ref(false)
 
 async function submit() {
-  if (form.newPassword.length < 12) return message.error('新密码至少 12 位')
+  if (loading.value) return
+  if (!form.currentPassword) return message.error('请输入当前密码')
+  if (form.newPassword.length < 12 || form.newPassword.length > 128) {
+    return message.error('新密码长度必须为 12 到 128 位')
+  }
   if (form.newPassword !== form.confirmPassword) return message.error('两次输入的新密码不一致')
   loading.value = true
   try {
@@ -42,11 +46,15 @@ async function logout() {
           <a-input-password v-model:value="form.newPassword" autocomplete="new-password" />
         </a-form-item>
         <a-form-item label="确认新密码" required>
-          <a-input-password v-model:value="form.confirmPassword" autocomplete="new-password" />
+          <a-input-password
+            v-model:value="form.confirmPassword"
+            autocomplete="new-password"
+            @pressEnter="submit"
+          />
         </a-form-item>
         <a-space style="width:100%;justify-content:flex-end">
           <a-button @click="logout">退出登录</a-button>
-          <a-button type="primary" html-type="submit" :loading="loading">保存密码</a-button>
+          <a-button type="primary" html-type="submit" :loading="loading" @click="submit">保存密码</a-button>
         </a-space>
       </a-form>
     </section>