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/tAdvertisement/tAdvertisement_info.js | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
index 93530fe..b1c0a76 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js
@@ -192,6 +192,10 @@
Feng.info("请输入广告标题");
return;
}
+ if ("" == editor){
+ Feng.info("请输入发送内容");
+ return;
+ }
var subArr=[];
$(".timeClass").each(function () {
subArr.push({
@@ -206,10 +210,26 @@
})
});
var sendType = $("input[name='sendType']:checked").val();
+ var sendType1 = $("input[name='sendType1']:checked").val();
console.log(sendType)
- if(sendType==2 && subArr.length <= 0){
+ console.log(sendType1)
+ if(null == sendType && null == sendType1){
+ Feng.error("请选择发送对象");
+ return;
+ }
+ if(null != sendType && sendType==2 && subArr.length <= 0){
Feng.error("请选择用户");
return;
+ }
+ if(null != sendType1 && sendType1==2 && subArr1.length <= 0){
+ Feng.error("请选择司机");
+ return;
+ }
+ if(null == sendType){
+ subArr = null;
+ }
+ if(null == sendType1){
+ subArr1 = null;
}
console.log(subArr)
console.log(subArr1)
@@ -221,8 +241,8 @@
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
- ajax.set("userId",JSON.stringify(subArr))
- ajax.set("driverId",JSON.stringify(subArr1))
+ ajax.set("userId", null == subArr ? '' : JSON.stringify(subArr))
+ ajax.set("driverId", null == subArr1 ? '' : JSON.stringify(subArr1))
ajax.set("name",name)
ajax.set("content",editor)
ajax.start();
@@ -236,6 +256,10 @@
Feng.info("请输入通知标题");
return;
}
+ if ("" == editor){
+ Feng.info("请输入发送内容");
+ return;
+ }
var subArr=[];
$(".timeClass").each(function () {
subArr.push({
@@ -250,13 +274,26 @@
})
});
var sendType = $("input[name='sendType']:checked").val();
+ var sendType1 = $("input[name='sendType1']:checked").val();
console.log(sendType)
- if(sendType==2 && subArr.length <= 0){
+ if(null == sendType && null == sendType1){
+ Feng.error("请选择发送对象");
+ return;
+ }
+ if(null != sendType && sendType==2 && subArr.length <= 0){
Feng.error("请选择用户");
return;
}
- console.log(subArr)
- console.log(subArr1)
+ if(null != sendType1 && sendType1==2 && subArr1.length <= 0){
+ Feng.error("请选择司机");
+ return;
+ }
+ if(null == sendType){
+ subArr = null;
+ }
+ if(null == sendType1){
+ subArr1 = null;
+ }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tAdvertisement/addInfo1", function(data){
Feng.success("添加成功!");
@@ -265,8 +302,8 @@
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
- ajax.set("userId",JSON.stringify(subArr))
- ajax.set("driverId",JSON.stringify(subArr1))
+ ajax.set("userId", null == subArr ? '' : JSON.stringify(subArr))
+ ajax.set("driverId", null == subArr1 ? '' : JSON.stringify(subArr1))
ajax.set("name",name)
ajax.set("content",editor)
ajax.start();
--
Gitblit v1.7.1