From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js
index 9def20f..8c963c7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js
@@ -67,13 +67,11 @@
Feng.error("请输入正确金额数!");
return;
}
- if (!re.test(num3)) {
+ if (!re.test(num7)&&!re.test(num5)&&!re.test(num3)) {
Feng.error("请输入正确金额数!");
return;
- }if (!re.test(num5)) {
- Feng.error("请输入正确金额数!");
- return;
- }/*if (!re.test(num7)) {
+ }
+ /*if (!re.test(num7)) {
Feng.error("请输入正确金额数!");
return;
}if (!re.test(num9)) {
@@ -81,14 +79,11 @@
return;
}*/
- if (!/^[1-9]\d*$/.test(num2)) {
+ if (!/^[1-9]\d*$/.test(num2) &&!/^[1-9]\d*$/.test(num4) && !/^[1-9]\d*$/.test(num6)) {
Feng.error("请输入正确张数!");
return;
}
- if (!/^[1-9]\d*$/.test(num4)) {
- Feng.error("请输入正确张数!");
- return;
- }
+
// if (!/^[1-9]\d*$/.test(num6)) {
// Feng.error("请输入正确张数!");
// return;
--
Gitblit v1.7.1