From 954e545eb73a8951cec9cb766ccd3a1af5127757 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 14:05:55 +0800 Subject: [PATCH] feat: There is no way the, --- src/main.js | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main.js b/src/main.js index 2ba26a5fc..44ae0505e 100644 --- a/src/main.js +++ b/src/main.js @@ -72,7 +72,7 @@ router.beforeEach(function (to, from, next) { let prcType = to.query.prcType; let routerType = to.query.routerType; let param = "taskIds=" + taskId + "&prcId=" + prcId - + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; + + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; let param4 = { path: path, token: token, @@ -105,50 +105,34 @@ router.beforeEach(function (to, from, next) { localStorage.setItem('routerParam', param) } // 返回值为登录状态 - /** 判断是不是在手机端操作 */ - if (isMobile()) { - if ((token === null || token === '' ) && toName !== 'Login') { - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') - } else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + - '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - if (toName.slice(0,5) !== 'phone') { - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } - } - } else { - if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() - }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } - } - }else if(webLoginType != null && webLoginType === 'dev'){ - if (isMobile()) { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) - } else { - next('/Login') + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev } - } - }else { - extractedVerify(token) - } - } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } + }else { + extractedVerify(token) + } function extractedVerify() { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { get_verify_by_instance({ @@ -231,7 +215,23 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if (token === null || token === '') { + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + } else { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + if (toName.slice(0,5) !== 'phone') { + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } + } + } else { + extracted3() + } + // extracted3() } } function extracted(routerPath) {