From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/router/index.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index a9d2ce8..db35fa8 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: [
// 鐧诲綍
@@ -59,13 +60,17 @@
return
}
// 濡傛灉璁块棶鐨勬槸鐧诲綍椤甸潰锛屽垯鐩存帴璺宠浆鑷抽椤�
- if (to.name === 'login') {
- next({ name: 'index' })
- return
- }
+ // if (to.name === 'login') {
+ // next({ name: 'index' })
+ // return
+ // }
next()
return
}
+ if (to.name === 'login') {
+ next()
+ return
+ }
getUserInfo()
.then(userInfo => {
// 濡傛灉鐢ㄦ埛涓嶅瓨鍦ㄦ潈闄�
--
Gitblit v1.9.3