From c982d323fb4d69bb232e068fd71a63c639d1dbc6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 28 Mar 2022 19:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/forgetPassword/forgetPassword.js | 2 +-
 pages/register/register.js             | 8 ++++----
 pages/register/register.wxml           | 2 +-
 pages/setPassword/setPassword.js       | 2 +-
 pages/upDateInfo/upDateInfo.js         | 6 +++---
 utils/validate.js                      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

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 @@
     <view class="item" wx:if="{{currentTab === 1}}">
       <view class="label validate">密码</view>
       <view class="value text-password">
-        <input name="password" value="{{password}}" maxlength="50" password="{{show}}" placeholder="请输入密码"  bindblur="validatePsd" data-message='请输入密码' data-errmsg='密码长度至少8位，并包括大、小写英文字母、特殊字符' 
+        <input name="password" value="{{password}}" maxlength="50" password="{{show}}" placeholder="请输入密码"  bindblur="validatePsd" data-message='请输入密码' data-errmsg='密码至少八位,需包含大小写字母、数字、特殊符号' 
           bindinput="handlePasswordInput" />
         <image src="../../assets/images/show.png" class="show" wx:if="{{!show}}" bindtap="showPassword"></image>
         <image src="../../assets/images/none.png" class="show" wx:if="{{show}}" bindtap="showPassword"></image>
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)