From 64c930bec1b013ac6e19af9ec30db9eff6110206 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Feb 2018 15:08:12 +0800
Subject: [PATCH] ng-alian主题系统跳转页面 多余蒙版关闭
---
src/app/routes/passport/login/login.component.ts | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.ts b/src/app/routes/passport/login/login.component.ts
index c55479e..c18af0b 100644
--- a/src/app/routes/passport/login/login.component.ts
+++ b/src/app/routes/passport/login/login.component.ts
@@ -1,5 +1,5 @@
import { Authorization } from '@business/entity/token';
-import { LoginService } from './../../../business/services/http/login.service';
+import { LoginService } from '@business/services/http/login.service';
import { SettingsService } from '@delon/theme';
import { Component, OnDestroy, Inject } from '@angular/core';
import { Router } from '@angular/router';
@@ -7,11 +7,12 @@
import { NzMessageService } from 'ng-zorro-antd';
import { SocialService, SocialOpenType, ITokenService, DA_SERVICE_TOKEN } from '@delon/auth';
import { environment } from '@env/environment';
+import { CookieService } from 'angular2-cookie/services/cookies.service';
@Component({
selector: 'passport-login',
templateUrl: './login.component.html',
styleUrls: [ './login.component.less' ],
- providers: [ SocialService]
+ providers: [ SocialService,CookieService]
})
export class UserLoginComponent implements OnDestroy {
@@ -35,6 +36,8 @@
captcha: [null, [Validators.required]],
remember: [true]
});
+ // let nowTime = new Date();
+ // nowTime.setDate(nowTime.getDate()+1);
}
// region: fields
@@ -86,12 +89,12 @@
name: this.userName.value,
time: +new Date
});
- this.validateError = true;
+ this.validateError = {};
this.router.navigate(['/']);
}
},
(err) => {
- console.log(err);
+ // console.log(err);
if(err instanceof ProgressEvent){
const error = <ProgressEvent>err;
let xmlHttp = error.target;
@@ -100,8 +103,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 +115,7 @@
);
}
- public validateError:boolean;
+ public validateError:{[s:string]:boolean} = {};
// region: social
open(type: string, openType: SocialOpenType = 'href') {
--
Gitblit v1.8.0