From bde1723df23bd3c3ee4a76cdc6951b1140f6f525 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Feb 2018 11:24:55 +0800
Subject: [PATCH] 账号过期
---
src/app/routes/passport/login/login.component.ts | 9 ++++++---
src/app/routes/passport/login/login.component.html | 18 +++---------------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 1b6d4aa..9b86a36 100644
--- a/src/app/routes/passport/login/login.component.html
+++ b/src/app/routes/passport/login/login.component.html
@@ -21,7 +21,8 @@
</ng-template>
</nz-input>
<div nz-form-explain *ngIf="(password.dirty || password.touched) && password.errors?.required">������������������</div>
- <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError">������������������������������������</p>
+ <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.password_incorrect">������������������������������������</p>
+ <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.account_expired">������������������������������������������</p>
</div>
</div>
<div nz-form-item nz-row>
@@ -39,17 +40,4 @@
<span>������</span>
</button>
</div>
-</form>
-<div class="other">
- ������������������
- <nz-tooltip [nzTitle]="'in fact Auth0 via window'">
- <span nz-tooltip class="icon-alipay" (click)="open('auth0', 'window')"></span>
- </nz-tooltip>
- <nz-tooltip [nzTitle]="'in fact Github via redirect'">
- <span nz-tooltip class="icon-taobao" (click)="open('github')"></span>
- </nz-tooltip>
- <nz-tooltip [nzTitle]="'���������������'">
- <span nz-tooltip class="icon-weibo" (click)="open('weibo', 'window')"></span>
- </nz-tooltip>
- <a class="register" routerLink="/passport/register">������������</a>
-</div>
+</form>
\ No newline at end of file
diff --git a/src/app/routes/passport/login/login.component.ts b/src/app/routes/passport/login/login.component.ts
index c55479e..b9d2aaf 100644
--- a/src/app/routes/passport/login/login.component.ts
+++ b/src/app/routes/passport/login/login.component.ts
@@ -86,7 +86,7 @@
name: this.userName.value,
time: +new Date
});
- this.validateError = true;
+ this.validateError = {};
this.router.navigate(['/']);
}
},
@@ -100,8 +100,11 @@
console.log(xmlHttpRequest.response);
const response = JSON.parse(xmlHttpRequest.response);
if(response.status == 401&&response.errorCode==10){
- this.validateError = true;
+ this.validateError["password_incorrect"]=true;
this.loading = false;
+ } else if(response.status == 401&&response.errorCode==12) {
+ this.validateError["account_expired"]=true;
+ this.loading = false;
}
}
}
@@ -109,7 +112,7 @@
);
}
- public validateError:boolean;
+ public validateError:{[s:string]:boolean} = {};
// region: social
open(type: string, openType: SocialOpenType = 'href') {
--
Gitblit v1.8.0