From 32eabf880d6f9b7717c182c7d71b08e0ddec18ff Mon Sep 17 00:00:00 2001
From: liuwei <liuwei@wdtrgf.com.cn>
Date: Thu, 23 Apr 2026 09:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E9=A1=B5=EF=BC=9A=E6=9B=B4=E6=AD=A3base=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=87=E7=AD=BE=E9=97=AD=E5=90=88=E4=B8=8E=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

变更项：

1. 修复 base.html 顶栏修改密码按钮闭合错误（el-button 被误写为 div）。

2. 移除可选链写法，改为兼容语法，避免低版本浏览器脚本解析失败。

3. 调整 app-container 默认可见，避免脚本异常时整页因 opacity=0 看起来空白。

4. 确认密码校验函数使用稳定上下文引用，避免 this 访问异常。
---
 admin/dashboard/templates/base.html | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/admin/dashboard/templates/base.html b/admin/dashboard/templates/base.html
index a006b53..624d5c4 100644
--- a/admin/dashboard/templates/base.html
+++ b/admin/dashboard/templates/base.html
@@ -63,7 +63,7 @@
 
         .app-container {
             min-height: 100vh;
-            opacity: 0;
+            opacity: 1;
             transition: opacity .24s ease;
         }
 
@@ -764,7 +764,7 @@
                 </div>
                 <el-button type="text" class="account-btn" @click="openPasswordDialog">
                     <i class="el-icon-lock"></i> 修改密码
-                </div>
+                </el-button>
                 <el-button type="text" class="logout-btn" @click="logout">
                     <i class="el-icon-switch-button"></i> 退出
                 </el-button>
@@ -917,6 +917,7 @@
 
     const baseApp = {
         data() {
+            const vm = this;
             return {
                 currentView: '1',
                 timeRange: '7',
@@ -941,8 +942,8 @@
                     confirm_password: [
                         { required: true, message: '请再次输入新密码', trigger: 'blur' },
                         {
-                            validator: (rule, value, callback) => {
-                                if (value !== this.passwordForm.new_password) {
+                            validator: function(rule, value, callback) {
+                                if (value !== vm.passwordForm.new_password) {
                                     callback(new Error('两次输入的新密码不一致'));
                                     return;
                                 }
@@ -1065,7 +1066,14 @@
                             this.passwordDialogVisible = false;
                         })
                         .catch((error) => {
-                            const errorMsg = error?.response?.data?.error || '修改密码失败，请稍后重试';
+                            let errorMsg = '修改密码失败，请稍后重试';
+                            try {
+                                if (error && error.response && error.response.data && error.response.data.error) {
+                                    errorMsg = error.response.data.error;
+                                }
+                            } catch (e) {
+                                // 读取错误信息失败时保持默认文案即可。
+                            }
                             this.$message.error(errorMsg);
                         })
                         .finally(() => {