Skip to content

fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态 #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2023
Merged

fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态 #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions yudao-ui-admin/src/views/login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,18 @@ 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) {
setTenantId(tenantId)
}
});
}).catch(() => {
// 取消登录按钮 loading状态
this.loading = false;
return false
});
} else {
Expand Down