diff --git a/src/main.js b/src/main.js
index 44ae0505e..95d9b4ba1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -105,34 +105,49 @@ router.beforeEach(function (to, from, next) {
localStorage.setItem('routerParam', param)
}
// 返回值为登录状态
- if ((token === null || token === '' ) && toName !== 'Login') {
- if(webLoginType != null && webLoginType === 'idm' ){
- if(code){
- next()
+ /** 判断是不是在手机端操作 */
+ if (isMobile()) {
+ if ((token === null || token === '' ) && toName !== 'Login') {
+ if(toName !== 'phoneIndex'){
+ sessionStorage.setItem('param',JSON.stringify(param4))
+ next('/phoneIndex')
}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
- }
+ next()
}
- }else if(webLoginType != null && webLoginType === 'dev'){
- if (isMobile()) {
- extractedVerify(token)
- } else {
- next('/Login')
+ } else {
+ next()
+ }
+ } 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()) {
+ extractedVerify(token)
+ } else {
+ next('/Login')
+ }
+
}
-
+ }else {
+ extractedVerify(token)
}
- }else {
- extractedVerify(token)
}
+
function extractedVerify() {
if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
get_verify_by_instance({
@@ -215,23 +230,7 @@ router.beforeEach(function (to, from, next) {
}
}
} else {
- /** 判断是不是在手机端操作 */
- 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()
+ extracted3()
}
}
function extracted(routerPath) {
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 8503a7890..2a698bdbd 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -5,64 +5,64 @@
标准法规政策相关流程