From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 61af383..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
@@ -22,9 +22,9 @@
}else if(couponUseType==2){
$("#id3").val(id);
$("#num7").val(money);
- }else if(couponUseType==3){
+ }else if(couponUseType==4){
$("#id4").val(id);
- $("#num9").val(money);
+ $("#num7").val(money);
}
}
@@ -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;
@@ -103,7 +98,15 @@
}
var id1=$("#id1").val();
+ if((null == id1 || '' == id1) && '' != num2){
+ Feng.error("请选择通用优惠券");
+ return;
+ }
var id2=$("#id2").val();
+ if((null == id2 || '' == id2) && '' != num4){
+ Feng.error("请选择专车优惠券");
+ return;
+ }
var id3=$("#id3").val();
var id4=$("#id4").val();
var obj = $("#obj").val();
--
Gitblit v1.7.1