Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
This commit is contained in:
commit
cec47d0283
@ -263,8 +263,8 @@ export default {
|
|||||||
await this.$prompt('请输入租户名称', "提示", {
|
await this.$prompt('请输入租户名称', "提示", {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
cancelButtonText: "取消"
|
cancelButtonText: "取消"
|
||||||
}).then(({value}) => {
|
}).then(async ({value}) => {
|
||||||
getTenantIdByName(value).then(res => {
|
await getTenantIdByName(value).then(res => {
|
||||||
const tenantId = res.data;
|
const tenantId = res.data;
|
||||||
tenant = true
|
tenant = true
|
||||||
if (tenantId && tenantId >= 0) {
|
if (tenantId && tenantId >= 0) {
|
||||||
@ -272,6 +272,9 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
// 取消登录按钮 loading状态
|
||||||
|
this.loading = false;
|
||||||
|
|
||||||
return false
|
return false
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user