Merge branch 'develop' into FOTON

src/main.js

@@ -105,20 +105,6 @@ 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){
@@ -147,8 +133,6 @@ router.beforeEach(function (to, from, next) {
   }else {
     extractedVerify(token)
   }
-  }
-
   function extractedVerify() {
     if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
       get_verify_by_instance({
@@ -230,9 +214,25 @@ router.beforeEach(function (to, from, next) {
                 extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
               }
             }
+          } 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()
+          }
         }
         function extracted(routerPath) {
           if (token === null || token === '') {