diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js index 29aa1e3..86edbbc 100644 --- a/pages/forgetPassword/forgetPassword.js +++ b/pages/forgetPassword/forgetPassword.js @@ -201,7 +201,7 @@ Page({ let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ if(!pattern.test(e.detail.value.password)){ wx.showToast({ - title: '密码长度至少8位,并包括大、小写英文字母、特殊字符!', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none' }) this.data.flag = false diff --git a/pages/register/register.js b/pages/register/register.js index 5ca2e74..b50bceb 100644 --- a/pages/register/register.js +++ b/pages/register/register.js @@ -211,9 +211,9 @@ Page({ return } else if (this.data.prePageData.password && !passwordReg(this.data.prePageData.password)) { wx.showToast({ - title: '密码长度至少8位,并包括大、小写英文字母、特殊字符', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none', - duration: 800 + duration: 2000 }) return } @@ -578,7 +578,7 @@ Page({ wx.showToast({ title: message, icon: 'none', - duration: 800 + duration: 2000 }) return } else if (passwordReg(value)) { @@ -590,7 +590,7 @@ Page({ wx.showToast({ title: errmsg, icon: 'none', - duration: 800 + duration: 2000 }) } diff --git a/pages/register/register.wxml b/pages/register/register.wxml index c8342a5..60c763b 100644 --- a/pages/register/register.wxml +++ b/pages/register/register.wxml @@ -46,7 +46,7 @@ 密码 - diff --git a/pages/setPassword/setPassword.js b/pages/setPassword/setPassword.js index b1a6c28..91ee22b 100644 --- a/pages/setPassword/setPassword.js +++ b/pages/setPassword/setPassword.js @@ -111,7 +111,7 @@ Page({ let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ if(!pattern.test(e.detail.value.newPassword)){ wx.showToast({ - title: '密码由8位及以上数字、大小写字母和特殊符号组成!', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none' }) this.data.flag = false diff --git a/pages/upDateInfo/upDateInfo.js b/pages/upDateInfo/upDateInfo.js index 3dccc40..715dbd8 100644 --- a/pages/upDateInfo/upDateInfo.js +++ b/pages/upDateInfo/upDateInfo.js @@ -153,7 +153,7 @@ Page({ let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ if(!pattern.test(e.detail.value.oldpassword)){ wx.showToast({ - title: '密码由8位及以上数字、大小写字母和特殊符号组成!', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none' }) this.data.flag = false @@ -173,7 +173,7 @@ Page({ let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ if(!pattern.test(e.detail.value.password)){ wx.showToast({ - title: '密码由8位及以上数字、大小写字母和特殊符号组成!', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none' }) this.data.flag = false @@ -193,7 +193,7 @@ Page({ let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ if(!pattern.test(e.detail.value.confirmpassword)){ wx.showToast({ - title: '密码由8位及以上数字、大小写字母和特殊符号组成!', + title: '密码至少八位,需包含大小写字母、数字、特殊符号', icon: 'none' }) this.data.flag = false diff --git a/utils/validate.js b/utils/validate.js index 59b5751..6458153 100644 --- a/utils/validate.js +++ b/utils/validate.js @@ -27,7 +27,7 @@ export function isURL(s) { /** * 密码 - * message: 密码长度至少8位,并包括数字、小写字母、大写字母和特殊符号4类 + * message: 密码至少八位,需包含大小写字母、数字、特殊符号 */ export function passwordReg(s) { return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/.test(s)