From d0f2b30d5b58797aecc45dbaaa7264709b3965a9 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 10 Jan 2022 16:48:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/edit-password/edit-password.component.html      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/routes/account/components/edit-password/edit-password.component.html b/src/app/routes/account/components/edit-password/edit-password.component.html
index 034e68d9..a3eec2b2 100644
--- a/src/app/routes/account/components/edit-password/edit-password.component.html
+++ b/src/app/routes/account/components/edit-password/edit-password.component.html
@@ -1,11 +1,12 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 13:50:46
- * @LastEditTime: 2021-12-28 14:02:39
+ * @LastEditTime: 2022-01-10 16:48:34
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\account\components\edit\edit.component.html
 -->
+<nz-alert style="margin-bottom: 15px;" nzType="info" nzMessage="密码为字母和数字组成的8-16个字符，支持符号“_”和“-”。" nzShowIcon></nz-alert>
 <form nz-form [formGroup]="validateForm">
   <nz-form-item>
     <nz-form-label nzRequired>新密码</nz-form-label>

From 8d8ec89632592abb46a0f9a82232ea79c6ca0a67 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 10 Jan 2022 16:51:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/edit-password/edit-password.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/account/components/edit-password/edit-password.component.html b/src/app/routes/account/components/edit-password/edit-password.component.html
index a3eec2b2..fbcd8e29 100644
--- a/src/app/routes/account/components/edit-password/edit-password.component.html
+++ b/src/app/routes/account/components/edit-password/edit-password.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 13:50:46
- * @LastEditTime: 2022-01-10 16:48:34
+ * @LastEditTime: 2022-01-10 16:51:33
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\account\components\edit\edit.component.html
@@ -60,7 +60,7 @@
     >
       <div nz-row [nzGutter]="8">
         <div nz-col [nzSpan]="12">
-          <input nz-input formControlName="smsVerifyCode" id="smsVerifyCode" />
+          <input nz-input [maxlength]="6" formControlName="smsVerifyCode" id="smsVerifyCode" />
         </div>
         <div nz-col [nzSpan]="12" style="display: flex; align-items: center;">
           <button nz-button *ngIf="count < 1;" (click)="getCaptcha($event)">获取验证码</button>

From 7e03766eee2545ae0830685a75374a342f061291 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 10 Jan 2022 16:55:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routes/account/components/edit-name/edit-name.component.ts  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/routes/account/components/edit-name/edit-name.component.ts b/src/app/routes/account/components/edit-name/edit-name.component.ts
index 020887a9..fd8d74fe 100644
--- a/src/app/routes/account/components/edit-name/edit-name.component.ts
+++ b/src/app/routes/account/components/edit-name/edit-name.component.ts
@@ -215,8 +215,6 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
     const params = {
       smsVerifyCode: this.sf.value.smsVerifyCode,
     };
-    // this.modal.close(); 
-    this.isVisibleView = true
 
     this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => {
       console.log(res, 'submitForm');

From dcc16ae5d9e7cfbd6093bc1d02f285d0109456be Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 10 Jan 2022 17:03:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/components/edit-name/edit-name.component.html     | 2 +-
 .../account/components/edit-name/edit-name.component.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/account/components/edit-name/edit-name.component.html b/src/app/routes/account/components/edit-name/edit-name.component.html
index dfa08443..57b957b2 100644
--- a/src/app/routes/account/components/edit-name/edit-name.component.html
+++ b/src/app/routes/account/components/edit-name/edit-name.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:06:01
- * @LastEditTime: 2021-12-28 14:11:58
+ * @LastEditTime: 2022-01-10 17:01:56
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\account\components\edit-name\edit-name.component.html
diff --git a/src/app/routes/account/components/edit-name/edit-name.component.ts b/src/app/routes/account/components/edit-name/edit-name.component.ts
index fd8d74fe..1fcc259a 100644
--- a/src/app/routes/account/components/edit-name/edit-name.component.ts
+++ b/src/app/routes/account/components/edit-name/edit-name.component.ts
@@ -80,8 +80,8 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
             widget: 'custom',
             placeholder: '请输入验证码',
             errors: {
-              required: '请输入6位验证码',
-              minLength: '请输入6位验证码',
+              required: '请输入6位数字验证码',
+              minLength: '请输入6位数字验证码',
             },
           },
         },