From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/passport/login/login.component.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index 9b86a36..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>
@@ -10,12 +10,12 @@
<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>
<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>
@@ -32,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>
@@ -40,4 +40,4 @@
<span>������</span>
</button>
</div>
-</form>
\ No newline at end of file
+</form>
--
Gitblit v1.8.0