diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 7f541799..0cd80c73 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -163,7 +163,7 @@ export default { userNameReg: 'The account cannot start with a number and can contain uppercase and lowercase letters, numbers, and no less than 5 digits.', userNamePlease: 'Please enter the correct login account', userNameHit: 'Login account', - passwordReg: 'The password should contain at least uppercase and lowercase letters, numbers, special symbols, and no less than 6 digits.', + passwordReg: 'Please enter the correct password format', passwordPlease: 'Please enter the correct login password', passwordHit: 'Login password', passwordConfirmHit: 'Confirm login password', @@ -295,7 +295,7 @@ export default { oldPasswordTip: "The old password must not be empty and must be at least 6 digits long", oldPasswordPleace: "Please enter the old password", newPassword: "New Password", - newPasswordTip: "Password contains at least upper and lower case letters, numbers, special symbols, and not less than 6 digits", + newPasswordTip: "Please enter the correct password format", newPassworddPleace: "Please enter a new password", confirmPassword: "Confirm new password", confirmPasswordPleace: "Please confirm the new password", @@ -1594,7 +1594,7 @@ export default { loginTime: 'Login Time', status: 'Status', userNameTip:'The account number can only contain strings of uppercase letters, lowercase letters and numbers with a minimum length of 6 digits', - passwdTip:'The password should contain at least uppercase and lowercase letters, numbers, special symbols, and no less than 6 digits', + passwdTip:'Please enter the correct password format', nickNameTip:'Nicknames no less than 2 digits', emailTip:'Please enter the correct email address', phoneTip:'Please enter the correct phone number', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index bdcd1688..5a75cc1a 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -163,7 +163,7 @@ export default { userNameReg: '账号不能以数字开头,可包含大写小写字母,数字,且不少于5位', userNamePlease: '请输入正确登录账号', userNameHit: '登录账号', - passwordReg: '密码至少包含大小写字母、数字、特殊符号,且不少于6位', + passwordReg: '请输入正确的密码格式', passwordPlease: '请输入正确登录密码', passwordHit: '登录密码', passwordConfirmHit: '确认登录密码', @@ -295,7 +295,7 @@ export default { oldPasswordTip: "旧密码不能为空,且不少于6位", oldPasswordPleace: "请输入旧密码", newPassword: "新密码", - newPasswordTip: "密码至少包含大小写字母、数字、特殊符号,且不少于6位", + newPasswordTip: "请输入正确的密码格式", newPassworddPleace: "请输入新密码", confirmPassword: "确认新密码", confirmPasswordPleace: "请确认新密码", @@ -1594,7 +1594,7 @@ export default { loginTime: '登录时间', status: '用户状态', userNameTip:'账号只能包含大写字母、小写字母和数字的字符串,长度至少为6位', - passwdTip:'密码至少包含大小写字母、数字、特殊符号,且不少于6位', + passwdTip:'请输入正确的密码格式', nickNameTip:'昵称不少于2位', emailTip:'请输入正确的邮箱地址', phoneTip:'请输入正确的手机号码', diff --git a/src/utils/regular-utils.ts b/src/utils/regular-utils.ts index f04c447e..83f5b3fa 100644 --- a/src/utils/regular-utils.ts +++ b/src/utils/regular-utils.ts @@ -27,14 +27,15 @@ export const regExpUserName = /^[A-Za-z0-9]{6,}$/; * 有效密码格式 * * 密码至少包含大小写字母、数字、特殊符号,且不少于6位 + * /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{6,}$/ */ -export const regExpPasswd = - /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{6,}$/; +export const regExpPasswd = /^.{6,}$/; /** * 有效手机号格式 + * /^1[3|4|5|6|7|8|9][0-9]\d{8}$/ */ -export const regExpMobile = /^.{3,}$/; // /^1[3|4|5|6|7|8|9][0-9]\d{8}$/; +export const regExpMobile = /^.{3,}$/; /** * 有效邮箱格式 @@ -46,8 +47,9 @@ export const regExpEmail = * 有效用户昵称格式 * * 用户昵称只能包含字母、数字、中文和下划线,且不少于2位 + * /^[\w\u4e00-\u9fa5-]{2,}$/ */ -export const regExpNick = /^.{2,}$/; // /^[\w\u4e00-\u9fa5-]{2,}$/; +export const regExpNick = /^.{2,}$/; /** * 是否为http(s)://开头