From 926ab3bc034528a078b24fdccf0d033c55622bba Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 17:54:01 +0800 Subject: [PATCH 1/6] edit --- src/app/layout/passport/passport.component.html | 2 +- .../routes/passport/components/login/login.component.html | 8 ++++---- src/assets/mocks/app-data.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html index 90b36333..0f37d045 100644 --- a/src/app/layout/passport/passport.component.html +++ b/src/app/layout/passport/passport.component.html @@ -3,7 +3,7 @@
- +
diff --git a/src/app/routes/passport/components/login/login.component.html b/src/app/routes/passport/components/login/login.component.html index 4f2437a6..eaca200f 100644 --- a/src/app/routes/passport/components/login/login.component.html +++ b/src/app/routes/passport/components/login/login.component.html @@ -11,7 +11,7 @@ + (keyup.enter)="submit()" placeholder="请输入手机号" /> + (ngModelChange)="i.setValue($event)" placeholder="请输入密码" (keyup.enter)="submit()" /> + (keyup.enter)="submit()" placeholder="请输入手机号" /> + (ngModelChange)="me.setValue($event)" (keyup.enter)="submit()" /> diff --git a/src/assets/mocks/app-data.json b/src/assets/mocks/app-data.json index 49022dd9..aab4e21d 100644 --- a/src/assets/mocks/app-data.json +++ b/src/assets/mocks/app-data.json @@ -1,6 +1,6 @@ { "app": { - "name": "运多星运营平台", - "description": "运多星运营平台" + "name": "运多星网络货运管理平台", + "description": "运多星网络货运管理平台" } } From 769f358df08425ac6c99676a2b340d8e34fb91c9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 17:58:39 +0800 Subject: [PATCH 2/6] edit --- .../components/freight/list/new/new.component.ts | 2 +- src/styles.less | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index c3b1a0c8..a6c3a993 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -242,7 +242,7 @@ export class FreightComponentsListNewComponent implements OnInit { title: '统一社会信用代码', type: 'string', minLength: 1, - maxLength: 18, + maxLength: 30, ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, optionalHelp: diff --git a/src/styles.less b/src/styles.less index ba701d83..5ec98448 100644 --- a/src/styles.less +++ b/src/styles.less @@ -27,4 +27,12 @@ input::-webkit-inner-spin-button { /* 全局隐藏input-number上下箭头 火狐*/ input[type="number"] { -moz-appearance: textfield; +} + +.alain-pro__sider-logo h1{ + font-size: 17px; +} + +.alain-pro__sider-logo{ + padding-left: 12px; } \ No newline at end of file From e387c21f6f795e6ac25a534cd09b2fccdc086890 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 19:08:25 +0800 Subject: [PATCH 3/6] edit --- .../usercenter/components/freight/list/new/new.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index a6c3a993..c7ae6d4a 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -233,7 +233,7 @@ export class FreightComponentsListNewComponent implements OnInit { change: args => { if (args.type === 'success') { this.sf1.setValue('/licensePhoto', args.fileList[0].response.data.fullFilePath); - this.checkBusinessLicense(args.fileList[0].response.data.fullFileWatermarkPath); + this.checkBusinessLicense(args.fileList[0].response.data.fullFilePath); } } } as SFUploadWidgetSchema From 28cf90cf26777cd77566d424b44ab5fe3af4d2b7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 19:15:47 +0800 Subject: [PATCH 4/6] edit --- .../retrieve-password.component.html | 202 ++++++++++-------- .../retrieve-password.component.less | 108 +++++----- .../retrieve-password.component.ts | 40 ++-- 3 files changed, 187 insertions(+), 163 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 2b60f0bf..78fa0486 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 @@ -1,109 +1,116 @@
- + +
-
- - 手机号 - - - - - - - - 验证码 - -
- - - - -
- - - - - - - -
+
+
+
+ + 手机号 + + + + + + 验证码 + + + + + + + + + + + +
+
+
-
- - 新的密码 - - - - 请输入确认密码! - - 8-16个字符，支持字母、数字、符号“_”和“-”，必须包含字母和数字! - - - - - - 确认密码 - - - - 请输入确认密码! - 两次输入的密码不一致! - - - - - - - - -
+
+
+
+ + 设置新密码 + + + + + + + + + +
+
+ + +
+ +
+ + + 重复新密码 + + + + + + + + + +
+
+ + +
+ +
+ + + + + + +
+
+
- +
@@ -120,10 +127,19 @@ 立即登录 + {{ 'app.register-result.back-home' | translate }} + -->
+ + + + 获取验证码 + + 请等待{{ count }}s + + + \ No newline at end of file diff --git a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.less b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.less index 7c8d01de..31408925 100644 --- a/src/app/routes/passport/components/retrieve-password/retrieve-password.component.less +++ b/src/app/routes/passport/components/retrieve-password/retrieve-password.component.less @@ -1,29 +1,51 @@ -@import '~@delon/theme/index'; - :host { + ::ng-deep { + .ant-steps { + margin: 0 auto; + width : 500px; + } + + .ant-steps-item-process>.ant-steps-item-container>.ant-steps-item-tail::after { + background-color: #999494; + } + + .ant-steps-item-wait>.ant-steps-item-container>.ant-steps-item-tail::after { + background-color: #999494; + } + + .ant-spin-container { + background-color: #f8f8f8; + } + + .ant-form-item-label>label { + height: 40px; + } + + } + .main { max-width: 1200px; - margin: 0 auto; - overflow: hidden; + margin : 0 auto; + overflow : hidden; } page-grid { - width: 100%; - height: 100%; - margin: 100px auto; + width : 100%; + height : 100%; background-color: #fff; + margin : 100px auto; .myForm { - width: 25rem; - margin: 5rem auto; + margin-top : 3rem; + margin-bottom: 5rem; } .steps-content { - min-height: 250px; - margin-top: 16px; - background-color: #fafafa; - border: 1px dashed #e9e9e9; - border-radius: 6px; + margin-top : 16px; + border : 1px dashed #e9e9e9; + border-radius : 6px; + background-color: #ffffff; + min-height : 250px; // text-align: center; } @@ -34,45 +56,31 @@ button { margin-right: 8px; } - .step-title{ - padding: 8px; - } } } +.input-tootip { + width : 250px; + padding-left: 20px; + display : flex; + display : flex; + align-items : center; -.content { - background-color: #f0f3f7; -} -.main { - max-width: 1200px; - margin: 0 auto; -} -.header { - background: #fff; -} -.layout { - min-height: 100vh; -} - -.logo { - display: flex; - margin: 16px 0; - line-height: 32px; - dt { - width: 95px; - height: 32px; - img { - vertical-align: top; - } + .dot { + font-size: 21px; + color : #bdb8b8; } - dd { - flex: 1; - margin-bottom: 0; - padding: 0 10px; - color: #1890ff; - font-weight: 500; - font-size: 24px; - } -} + .valid-icon { + color: rgb(217 0 27); + } + + .invalid-icon { + color: rgb(82 196 26); + } + + .tootip-label { + margin-left: 8px; + font-size : 12px; + } +} \ No newline at end of file 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 e919081d..39516c75 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 @@ -1,7 +1,6 @@ import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { CaptchaComponent } from '@shared'; import { interval } from 'rxjs'; import { take } from 'rxjs/operators'; import { EAUserService } from 'src/app/shared/services/business/user.service'; @@ -9,11 +8,9 @@ import { EAUserService } from 'src/app/shared/services/business/user.service'; @Component({ selector: 'app-routes-password-retrieve-password', templateUrl: './retrieve-password.component.html', - styleUrls: ['./retrieve-password.component.less'], + styleUrls: ['./retrieve-password.component.less'] }) export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { - @ViewChild('dun', { static: false }) - private dun!: CaptchaComponent; step = 0; count = 0; interval$: any; @@ -21,18 +18,20 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { formGroup2!: FormGroup; confirmPasswordValidator!: ValidatorFn; result = true; + + isPassWordHide = true; + isConfirmPassWordHide = true; + constructor(private fb: FormBuilder, public service: EAUserService, private router: Router, private cdr: ChangeDetectorRef) {} - ngAfterViewInit(): void { - this.dun.init(); - } + ngAfterViewInit(): void {} ngOnInit() { this.initForm(); } initForm() { - this.confirmPasswordValidator = (control) => { + this.confirmPasswordValidator = control => { if (!control.value) { return { error: true, required: true }; } else if (control.value !== this.formGroup2.controls.passWord.value) { @@ -44,7 +43,7 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { this.formGroup1 = this.fb.group({ phone: [null, [Validators.required]], smsVerifyCode: [null, [Validators.required]], - voucher: [null, [Validators.required]], + voucher: [null, [Validators.required]] }); this.formGroup2 = this.fb.group({ @@ -54,12 +53,12 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { Validators.required, Validators.maxLength(16), Validators.minLength(8), - Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$'), - ], + Validators.pattern('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z-_]{8,16}$') + ] ], passWordTo: [null, [this.confirmPasswordValidator, Validators.maxLength(16), Validators.minLength(8)]], voucher: [null, [Validators.required]], - phone: [null, [Validators.required]], + phone: [null, [Validators.required]] }); } @@ -76,7 +75,7 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { submitForm1() { for (const i in this.formGroup1.controls) { - if (true) { + if (this.formGroup1.controls[i]) { this.formGroup1.controls[i].markAsDirty(); this.formGroup1.controls[i].updateValueAndValidity(); } @@ -88,13 +87,14 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { if (this.formGroup1.valid) { const param = Object.assign({}, this.formGroup1.value); this.service.http.post(this.service.$forgetPasswordVerifyIdentity, param).subscribe((res: any) => { + // console.log(res, 'submitForm1'); if (res.success === true) { this.formGroup2.patchValue( { voucher: res.data.voucher, - phone: this.formGroup1.value.phone, + phone: this.formGroup1.value.phone }, - { onlySelf: true }, + { onlySelf: true } ); this.step = 1; // clearInterval(this.interval$); @@ -108,7 +108,7 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { submitForm2() { for (const i in this.formGroup2.controls) { - if (true) { + if (this.formGroup2.controls[i]) { this.formGroup2.controls[i].markAsDirty(); this.formGroup2.controls[i].updateValueAndValidity(); } @@ -152,15 +152,15 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { if (res.success) { this.formGroup1.patchValue( { - voucher: res?.data?.voucher, + voucher: res?.data?.voucher }, - { onlySelf: true }, + { onlySelf: true } ); if (res?.data?.code === '1') { this.codeCountDown(); this.service.msgSrv.success('验证码已发送到该账号绑定的手机号！'); } else if (res?.data?.code === '503046') { - this.dun.popUp(); + // this.dun.popUp(); } else { this.service.msgSrv.error('获取验证码失败!'); } @@ -176,7 +176,7 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { this.count = 59; interval(1000) .pipe(take(60)) - .subscribe((x) => { + .subscribe(x => { this.count = 59 - (x + 1); this.cdr.detectChanges(); }); From ca12cd2f080f559d3a1c2967f2efbba01e95eedf Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 19:21:08 +0800 Subject: [PATCH 5/6] edit --- .../usercenter/components/freight/list/new/new.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index c7ae6d4a..45cdc492 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -331,7 +331,6 @@ export class FreightComponentsListNewComponent implements OnInit { precision: 0 } }, - unit: { title: '', type: 'string', ui: { widget: 'text', class: 'input-back' }, default: '万元' }, enterpriseRegistrationTime: { title: '成立日期', type: 'string', From 5e445b76196b393199b7149d1cbe196376939ed3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 10 Jan 2022 19:29:12 +0800 Subject: [PATCH 6/6] edit --- .../retrieve-password/retrieve-password.component.html | 1 - .../retrieve-password/retrieve-password.component.ts | 9 --------- .../usercenter/components/driver/driver.component.ts | 2 +- 3 files changed, 1 insertion(+), 11 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 78fa0486..46b10562 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 @@ -38,7 +38,6 @@
-
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 39516c75..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 @@ -13,7 +13,6 @@ import { EAUserService } from 'src/app/shared/services/business/user.service'; export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { step = 0; count = 0; - interval$: any; formGroup1!: FormGroup; formGroup2!: FormGroup; confirmPasswordValidator!: ValidatorFn; @@ -181,14 +180,6 @@ export class UserRetrievePasswordComponent implements OnInit, AfterViewInit { this.cdr.detectChanges(); }); } - /* 网易盾验证通过 */ - captchaDone(validate: any) { - this.codeCountDown(); - } - - refreshPage() { - window.location.reload(); - } validateConfirmPassword(): void { setTimeout(() => this.formGroup2.controls.passWordTo.updateValueAndValidity()); diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index 1fe5aaca..9f33ee97 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -33,7 +33,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { }; if (this.sf?.value.effectiveDate) { Object.assign(params, { - time: { + createTime: { start: this.sf?.value.effectiveDate[0], end: this.sf?.value.effectiveDate[1] }