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

---
 pages/forgetPassword/forgetPassword.js | 2 +-
 pages/register/register.js             | 2 +-
 pages/register/register.wxml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index d6c7bf8..29aa1e3 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: '密码长度至少8位，并包括大、小写英文字母、特殊字符!',
           icon: 'none'
         })
         this.data.flag = false
diff --git a/pages/register/register.js b/pages/register/register.js
index 326c07f..5ca2e74 100644
--- a/pages/register/register.js
+++ b/pages/register/register.js
@@ -211,7 +211,7 @@ Page({
       return
     } else if (this.data.prePageData.password && !passwordReg(this.data.prePageData.password)) {
       wx.showToast({
-        title: '密码长度至少8位，并包括数字、小写字母、大写字母和特殊符号4类',
+        title: '密码长度至少8位，并包括大、小写英文字母、特殊字符',
         icon: 'none',
         duration: 800
       })
diff --git a/pages/register/register.wxml b/pages/register/register.wxml
index 3c68c10..c8342a5 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位，并包括数字、小写字母、大写字母和特殊符号4类' 
+        <input name="password" value="{{password}}" maxlength="50" password="{{show}}" placeholder="请输入密码"  bindblur="validatePsd" data-message='请输入密码' data-errmsg='密码长度至少8位，并包括大、小写英文字母、特殊字符' 
           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>