diff --git a/lib/java110/api/Java110SessionApi.js b/lib/java110/api/Java110SessionApi.js index 2395f30..3fa5ff0 100644 --- a/lib/java110/api/Java110SessionApi.js +++ b/lib/java110/api/Java110SessionApi.js @@ -22,7 +22,6 @@ import {isNull} from '../utils/StringUtil.js' const loginUrl = conf.baseUrl + 'app/loginProperty' - /** * 登录处理 */ @@ -65,6 +64,24 @@ export function login(userName, passwd) { }); } +export function reLogin(){ + let userInfo = uni.getStorageSync(java110Config.USER_INFO); + + if (isNull(userInfo)) { + return; + } + let _userInfo = JSON.parse(desDecrypt(userInfo)); + //重新登录 + login(_userInfo.username, _userInfo.password) + .then((res) => { + uni.reLaunch({ + url:'/pages/index/index' + }) + }, err => { + return; + }) +} + export function hasSession() { return new Promise((resolve, reject) => { let loginFlag = uni.getStorageSync(java110Config.LOGIN_FLAG); @@ -73,25 +90,10 @@ export function hasSession() { resolve(); return; } - let userInfo = uni.getStorageSync(java110Config.USER_INFO); - - if (isNull(userInfo)) { - uni.reLaunch({ - url: '/pages/login/login' - }); - return; - } - let _userInfo = JSON.parse(desDecrypt(userInfo)); - //重新登录 - login(_userInfo.username, _userInfo.password) - .then((res) => { - resolve(); - }, err => { - uni.reLaunch({ - url: '/pages/login/login' - }); - return; - }) + //跳转至登录页面 + uni.reLaunch({ + url: '/pages/login/login' + }); }) } diff --git a/pages/login/login.vue b/pages/login/login.vue index ad8951b..a1900a2 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -33,8 +33,9 @@