From 694ffa950bf2435affef95272c7bfd6b62704639 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/Navbar.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3876bf3..ba4d987 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -24,7 +24,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" :append-to-body="true">
+ <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" :append-to-body="true" width="40%">
<el-form :model="form">
<el-form-item label="鏃у瘑鐮�" :label-width="formLabelWidth">
<el-input v-model="form.oldPwd" autocomplete="off"></el-input>
@@ -64,6 +64,10 @@
newPwd: '',
confirmPwd: ''
},
+ user: {
+ id: null,
+ name: 'value'
+ },
dialogFormVisible: false,
formLabelWidth: '120px',
user: {
@@ -103,11 +107,15 @@
},
async logout() {
// await this.$store.dispatch('user/logout')
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ sessionStorage.removeItem("user")
+ this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ this.$router.replace({path: '/login'});
+ location.reload();
},
getUser(){
get(this.$url.info).then(res=>{
this.user = res.data
+ sessionStorage.setItem("user",JSON.stringify(res.data))
})
}
}
--
Gitblit v1.9.3