Merge branch 'develop' into FOTON

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 ((token === null || token === '' ) && toName !== 'Login') {
-  if (isMobile()) {
+    if(webLoginType != null && webLoginType === 'idm' ){
-    if ((token === null || token === '' ) && toName !== 'Login') {
+      if(code){
-      sessionStorage.setItem('param',JSON.stringify(param4))
+        next()
-      next('/phoneIndex')
+      }else {
-    } else {
+        if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
-      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()) {
           extractedVerify(token)
-        } else {
+        }else {
-          next('/Login')
+          if(path === '/standardSearch/All'){
+            extractedLocalStorage('standardSearch/All','');
+          }else {
+            extractedLocalStorage('home2','');
+          }
+          // ssoLoginUrlDev 默认sso 地址
+          window.location.href = ssoLoginUrlDev
         }
-
       }
-    }else {
+    }else if(webLoginType != null && webLoginType === 'dev'){
-      extractedVerify(token)
+      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) {