From 1c84565d624ad0cce0576a22d0323cf3181d49cd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:56:28 +0800
Subject: [PATCH] Merge branch 'dev'
---
platform_web/src/components/common/CommonHeader.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/platform_web/src/components/common/CommonHeader.vue b/platform_web/src/components/common/CommonHeader.vue
index 37f8e15..d1416c8 100644
--- a/platform_web/src/components/common/CommonHeader.vue
+++ b/platform_web/src/components/common/CommonHeader.vue
@@ -149,7 +149,11 @@
logout()
.then(() => {
this.setUserInfo(null)
+<<<<<<< HEAD
// this.$router.push({ path: '/login' })
+=======
+ // this.$router.push({ name: 'login' })
+>>>>>>> dev
window.location.reload()
})
.catch(e => {
--
Gitblit v1.9.3