From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
index b1ac1fa..d994f41 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
@@ -154,7 +154,7 @@
return
}
- if (type == 1 ) {
+
var checkboxes1 = document.getElementsByName('payType');
var isChecked1 = false;
@@ -166,6 +166,8 @@
}
}
+ console.log("看看选中")
+ console.log(isChecked1)
if (isChecked1) {
console.log("At least one checkbox is selected.");
} else {
@@ -234,7 +236,7 @@
}
-
+ if (type == 1 ) {
var elements1 = document.getElementsByClassName('classNumber');
for (var i = 0; i < elements1.length; i++) {
@@ -389,13 +391,13 @@
}
- let holitime = $('#holitime').val();
var inputElements = document.querySelectorAll('input[name="classStartTime"]');
- let classStartTime = JSON.stringify(Array.from(inputElements).map(function(element) {
+ var classStartTime = JSON.stringify(Array.from(inputElements).map(function(element) {
return element.value;
}))
-
+ console.log("看下修改后的时间");
+ console.log(classStartTime)
// let classStartTime = $('#classStartTime').val();
let classWeeks = '';
$('input[name="classWeeks"]:checked').each(function (index, e) {
@@ -425,14 +427,18 @@
})
});
- if(null == provinceCode || '' == provinceCode){
- Feng.error("所在省不能为空");
- return
+
+ if ($('#objectType').val() == 1) {
+ if (null == provinceCode || '' == provinceCode) {
+ Feng.error("所在省不能为空");
+ return
+ }
+ if (null == cityCode || '' == cityCode) {
+ Feng.error("所在市不能为空");
+ return
+ }
}
- if(null == cityCode || '' == cityCode){
- Feng.error("所在市不能为空");
- return
- }
+
if(null == storeId || '' == storeId){
Feng.error("所属门店不能为空");
return
@@ -633,7 +639,7 @@
// Feng.error("课时有效期不能为空");
// return
// }
-
+ let holitime = $('#holitime').val();
let obj = {
id: id,
province: province,
@@ -657,10 +663,12 @@
sort: sort,
validDays: validDays,
coursePackagePaymentConfig: JSON.stringify(price),
- holitime:holitime
+ holitime:$("#holitime").val()
}
-
- console.log("======="+obj)
+ console.log("看看")
+ console.log("======="+holitime)
+ console.log(holitime)
+ console.log($("#holitime").val())
//提交信息
var ajax = new $ax(Feng.ctxPath + "/coursePackage/updateCoursePackage", function (data) {
--
Gitblit v1.7.1