From 5d8e52e398bff7bc8f83e8f5b8a387175b958c98 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 24 二月 2023 10:20:18 +0800
Subject: [PATCH] 2023.2.24

---
 base/behaviors/b_inputCheck.js |   65 ++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/base/behaviors/b_inputCheck.js b/base/behaviors/b_inputCheck.js
index 2697fde..8a1a48c 100644
--- a/base/behaviors/b_inputCheck.js
+++ b/base/behaviors/b_inputCheck.js
@@ -61,6 +61,9 @@
      * 淇℃伅瀹屾暣搴︽鏌�
      */
     submitCheck() {
+      //娓呯┖缂撳瓨鐨勫瘑鐮�
+      this.lastPW = ''
+
       let msg = this.data.msg
       //纭淇℃伅瀹屾暣搴�
       for (let i = 0; i < msg.length; i++) {
@@ -115,38 +118,44 @@
           }
         }
         //杈撳叆妗�
+        //蹇呭~椤圭┖鐧芥娴�
         else if (m.value === "" || m.value === null || m.value === undefined) {
           this.showErrorMsg(i)
           return false
+        } 
+        //杈撳叆妗嗕笅鐨勫瘑鐮佺被鍨嬫娴�
+        else if (m.type == 'password') {
+          //瀵嗙爜涓�鑷存�х‘璁�
+          if (this.lastPW == '') {
+            this.lastPW = m.value
+          } else if (this.lastPW != m.value) {
+            let error = "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"
+            this.setData({
+              errorMsg: error,
+            })
+            return false
+          }
+          //瀵嗙爜澶嶆潅搴︾‘璁�
+          var pwError
+          var pw = m.value
+          var regex1 = /[a-zA-Z]/
+          var regex2 = /[0-9]/
+          var r = regex1.test(pw) && regex2.test(pw)
+          console.log('regex:' + r);
+          if (pw.length < 6) {
+            pwError = '瀵嗙爜浣嶆暟鏈�灏�6浣�'
+          } else if (!r) {
+            pwError = '瀵嗙爜蹇呴』鍖呭惈瀛楁瘝鍜屾暟瀛�'
+          }
+          if (pwError) {
+            this.setData({
+              errorMsg: pwError,
+            })
+            return false
+          }
+          
         }
       }
-
-      // //瀵嗙爜涓�鑷存�х‘璁�
-      // if (msg[1].value != msg[2].value) {
-      //   let error = "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"
-      //   this.setData({
-      //     errorMsg: error,
-      //   })
-      //   return false
-      // }
-      // //瀵嗙爜澶嶆潅搴︾‘璁�
-      // var pwError
-      // var pw = msg[1].value
-      // var regex1 = /[a-zA-Z]/
-      // var regex2 = /[0-9]/
-      // var r = regex1.test(pw) && regex2.test(pw)
-      // console.log('regex:' + r);
-      // if (pw.length < 6) {
-      //   pwError = '瀵嗙爜浣嶆暟鏈�灏�6浣�'
-      // } else if (!r) {
-      //   pwError = '瀵嗙爜蹇呴』鍖呭惈瀛楁瘝鍜屾暟瀛�'
-      // }
-      // if (pwError) {
-      //   this.setData({
-      //     errorMsg: pwError,
-      //   })
-      //   return false
-      // }
 
       return true
     },
@@ -184,7 +193,7 @@
         });
         this.setData({info})
         this.triggerEvent('onSubmit', info)
-        if (typeof this._submit === 'function') this._submit()
+        if (typeof this._submit === 'function') this._submit(info)
       }
     },
   }

--
Gitblit v1.9.3