Merge branch 'master' into through-card
This commit is contained in:
commit
1c67cbea46
|
@ -462,6 +462,12 @@
|
||||||
let weiXinReg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
|
let weiXinReg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
|
||||||
let regFlag = true;
|
let regFlag = true;
|
||||||
switch (Number(this.productType)) {
|
switch (Number(this.productType)) {
|
||||||
|
case 0:
|
||||||
|
/* 不做校验 */
|
||||||
|
break;
|
||||||
|
case 99:
|
||||||
|
/* 不做校验 */
|
||||||
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
regFlag = phoneReg;
|
regFlag = phoneReg;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -275,7 +275,9 @@
|
||||||
let emailsreg = /^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(this.account);
|
let emailsreg = /^[A-Za-z0-9\u4e00-\u9fa5\.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(this.account);
|
||||||
let weixinreg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
|
let weixinreg = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/.test(this.account);
|
||||||
let regflag = true;
|
let regflag = true;
|
||||||
if (this.productType == 1) {
|
if ([0, 99].includes(this.productType)) {
|
||||||
|
/* 不做校验 */
|
||||||
|
} else if (this.productType == 1) {
|
||||||
regflag = phonereg;
|
regflag = phonereg;
|
||||||
} else if (this.productType == 2) {
|
} else if (this.productType == 2) {
|
||||||
regflag = emailsreg;
|
regflag = emailsreg;
|
||||||
|
|
Loading…
Reference in New Issue