From ce4832607287e9d7d511d65ef7760f2e76e8bc4d Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 16 Feb 2022 14:05:09 +0800
Subject: [PATCH] fix bug

---
 .../retrieve-password/retrieve-password.component.html | 10 +++-------
 .../retrieve-password/retrieve-password.component.ts   |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html
index 46b10562..cd15accc 100644
--- a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html
+++ b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.html
@@ -20,7 +20,7 @@
               </nz-form-item>
               <nz-form-item>
                 <nz-form-label nzSpan="6" nzRequired nzFor="smsVerifyCode">验证码</nz-form-label>
-                <nz-form-control nzSpan="18">
+                <nz-form-control nzSpan="18" nzErrorTip="请输入6位验证码">
                   <nz-input-group [nzSuffix]="suffixTemplateInfo" nzSize="large">
                     <input type="text" nz-input formControlName="smsVerifyCode" maxlength="6" placeholder="请输入验证码" />
                   </nz-input-group>
@@ -45,7 +45,7 @@
             <form nz-form [formGroup]="formGroup2" class="myForm">
               <nz-form-item>
                 <nz-form-label nzSpan="4" nzRequired nzFor="passWord">设置新密码</nz-form-label>
-                <nz-form-control nzSpan="8">
+                <nz-form-control nzSpan="8" nzErrorTip="请输入新密码">
                   <nz-input-group [nzSuffix]="passWordType" nzSize="large">
                     <input nz-input [type]="isPassWordHide?'password':'text'" formControlName="passWord"
                       (ngModelChange)="validateConfirmPassword()" placeholder="请输入新密码" />
@@ -53,10 +53,6 @@
                   <ng-template #passWordType>
                     <i nz-icon [nzType]="isPassWordHide?'eye-invisible':'eye'" (click)="isPassWordHide=!isPassWordHide"
                       nzTheme="outline" style="color: #bdb7b7;font-size: 18px;cursor: pointer;"></i>
-                    <!-- <ng-container *ngIf="control.hasError('required')"> 请输入确认密码! </ng-container>
-                    <ng-container *ngIf="control.hasError('minLength') || control.hasError('pattern')">
-                      8-16个字符，支持字母、数字、符号“_”和“-”，必须包含字母和数字!
-                    </ng-container> -->
                   </ng-template>
                 </nz-form-control>
                 <div class="input-tootip">
@@ -71,7 +67,7 @@
               </nz-form-item>
               <nz-form-item>
                 <nz-form-label nzSpan="4" nzRequired nzFor="passWordTo">重复新密码</nz-form-label>
-                <nz-form-control nzSpan="8" nzDisableAutoTips>
+                <nz-form-control nzSpan="8" nzDisableAutoTips  nzErrorTip="请输入新密码">
                   <nz-input-group [nzSuffix]="confirmPassWordType" nzSize="large">
                     <input nz-input [type]="isConfirmPassWordHide?'password':'text'" formControlName="passWordTo"
                       placeholder="再次输入密码" />
diff --git a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts
index 7d5318e8..df0184b0 100644
--- a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts
+++ b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.ts
@@ -163,6 +163,8 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit {
             } else {
               this.service.msgSrv.error('获取验证码失败!');
             }
+          } else {
+            this.service.msgSrv.error(res.msg);
           }
         });
     }