From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/passport/login/login.component.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 76283cd..1b6d4aa 100644
--- a/src/app/routes/passport/login/login.component.html
+++ b/src/app/routes/passport/login/login.component.html
@@ -10,7 +10,7 @@
<ng-container *ngIf="userName.dirty || userName.touched">
<p nz-form-explain *ngIf="userName.errors?.required">���������������������</p>
<p nz-form-explain *ngIf="userName.errors?.minlength">������������������</p>
- </ng-container>
+ </ng-container>
</div>
</div>
<div nz-form-item>
@@ -21,6 +21,7 @@
</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>
</div>
</div>
<div nz-form-item nz-row>
--
Gitblit v1.8.0