From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/router/index.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index a9d2ce8..0078cd0 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -9,7 +9,8 @@
Vue.use(VueRouter)
const router = new VueRouter({
- base: process.env.VUE_APP_CONTEXT_PATH + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : ''),
+ // + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : '')
+ base: process.env.VUE_APP_CONTEXT_PATH,
mode: process.env.VUE_APP_ROUTER_MODE,
routes: [
// 鐧诲綍
@@ -66,6 +67,10 @@
next()
return
}
+ if (to.name === 'login') {
+ next()
+ return
+ }
getUserInfo()
.then(userInfo => {
// 濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄦ潈闄�
--
Gitblit v1.9.3