From d95b36a88357d018f76d926e9074c521eb8335a7 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/login.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index ba59cc7..82cadab 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -105,6 +105,7 @@
loginInfo: {
firstLogin: 1
},
+ roles:[],
newPassword: undefined,
confirmPassword: undefined,
loginRules: {
@@ -185,13 +186,15 @@
this.$store.dispatch("Login", this.loginForm).then((res) => {
getInfo().then(loginInfo => {
this.loginInfo = loginInfo.user
+ this.roles = loginInfo.roles
//濡傛灉杩斿洖涓�1姝ｅ父璺宠浆
if (this.loginInfo.firstLogin == 1) {
// this.$router.push({ path: "/" }).catch(() => { });
// return;
- if (this.loginInfo.roles.includes("admin") || this.loginInfo.roles.includes("city_leader") || this.loginInfo.roles.includes("county_leader")) {
- this.$router.push({path: this.redirect || "/screen"}).catch(() => {
- });
+ if (this.roles .includes("admin") || this.roles .includes("city_leader")) {
+ this.$router.push({
+ path: '/screen'
+ })
} else {
this.$router.push({path: this.redirect || "/index"}).catch(() => {
});
--
Gitblit v1.8.0