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