1. 修复了一些问题
This commit is contained in:
@@ -162,14 +162,23 @@ export default {
|
||||
return Promise.reject(new Error(res.message || res.msg || '登录失败'));
|
||||
}
|
||||
const result = res.result;
|
||||
if (result.need_select && result.accounts && result.accounts.length) {
|
||||
if (result.need_select) {
|
||||
const accounts = Array.isArray(result.accounts) ? result.accounts : [];
|
||||
if (!accounts.length) {
|
||||
return Promise.reject(new Error('请选择登录账号'));
|
||||
}
|
||||
this.pendingLoginPayload = payload;
|
||||
this.$emit('need-select', {
|
||||
accounts: result.accounts,
|
||||
defaultAccountId: result.default_account_id,
|
||||
defaultAccountType: result.default_account_type,
|
||||
this.loading = false;
|
||||
return new Promise((resolve) => {
|
||||
this.$nextTick(() => {
|
||||
this.$emit('need-select', {
|
||||
accounts,
|
||||
defaultAccountId: result.default_account_id,
|
||||
defaultAccountType: result.default_account_type,
|
||||
});
|
||||
resolve(null);
|
||||
});
|
||||
});
|
||||
return null;
|
||||
}
|
||||
return this.finishLogin(result);
|
||||
})
|
||||
@@ -184,6 +193,7 @@ export default {
|
||||
this.doLogin({
|
||||
account_type: account.account_type,
|
||||
account_id: account.id,
|
||||
login_persona: account.login_persona || undefined,
|
||||
});
|
||||
},
|
||||
async finishLogin(result) {
|
||||
|
||||
Reference in New Issue
Block a user