Merge branch 'develop' into FOTON

src/common/axios/index.js

@@ -8,6 +8,8 @@ import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
 import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
+import isMobile from "../../store/isMobile";
+
 import domMessage from '../messageOnce/messageOnce'
 
 const messageOnce = new domMessage()
@@ -67,6 +69,10 @@ _axios.interceptors.response.use(
         }
       }
       if(res.data && res.data.respCode && res.data.respCode === 'LE505'){
+          if (isMobile()) {
+              sessionStorage.removeItem("token")
+              return router.push('/phoneIndex')
+          }
           window.sessionStorage.clear()
           messageOnce.warning({
           message: '登录超时,请重新登录',

src/common/axiosV2/index.js

@@ -3,6 +3,8 @@ import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
 import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
+import isMobile from "../../store/isMobile";
+
 import domMessage from '../messageOnce/messageOnce'
 
 // import 'element-ui/lib/theme-chalk/index.css'
@@ -62,6 +64,10 @@ service.interceptors.response.use(
             }
         }
         if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
+            if (isMobile()) {
+                sessionStorage.removeItem("token")
+                return router.push('/phoneIndex')
+            }else {
                 window.sessionStorage.clear()
                 messageOnce.warning({
                     message: '登录超时,请重新登录',
@@ -74,6 +80,7 @@ service.interceptors.response.use(
                     return router.push('/login')
                 }
             }
+        }
       return res.data
     },
     error => {

src/main.js

@@ -109,6 +109,7 @@ router.beforeEach(function (to, from, next) {
   if (isMobile()) {
     if ((token === null || token === '' ) && toName !== 'Login') {
       if(toName !== 'phoneIndex'){
+        sessionStorage.removeItem("param");
         sessionStorage.setItem('param',JSON.stringify(param4))
         next('/phoneIndex')
       }else {

src/pages/processCenter/pages/phone/index.vue

@@ -28,7 +28,6 @@ export default {
       });
     },
     loginNew (res) {
-      window.sessionStorage.clear()
       let Base64 = require('js-base64').Base64
       let userInfoStr = Base64.decode(res.data)
       let userInfo2 = decodeURIComponent(userInfoStr)