Commit 39dab4d4dc7cb2be7b8333201948310d03c49246
Committed by
GitHub
GitHub
Merge pull request #217 from thisliuyang/master
fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态
Showing
1 changed file
with
5 additions
and
2 deletions
yudao-ui-admin/src/views/login.vue
| @@ -263,8 +263,8 @@ export default { | @@ -263,8 +263,8 @@ export default { | ||
| 263 | await this.$prompt('请输入租户名称', "提示", { | 263 | await this.$prompt('请输入租户名称', "提示", { |
| 264 | confirmButtonText: "确定", | 264 | confirmButtonText: "确定", |
| 265 | cancelButtonText: "取消" | 265 | cancelButtonText: "取消" |
| 266 | - }).then(({value}) => { | ||
| 267 | - getTenantIdByName(value).then(res => { | 266 | + }).then(async ({value}) => { |
| 267 | + await getTenantIdByName(value).then(res => { | ||
| 268 | const tenantId = res.data; | 268 | const tenantId = res.data; |
| 269 | tenant = true | 269 | tenant = true |
| 270 | if (tenantId && tenantId >= 0) { | 270 | if (tenantId && tenantId >= 0) { |
| @@ -272,6 +272,9 @@ export default { | @@ -272,6 +272,9 @@ export default { | ||
| 272 | } | 272 | } |
| 273 | }); | 273 | }); |
| 274 | }).catch(() => { | 274 | }).catch(() => { |
| 275 | + // 取消登录按钮 loading状态 | ||
| 276 | + this.loading = false; | ||
| 277 | + | ||
| 275 | return false | 278 | return false |
| 276 | }); | 279 | }); |
| 277 | } else { | 280 | } else { |