feat:new
This commit is contained in:
+21
-24
@@ -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()
|
||||
|
||||
@@ -28,6 +28,7 @@ export default {
|
||||
});
|
||||
},
|
||||
loginNew (res) {
|
||||
window.sessionStorage.clear()
|
||||
let Base64 = require('js-base64').Base64
|
||||
let userInfoStr = Base64.decode(res.data)
|
||||
let userInfo2 = decodeURIComponent(userInfoStr)
|
||||
|
||||
Reference in New Issue
Block a user