From 0aa17466797fc0a53299c6fc2262fd344156ed3f Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Thu, 25 Sep 2025 19:38:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-navbar-update-password.vue | 129 ++++++++++++----------
 1 file changed, 71 insertions(+), 58 deletions(-)

diff --git a/src/views/main-navbar-update-password.vue b/src/views/main-navbar-update-password.vue
index c9390b0..1eb03c6 100644
--- a/src/views/main-navbar-update-password.vue
+++ b/src/views/main-navbar-update-password.vue
@@ -1,9 +1,12 @@
 <template>
-  <el-dialog
-    title="修改密码"
-    :visible.sync="visible"
-    :append-to-body="true">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+  <el-dialog title="修改密码" :visible.sync="visible" :append-to-body="true">
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="80px"
+    >
       <el-form-item label="账号">
         <span>{{ userName }}</span>
       </el-form-item>
@@ -25,60 +28,68 @@
 </template>
 
 <script>
-  import { clearLoginInfo } from '@/utils'
-  export default {
-    data () {
-      var validateConfirmPassword = (rule, value, callback) => {
-        if (this.dataForm.newPassword !== value) {
-          callback(new Error('确认密码与新密码不一致'))
-        } else {
-          callback()
-        }
+import { clearLoginInfo } from '@/utils'
+export default {
+  data() {
+    var validateConfirmPassword = (rule, value, callback) => {
+      if (this.dataForm.newPassword !== value) {
+        callback(new Error('确认密码与新密码不一致'))
+      } else {
+        callback()
       }
-      return {
-        visible: false,
-        dataForm: {
-          password: '',
-          newPassword: '',
-          confirmPassword: ''
-        },
-        dataRule: {
-          password: [
-            { required: true, message: '原密码不能为空', trigger: 'blur' }
-          ],
-          newPassword: [
-            { required: true, message: '新密码不能为空', trigger: 'blur' }
-          ],
-          confirmPassword: [
-            { required: true, message: '确认密码不能为空', trigger: 'blur' },
-            { validator: validateConfirmPassword, trigger: 'blur' }
-          ]
-        }
+    }
+    return {
+      visible: false,
+      dataForm: {
+        password: '',
+        newPassword: '',
+        confirmPassword: ''
+      },
+      dataRule: {
+        password: [
+          { required: true, message: '原密码不能为空', trigger: 'blur' }
+        ],
+        newPassword: [
+          { required: true, message: '新密码不能为空', trigger: 'blur' }
+        ],
+        confirmPassword: [
+          { required: true, message: '确认密码不能为空', trigger: 'blur' },
+          { validator: validateConfirmPassword, trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    userName: {
+      get() {
+        return this.$store.state.user.name
       }
     },
-    computed: {
-      userName: {
-        get () { return this.$store.state.user.name }
+    mainTabs: {
+      get() {
+        return this.$store.state.common.mainTabs
       },
-      mainTabs: {
-        get () { return this.$store.state.common.mainTabs },
-        set (val) { this.$store.commit('common/updateMainTabs', val) }
+      set(val) {
+        this.$store.commit('common/updateMainTabs', val)
       }
+    }
+  },
+  methods: {
+    // 初始化
+    init() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
     },
-    methods: {
-      // 初始化
-      init () {
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$api.password(this.dataForm.password,this.dataForm.newPassword).then(({data}) => {
-              if (data && data.code === 0) {
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          this.$api
+            .password(this.dataForm.password, this.dataForm.newPassword)
+            .then(({ data }) => {
+              if (data && data.success) {
                 this.$message({
                   message: '操作成功',
                   type: 'success',
@@ -88,7 +99,10 @@
                     this.$nextTick(() => {
                       this.mainTabs = []
                       clearLoginInfo()
-                      this.$router.replace({ name: 'login' })
+                      this.$api.logout().then(({ data }) => {
+                        clearLoginInfo()
+                        this.$router.push({ name: 'login' })
+                      })
                     })
                   }
                 })
@@ -96,10 +110,9 @@
                 this.$message.error(data.msg)
               }
             })
-          }
-        })
-      }
+        }
+      })
     }
   }
+}
 </script>
-