Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fns_backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xiaojie
fns_backend
Commits
36172511
Commit
36172511
authored
Oct 15, 2021
by
chenqikuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
59b0df16
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
11 deletions
+45
-11
.env.normal
.env.normal
+2
-0
.env.platform
.env.platform
+2
-0
package.json
package.json
+7
-2
index.ts
src/router/index.ts
+34
-9
No files found.
.env.normal
0 → 100644
View file @
36172511
VUE_APP_MODE=normal
\ No newline at end of file
.env.platform
0 → 100644
View file @
36172511
VUE_APP_MODE=platform
\ No newline at end of file
package.json
View file @
36172511
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
"private"
:
true
,
"private"
:
true
,
"scripts"
:
{
"scripts"
:
{
"serve"
:
"vue-cli-service serve"
,
"serve"
:
"vue-cli-service serve"
,
"build"
:
"vue-cli-service build --report"
,
"platform"
:
"vue-cli-service serve --mode platform"
,
"normal"
:
"vue-cli-service serve --mode normal"
,
"buildPlatform"
:
"vue-cli-service build --mode platform"
,
"buildNormal"
:
"vue-cli-service build --mode normal"
,
"build"
:
"vue-cli-service build --mode report"
,
"bd"
:
"npm run build & bash deploy.sh"
"bd"
:
"npm run build & bash deploy.sh"
},
},
"dependencies"
:
{
"dependencies"
:
{
...
@@ -52,4 +56,4 @@
...
@@ -52,4 +56,4 @@
"last 2 versions"
,
"last 2 versions"
,
"not dead"
"not dead"
]
]
}
}
\ No newline at end of file
src/router/index.ts
View file @
36172511
...
@@ -3,7 +3,7 @@ import { getOldRoleFromUserMsg } from '@/utils/user'
...
@@ -3,7 +3,7 @@ import { getOldRoleFromUserMsg } from '@/utils/user'
import
{
getUserMsg
}
from
'@/utils/userMsg/userMsg'
import
{
getUserMsg
}
from
'@/utils/userMsg/userMsg'
import
{
menuList
}
from
'@/views/Root/getMenuList'
import
{
menuList
}
from
'@/views/Root/getMenuList'
import
Vue
from
'vue'
import
Vue
from
'vue'
import
VueRouter
,
{
RouteConfig
}
from
'vue-router'
import
VueRouter
,
{
RouteConfig
,
Route
}
from
'vue-router'
const
Index
=
()
=>
import
(
'@/views/Root/index.vue'
)
const
Index
=
()
=>
import
(
'@/views/Root/index.vue'
)
...
@@ -63,21 +63,46 @@ const router = new VueRouter({
...
@@ -63,21 +63,46 @@ const router = new VueRouter({
routes
,
routes
,
})
})
const
redirectConfig
=
{
platform
:
'adminLogin'
,
normal
:
'login'
,
}
function
getRedirectRouteName
()
{
if
(
process
.
env
.
VUE_APP_MODE
===
'platform'
)
{
return
redirectConfig
.
platform
}
else
if
(
process
.
env
.
VUE_APP_MODE
)
{
return
redirectConfig
.
normal
}
}
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
console
.
log
({
from
,
to
})
console
.
log
({
from
,
to
})
const
redirectRouteName
=
getRedirectRouteName
()
const
usermsg
=
getUserMsg
()
const
usermsg
=
getUserMsg
()
if
(
usermsg
===
undefined
)
{
if
(
usermsg
===
undefined
)
{
/* 没有登录 */
/* 没有登录 */
if
(
to
.
name
==
'adminLogin'
||
to
.
name
==
'login'
)
{
if
(
redirectRouteName
===
undefined
)
{
console
.
log
(
1
)
if
(
to
.
name
==
'adminLogin'
||
to
.
name
==
'login'
)
{
console
.
log
(
1
)
next
()
next
()
}
else
{
console
.
log
(
2
)
next
({
name
:
'login'
,
})
}
}
else
{
}
else
{
console
.
log
(
2
)
if
(
to
.
name
===
redirectRouteName
)
{
next
({
next
()
name
:
'login'
,
console
.
log
(
1
)
})
}
else
{
next
({
name
:
redirectRouteName
,
})
}
}
}
}
else
{
}
else
{
console
.
log
(
3
)
console
.
log
(
3
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment