Update validateForm.js

hc-advokate · Sep 11, 2024 · 18340ca · 18340ca
1 parent 338acc7
commit 18340ca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/plugins/validate/validateForm.js b/src/plugins/validate/validateForm.js
@@ -4,7 +4,9 @@ export default {
 		if (!value) {
 			callback("字段不能为空");
 		} else {
-			if (Reg.userName.test(value)) {
+			if (rule && rule.test(value)) {
+				callback();
+			} else if (Reg.userName.test(value)) {
 				callback();
 			} else {
 				callback("格式错误");
@@ -16,7 +18,9 @@ export default {
 		if (!value) {
 			callback("字段不能为空");
 		} else {
-			if (Reg.password.test(value)) {
+			if (rule && rule.test(value)) {
+				callback();
+			} else if (Reg.password.test(value)) {
 				callback();
 			} else {
 				callback("格式错误");