|
|
@@ -292,13 +292,34 @@ export default {
|
|
|
}
|
|
|
};
|
|
|
const validatePass = (rule, value, callback) => {
|
|
|
- let reg = /^(?![A-z0-9]+$)(?=.[^%&',;=?$\x22])(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8,16}$/
|
|
|
+ let reg = /^(?=.*[0-9\!@#\$%\^&\*])(?=.*[a-zA-Z]).{8,16}$/
|
|
|
+ // let reg = /^(?![A-z0-9]+$)(?=.[^%&',;=?$\x22])(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8,16}$/
|
|
|
if(reg.test(value)){
|
|
|
- callback()
|
|
|
+ const reg2 = /(\w)*(\w)\2{2}(\w)*/g
|
|
|
+ if (reg2.test(value)) {
|
|
|
+ return callback(new Error('请输入8-16位密码，不能输入纯数字或重复性的密码'));
|
|
|
+ }else{
|
|
|
+ callback()
|
|
|
+ }
|
|
|
}else{
|
|
|
- return callback(new Error('密码应在8-16位包括数字和字母与特殊字符'));
|
|
|
+ return callback(new Error('请输入8-16位密码，不能输入纯数字或重复性的密码'));
|
|
|
}
|
|
|
};
|
|
|
+ // 不能连续字符（如123、abc）连续3位或3位以上
|
|
|
+ const LxStr = (str) => {
|
|
|
+ let arr = str.split('')
|
|
|
+ let flag = true
|
|
|
+ for (let i = 1; i < arr.length - 1; i++) {
|
|
|
+ let firstIndex = arr[i - 1].charCodeAt()
|
|
|
+ let secondIndex = arr[i].charCodeAt()
|
|
|
+ let thirdIndex = arr[i + 1].charCodeAt()
|
|
|
+ thirdIndex - secondIndex == 1
|
|
|
+ secondIndex - firstIndex == 1
|
|
|
+ if ((thirdIndex - secondIndex == 1) && (secondIndex - firstIndex == 1)) {
|
|
|
+ flag = false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return{
|
|
|
buttonType:'1',
|
|
|
uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/face/addOrUpdate", // 上传的图片服务器地址
|
|
|
@@ -336,13 +357,13 @@ export default {
|
|
|
{ required: true, message: "新密码不能为空", trigger: "blur" },
|
|
|
{ min: 8, max: 16, message: "长度在 8 到 16 个字符", trigger: "blur" },
|
|
|
{ required: true, validator: equalToPassword, trigger: "blur" },
|
|
|
- { required: true, message: "请输入8-16位密码，不能输入连续性和重复性的密码，密码中需要包含：大写字母、小写字符、数字和字符", validator: validatePass, trigger: "blur" }
|
|
|
+ { required: true, message: "请输入8-16位密码，不能输入纯数字或重复性的密码", validator: validatePass, trigger: "blur" }
|
|
|
],
|
|
|
confirmPassword: [
|
|
|
{ required: true, message: "确认密码不能为空", trigger: "blur" },
|
|
|
{ min: 8, max: 16, message: "长度在 8 到 16 个字符", trigger: "blur" },
|
|
|
{ required: true, validator: equalToPasswordTwo, trigger: "blur" },
|
|
|
- { required: true, message: "请输入8-16位密码，不能输入连续性和重复性的密码，密码中需要包含：大写字母、小写字符、数字和字符", validator: validatePass, trigger: "blur" }
|
|
|
+ { required: true, message: "请输入8-16位密码，不能输入纯数字或重复性的密码", validator: validatePass, trigger: "blur" }
|
|
|
],
|
|
|
mobile: [
|
|
|
{ required: true, message: "请输入11位手机号码", trigger: "blur" },
|
dedsudiyu