From b8f1913c5077437347ae3e311e01fbeb5e4dd5ff Mon Sep 17 00:00:00 2001
From: TM <923727421@qq.com>
Date: Wed, 16 Dec 2020 10:48:49 +0800
Subject: [PATCH] 添加密码格式验证

---
 pages/index/index.js                   |    7 +++++++
 pages/forgetPassword/forgetPassword.js |    2 +-
 pages/changePassword/changePassword.js |    7 +++++++
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/pages/changePassword/changePassword.js b/pages/changePassword/changePassword.js
index 0ceeacc..284a620 100644
--- a/pages/changePassword/changePassword.js
+++ b/pages/changePassword/changePassword.js
@@ -50,6 +50,13 @@
       });
       return
     }
+    if (!validator.checkPassword(this.data.info.newPwd)) {
+      my.showToast({
+        content: '新密码格式有误,应为8-16位字母数字组合',
+        duration: 2000,
+      });
+      return
+    }
     if (this.data.newTwo != this.data.info.newPwd) {
       my.showToast({
         content: '两次新密码不一致,请确认',
diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index a22ff27..e9fbab8 100644
--- a/pages/forgetPassword/forgetPassword.js
+++ b/pages/forgetPassword/forgetPassword.js
@@ -89,7 +89,7 @@
     }
     if(!validator.checkPassword(this.data.info.newPwd)){
       my.showToast({
-        content: '密码为8-16数字字母组合',
+        content: '新密码为8-16数字字母组合',
         duration: 2000
       })
       return
diff --git a/pages/index/index.js b/pages/index/index.js
index 2e012f1..3a3b70a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -91,6 +91,13 @@
         });
         return
       }
+      if(!validator.checkPassword(this.data.password)){
+        my.showToast({
+          content:'密码格式有误',
+          duration:2000
+        });
+        return
+      }
     }else{
       url = '/sib/xcx/login/loginByCode'
       obj.mblNo = this.data.userNo

--
Gitblit v1.8.0