From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 38adc1b..9def20f 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);
}
}
@@ -73,13 +73,13 @@
}if (!re.test(num5)) {
Feng.error("请输入正确金额数!");
return;
- }if (!re.test(num7)) {
+ }/*if (!re.test(num7)) {
Feng.error("请输入正确金额数!");
return;
}if (!re.test(num9)) {
Feng.error("请输入正确金额数!");
return;
- }
+ }*/
if (!/^[1-9]\d*$/.test(num2)) {
Feng.error("请输入正确张数!");
@@ -89,19 +89,29 @@
Feng.error("请输入正确张数!");
return;
}
- if (!/^[1-9]\d*$/.test(num6)) {
- Feng.error("请输入正确张数!");
- return;
- }if (!/^[1-9]\d*$/.test(num8)) {
- Feng.error("请输入正确张数!");
- return;
- }if (!/^[1-9]\d*$/.test(num10)) {
+ // if (!/^[1-9]\d*$/.test(num6)) {
+ // Feng.error("请输入正确张数!");
+ // return;
+ // }
+ // if (!/^[1-9]\d*$/.test(num8)) {
+ // Feng.error("请输入正确张数!");
+ // return;
+ // }
+ if (!/^[1-9]\d*$/.test(num10)) {
Feng.error("请输入正确天数!");
return;
}
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