diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts index 805250b17..0bd76272e 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts @@ -298,13 +298,12 @@ export class UserLoginComponent implements OnInit, OnDestroy { }) .pipe( finalize(() => { - this.loading = false; this.cdr.detectChanges(); }) ) .subscribe(res => { - this.loading = true; if (res.code !== 0) { + this.loading = false; this.error = res.message; //this.msg.error(this.error); if (this.loginType === 'normal') { diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/login/login.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/login/login.component.ts index 2b14967d8..c9485146e 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/login/login.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/passport/login/login.component.ts @@ -158,13 +158,12 @@ export class UserLoginComponent implements OnInit, OnDestroy { }) .pipe( finalize(() => { - this.loading = false; this.cdr.detectChanges(); }) ) .subscribe(res => { - this.loading = true; if (res.code !== 0) { + this.loading = false; this.error = res.message; //this.msg.success(`登录失败,请重新登录!`); this.getImageCaptcha();