shaojiahao
/
ShangHaiAcquisitionPlatform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[完善]修改注册时密码正则并去掉电话正则;保存单位时去掉电话正则

master
邵佳豪 4 years ago
parent
4435844e45
commit
4295a866b7
5 changed files with 1144 additions and 1135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/app/pages/register/register.component.html
  2. 2
      src/app/pages/register/register.component.ts
  3. 6
      src/app/ui/basicinfo/basicinfo.component.html
  4. 17
      src/app/ui/basicinfo/basicinfo.component.ts
  5. 2
      src/styles.scss

46
src/app/pages/register/register.component.html
Unescape View File

@ -8,19 +8,21 @@
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<div class="input">
<label class="position"><mat-icon>group</mat-icon></label>
<label class="position">
<mat-icon>group</mat-icon>
</label>
<mat-form-field>
<input matInput id="companyName" name="companyName"
required ngModel placeholder="请输入单位名称">
<input matInput id="companyName" name="companyName" required ngModel placeholder="请输入单位名称">
</mat-form-field>
</div>
<div class="input">
<label class="position"><mat-icon>dns</mat-icon></label>
<label class="position">
<mat-icon>dns</mat-icon>
</label>
<mat-form-field>
<input matInput id="usci" name="usci" #usci="ngModel"
pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$"
ngModel placeholder="请输入统一社会信用代码">
pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$" ngModel placeholder="请输入统一社会信用代码">
</mat-form-field>
</div>
<div *ngIf="usci.invalid && (usci.dirty || usci.touched)" class="alert-danger">
@ -30,24 +32,27 @@
</div>
<div class="input">
<label class="position"><mat-icon>phone</mat-icon></label>
<label class="position">
<mat-icon>phone</mat-icon>
</label>
<mat-form-field>
<input matInput id="phone" name="phone" #tel="ngModel"
required pattern="^^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
ngModel placeholder="请输入联系电话">
<input matInput type="number" id="phone" name="phone" #tel="ngModel" required ngModel
placeholder="请输入联系电话">
</mat-form-field>
</div>
<div *ngIf="tel.invalid && (tel.dirty || tel.touched)" class="alert-danger">
<!-- <div *ngIf="tel.invalid && (tel.dirty || tel.touched)" class="alert-danger">
<div *ngIf="tel.errors.pattern">
电话号码格式为11位数字
</div>
</div>
</div> -->
<div class="input">
<label class="position"><mat-icon>account_box</mat-icon></label>
<label class="position">
<mat-icon>account_box</mat-icon>
</label>
<mat-form-field>
<input matInput id="name" name="name" #name="ngModel" pattern="^[a-zA-Z][a-zA-Z0-9_]{4,19}$"
required ngModel placeholder="请输入账号">
<input matInput id="name" name="name" #name="ngModel" pattern="^[a-zA-Z][a-zA-Z0-9_]{4,19}$" required
ngModel placeholder="请输入账号">
</mat-form-field>
</div>
<div *ngIf="name.invalid && (name.dirty || name.touched)" class="alert-danger">
@ -57,10 +62,12 @@
</div>
<div class="input">
<label class="position"><mat-icon>lock</mat-icon></label>
<label class="position">
<mat-icon>lock</mat-icon>
</label>
<mat-form-field>
<input matInput id="password" name="password" type='password' #password="ngModel"
required pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
<input matInput id="password" name="password" type='password' #password="ngModel" required
pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.+[\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?])[A-Za-z0-9\!\@\#\$\%\^\&\*\(\)\-\=\\\`\_\+\|\~\[\]\{\}\;\'\:\,\.\/\<\>\?]{8,32}$"
ngModel placeholder="请输入密码">
</mat-form-field>
</div>
@ -78,7 +85,8 @@
<a href="javascript:void(0);" style="margin-left: 135px;" class="forget">
注册失败?
<div class="contactUs">
<label style="font-size: 14px; text-align: center; width: 100%; display: block; color: #fff;">安信科创QQ号</label>
<label
style="font-size: 14px; text-align: center; width: 100%; display: block; color: #fff;">安信科创QQ号</label>
<img src="../../../assets/images/AnXinQQ.jpg">
</div>
</a>

2
src/app/pages/register/register.component.ts
Unescape View File

@ -21,7 +21,7 @@ export class RegisterComponent implements OnInit {
companyName: e.companyName,
name: e.name,
password: e.password,
phone:e.phone,
phone: String(e.phone),
usci: e.usci
}).subscribe(data => {
this.snackBar.open('注册成功,请登录!', '确定', {

6
src/app/ui/basicinfo/basicinfo.component.html
Unescape View File

@ -10,7 +10,7 @@
<div class="topbox">
<form (ngSubmit)="onSubmit(form.value,form.invalid,form)" #form="ngForm" class="example-container">
<div class="mainbox" >
<div class="mainleft" style="display: none;">
<div class="mainleft">
<div class="inputbox" >
<span style="color: red;">*</span>
<span>统一社会信用代码：</span>
@ -51,8 +51,8 @@
<span style="color: red;">*</span>
<span>联系电话：</span>
<mat-form-field>
<input matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
required pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
<input matInput id="linkphone" name="linkphone" type='number' #linkphone="ngModel"
required
[(ngModel)]="unitinfo.phone"
(focus)="closeorganizationbox()"
>

17
src/app/ui/basicinfo/basicinfo.component.ts
Unescape View File

@ -165,9 +165,6 @@ export class BasicinfoComponent implements OnInit {
this.map.on('complete', () => {
this.isGisTopBox = true
});
this.map.on('click', (e) => {
console.log(e.lnglat)
});
//输入提示
var autoOptions = {
input: "tipinput"
@ -227,10 +224,14 @@ export class BasicinfoComponent implements OnInit {
this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat } //获取当前地图中心位置
}
this.newPositionMarker.on('dragend', (e) => {
this.markerPosition2 = { x: e.lnglat.KL, y: e.lnglat.kT }
let lnglat = this.map.containerToLngLat(e.pixel)
this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
// console.log(`${lnglat.KL},${lnglat.kT}`);
})
this.newPositionMarker.on('dragging', (e) => {
this.newPositionMarker.setPosition(new AMap.LngLat(e.lnglat.lng, e.lnglat.lat));
//console.log('dragging',e)
let lnglat = this.map.containerToLngLat(e.pixel)
this.newPositionMarker.setPosition(lnglat);
})
//点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
@ -270,7 +271,7 @@ export class BasicinfoComponent implements OnInit {
center = [this.markerPosition.x, this.markerPosition.y]
} else {
center = this.map.getCenter(); //获取当前地图中心位置
console.log('获取当前地图中心位置', center)
// console.log('获取当前地图中心位置', center)
this.map.setCenter(center);
}
@ -290,7 +291,7 @@ export class BasicinfoComponent implements OnInit {
this.newPositionMarker.on('dragend', (e) => {
let lnglat = this.map.containerToLngLat(e.pixel)
this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
console.log(`${lnglat.KL},${lnglat.kT}`);
// console.log(`${lnglat.KL},${lnglat.kT}`);
})
this.newPositionMarker.on('dragging', (e) => {
//console.log('dragging',e)
@ -861,7 +862,7 @@ export class BasicinfoComponent implements OnInit {
name: this.unitinfo.name,
usci: value.creditcode,
contacts: value.linkman,
phone: value.linkphone,
phone: String(value.linkphone),
address: value.unitaddress,
imageUrl: this.imgsrc,
location: this.markerPosition,

2
src/styles.scss
Unescape View File

@ -124,7 +124,7 @@ table td.mat-footer-cell:last-of-type {
#setPosition {
.custom-content-marker {
position: relative;
border: 1px solid red;
// border: 1px solid red;
width: 68px;
height: 68px;
overflow: hidden;

Write Preview
Loading…
Cancel
Save