|
@@ -65,11 +65,12 @@
|
|
// @ts-ignore
|
|
// @ts-ignore
|
|
validator: async (rule, value) => {
|
|
validator: async (rule, value) => {
|
|
console.log('value',value)
|
|
console.log('value',value)
|
|
|
|
+ const regEmail = /^\w+@\w+\.\w+$/i
|
|
const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
|
|
const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
|
|
if (!value) {
|
|
if (!value) {
|
|
return Promise.reject(t('routes.equity.rules.userName'));
|
|
return Promise.reject(t('routes.equity.rules.userName'));
|
|
}
|
|
}
|
|
- if (!regPos.test(value)) {
|
|
|
|
|
|
+ if (!(regPos.test(value) || regEmail.test(value))) {
|
|
/* eslint-disable-next-line */
|
|
/* eslint-disable-next-line */
|
|
return Promise.reject(t('routes.equity.rules.userName1'));
|
|
return Promise.reject(t('routes.equity.rules.userName1'));
|
|
}
|
|
}
|