diff --git a/core/store/modules/user.js b/core/store/modules/user.js index f5631a0..d9d8499 100644 --- a/core/store/modules/user.js +++ b/core/store/modules/user.js @@ -137,43 +137,55 @@ const actions = { }, login({ commit, - state + state, + dispatch }, userInfo) { - const { - username, - password - } = userInfo + const { username, password } = userInfo return new Promise((resolve, reject) => { - const safeUsername = String(username || '').trim(); - if (!safeUsername || !password) { - reject({ msg: '请输入账号和密码' }) - return; - } - http('user.login', { - username: safeUsername, - password: password, - device: state.app.device, - project: state.app.project - }).then(response => { - if (response && response.flag === 'failure') { - reject({ msg: response.message || '账号密码登录失败' }) - return; - } + const safeUsername = String(username || '').trim() + if (!safeUsername || !password) { + reject({ msg: '请输入账号和密码' }) + return + } - const data = response && response.data; - console.log("登录返回数据", data); - const token = data && data.token; - if (!token) { - reject({ msg: response?.message || '登录成功但未返回token' }) - return; - } - setToken(token) - resolve() - }).catch(error => { - console.log("出错",error) - reject({ msg: error?.msg || error?.message || error?.data?.message || '登录失败' }) - }) - }) + http('user.login', { + username: safeUsername, + password, + device: state.app.device, + project: state.app.project + }).then(async (response) => { + if (response && response.flag === 'failure') { + reject({ msg: response.message || '账号密码登录失败' }) + return + } + + const token = + response?.data?.token || + response?.token || + response?.data?.access_token || + response?.access_token || + response?.data?.accessToken || + response?.accessToken + + if (!token) { + reject({ msg: response?.message || '登录成功但未返回token' }) + return + } + + setToken(token) + + try { + await dispatch('getUserInfo', token) + } catch (e) { + reject({ msg: e?.msg || e?.message || '用户信息加载失败' }) + return + } + + resolve() + }).catch(error => { + reject({ msg: error?.msg || error?.message || error?.data?.message || '登录失败' }) + }) + }) }, loginByCode({ commit, diff --git a/pages/login/index.vue b/pages/login/index.vue index eda3dd4..2d909c8 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -261,7 +261,7 @@ export default { async Login() { try { await this.$store.dispatch('login', this.loginForm) - await goHome() + uni.switchTab({ url: '/pages/index/index' }) } catch (error) { uni.showToast({ title: error?.msg || error?.message || '登录失败',