From cbd79e993a68b002397442d3cdea025b45ce139c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 11 May 2018 13:02:01 +0800
Subject: [PATCH] 去掉登录账户密码占位值

---
 src/app/routes/passport/login/login.component.html |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 76283cd..5abc040 100644
--- a/src/app/routes/passport/login/login.component.html
+++ b/src/app/routes/passport/login/login.component.html
@@ -2,7 +2,7 @@
     <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg"></nz-alert>
     <div nz-form-item>
         <div nz-form-control [nzValidateStatus]="userName">
-            <nz-input formControlName="userName" [nzPlaceHolder]="'admin'" [nzSize]="'large'">
+            <nz-input formControlName="userName" [nzSize]="'large'">
                 <ng-template #prefix>
                     <i class="anticon anticon-user"></i>
                 </ng-template>
@@ -15,12 +15,14 @@
     </div>
     <div nz-form-item>
         <div nz-form-control [nzValidateStatus]="password">
-            <nz-input formControlName="password" [nzPlaceHolder]="'888888'" [nzType]="'password'" [nzSize]="'large'">
+            <nz-input formControlName="password" [nzType]="'password'" [nzSize]="'large'">
                 <ng-template #prefix>
                     <i class="anticon anticon-lock"></i>
                 </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.password_incorrect">������������������������������������</p>
+            <p nz-form-explain [ngStyle]="{'color': 'red'}" *ngIf="validateError.account_expired">������������������������������������������</p>
         </div>
     </div>
     <div nz-form-item nz-row>
@@ -30,7 +32,7 @@
             </label>
         </div>
         <div nz-col [nzSpan]="12" class="text-right">
-            <a class="forgot" (click)="msg.error('���������������')">���������������</a>
+            <a class="forgot" (click)="msg.error('������������������������')">���������������</a>
         </div>
     </div>
     <div nz-form-item>
@@ -39,16 +41,3 @@
         </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>

--
Gitblit v1.8.0