|
@@ -19,12 +19,11 @@ const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
|
|
|
const navbarLsit = ['/home', '/news', '/shopping', '/personal'] //显示navbar的页面
|
|
const navbarLsit = ['/home', '/news', '/shopping', '/personal'] //显示navbar的页面
|
|
|
|
|
|
|
|
//需要token的名单
|
|
//需要token的名单
|
|
|
-const demandTokenList = ['/news', '/shopping', '/personal','/toBePaid','/confirmOrder']
|
|
|
|
|
|
|
+const demandTokenList = ['/news', '/shopping', '/personal','/toBePaid','/confirmOrder','/linePayConfirm']
|
|
|
|
|
|
|
|
router.beforeEach(async (to, from, next) => {
|
|
router.beforeEach(async (to, from, next) => {
|
|
|
// start progress bar
|
|
// start progress bar
|
|
|
// NProgress.start()
|
|
// NProgress.start()
|
|
|
-
|
|
|
|
|
// set page title
|
|
// set page title
|
|
|
// document.title = getPageTitle(to.meta.title)
|
|
// document.title = getPageTitle(to.meta.title)
|
|
|
|
|
|
|
@@ -55,12 +54,12 @@ router.beforeEach(async (to, from, next) => {
|
|
|
} else {
|
|
} else {
|
|
|
if (hasToken) {
|
|
if (hasToken) {
|
|
|
// //这里控制个人订单不可回退到确认订单
|
|
// //这里控制个人订单不可回退到确认订单
|
|
|
- // if(from.path=='/toBePaid'&&to.path=='/confirmOrder'){
|
|
|
|
|
- // next(`/personal`)
|
|
|
|
|
- // }else{
|
|
|
|
|
- // next()
|
|
|
|
|
- // }
|
|
|
|
|
- next()
|
|
|
|
|
|
|
+ if(from.path=='/toBePaid'&&to.path=='/linePayConfirm'){
|
|
|
|
|
+ next(`/personal`)
|
|
|
|
|
+ }else{
|
|
|
|
|
+ next()
|
|
|
|
|
+ }
|
|
|
|
|
+ //next()
|
|
|
} else {
|
|
} else {
|
|
|
Dialog
|
|
Dialog
|
|
|
.confirm({
|
|
.confirm({
|