Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-01-10 17:21:56 +08:00
parent 61416df10f dcc16ae5d9
commit 01d8f27b3d
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/account/components/edit-name/edit-name.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-29 11:06:01 * @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 * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath: \tms-obc-web\src\app\routes\account\components\edit-name\edit-name.component.html

6
src/app/routes/account/components/edit-name/edit-name.component.ts
View File

@ -80,8 +80,8 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
widget: 'custom', widget: 'custom',
placeholder: '请输入验证码', placeholder: '请输入验证码',
errors: { errors: {
required: '请输入6位验证码', required: '请输入6位数字验证码',
minLength: '请输入6位验证码', minLength: '请输入6位数字验证码',
}, },
}, },
}, },
@ -215,8 +215,6 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit
const params = { const params = {
smsVerifyCode: this.sf.value.smsVerifyCode, smsVerifyCode: this.sf.value.smsVerifyCode,
}; };
// this.modal.close();
this.isVisibleView = true
this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => { this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => {
console.log(res, 'submitForm'); console.log(res, 'submitForm');

5
src/app/routes/account/components/edit-password/edit-password.component.html
View File

@ -1,11 +1,12 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-29 13:50:46 * @Date: 2021-11-29 13:50:46
* @LastEditTime: 2021-12-28 14:02:39 * @LastEditTime: 2022-01-10 16:51:33
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @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"> <form nz-form [formGroup]="validateForm">
<nz-form-item> <nz-form-item>
<nz-form-label nzRequired>新密码</nz-form-label> <nz-form-label nzRequired>新密码</nz-form-label>
@ -59,7 +60,7 @@
> >
<div nz-row [nzGutter]="8"> <div nz-row [nzGutter]="8">
<div nz-col [nzSpan]="12"> <div nz-col [nzSpan]="12">
<input nz-input formControlName="smsVerifyCode" id="smsVerifyCode" /> <input nz-input [maxlength]="6" formControlName="smsVerifyCode" id="smsVerifyCode" />
</div> </div>
<div nz-col [nzSpan]="12" style="display: flex; align-items: center;"> <div nz-col [nzSpan]="12" style="display: flex; align-items: center;">
<button nz-button *ngIf="count < 1;" (click)="getCaptcha($event)">获取验证码</button> <button nz-button *ngIf="count < 1;" (click)="getCaptcha($event)">获取验证码</button>