diff --git a/src/main.js b/src/main.js index add9eb6ed..b4b8f57ad 100644 --- a/src/main.js +++ b/src/main.js @@ -116,16 +116,20 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - if (toName === 'processCenter') { - next() - }else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) }else { - extractedVerify(token) + if(toName !== 'blankPage'){ + if(to.matched.length == 0){ + next('/blankPage') + }else { + next() + } + }else { + next() + } } } } else { @@ -147,7 +151,12 @@ router.beforeEach(function (to, from, next) { } } }else if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } }else { extractedVerify(token) @@ -236,11 +245,7 @@ router.beforeEach(function (to, from, next) { } } } else { - if (isMobile()){ - next() - } else { - extracted3() - } + extracted3() } } function extracted(routerPath) { @@ -284,17 +289,9 @@ router.beforeEach(function (to, from, next) { } if(path === '/loginVerify'){ if(webLoginType != null && webLoginType === 'dev'){ - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next('/Login') }else { - if(isMobile()) { - next('/blankPage') - } else { - next('/Login') - } + next() } }else { next()