Merge pull request #217 from thisliuyang/master

fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态
This commit is contained in:
芋道源码 2023-02-19 16:53:18 +08:00 committed by GitHub
commit 39dab4d4dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -263,8 +263,8 @@ export default {
await this.$prompt('请输入租户名称', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消"
}).then(({value}) => {
getTenantIdByName(value).then(res => {
}).then(async ({value}) => {
await getTenantIdByName(value).then(res => {
const tenantId = res.data;
tenant = true
if (tenantId && tenantId >= 0) {
@ -272,6 +272,9 @@ export default {
}
});
}).catch(() => {
// loading
this.loading = false;
return false
});
} else {