From edf83149d0f26fb99eb6548d9e68bcc81a8cc893 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 13 十月 2023 17:03:37 +0800 Subject: [PATCH] 10.13bug2 --- cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js | 139 ++++++++++++++++++++++++++++++---------------- 1 files changed, 90 insertions(+), 49 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 9c0e374..581136a 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 @@ -57,6 +57,9 @@ let coachId = $('#coachId').val(); let maxSubscribeNumber = $('#maxSubscribeNumber').val(); let codeTime = $('#codeTime').val(); + let type = $('#type').val(); + let holitime = $('#holitime').val(); + // let classStartTime = JSON.stringify($('#classStartTime').val()); @@ -116,22 +119,22 @@ Feng.error("授课教师不能为空"); return } - if(null == maxSubscribeNumber || '' == maxSubscribeNumber){ - Feng.error("最多预约人数不能为空"); - return - } - if(null == codeTime || '' == codeTime){ - Feng.error("最多预约人数不能为空"); - return - } - if(null == classStartTime || '' == classStartTime){ - Feng.error("上课时间不能为空"); - return - } - if(null == classWeeks || '' == classWeeks){ - Feng.error("上课时间不能为空"); - return - } + // if(null == maxSubscribeNumber || '' == maxSubscribeNumber){ + // Feng.error("最多预约人数不能为空"); + // return + // } + // if(null == codeTime || '' == codeTime){ + // Feng.error("扣除课时数不能为空不能为空"); + // return + // } + // if(null == classStartTime || '' == classStartTime){ + // Feng.error("上课时间不能为空"); + // return + // } + // if(null == classWeeks || '' == classWeeks){ + // Feng.error("上课时间不能为空"); + // return + // } classWeeks = classWeeks.substring(0, classWeeks.length - 1); if(null == coverDrawing || '' == coverDrawing){ @@ -146,10 +149,10 @@ Feng.error("课包介绍不能为空"); return } - if(null == validDays || '' == validDays){ - Feng.error("课时有效期不能为空"); - return - } + // if(null == validDays || '' == validDays){ + // Feng.error("课时有效期不能为空"); + // return + // } let obj = { province: province, @@ -172,7 +175,9 @@ introduceDrawing: introduceDrawing, sort: sort, validDays: validDays, - coursePackagePaymentConfig: JSON.stringify(price) + coursePackagePaymentConfig: JSON.stringify(price), + type:type, + holitime:holitime } //提交信息 @@ -207,8 +212,16 @@ let coachId = $('#coachId').val(); let maxSubscribeNumber = $('#maxSubscribeNumber').val(); let codeTime = $('#codeTime').val(); + let type = $('#type').val(); - let classStartTime = $('#classStartTime').val(); + let holitime = $('#holitime').val(); + + var inputElements = document.querySelectorAll('input[name="classStartTime"]'); + let classStartTime = JSON.stringify(Array.from(inputElements).map(function(element) { + return element.value; + })) + + // let classStartTime = $('#classStartTime').val(); let classWeeks = ''; $('input[name="classWeeks"]:checked').each(function (index, e) { classWeeks += $(e).val() + ";"; @@ -263,21 +276,22 @@ Feng.error("授课教师不能为空"); return } - if(null == maxSubscribeNumber || '' == maxSubscribeNumber){ - Feng.error("最多预约人数不能为空"); - return - } if(null == codeTime || '' == codeTime){ - Feng.error("扣除课时不能为空"); - return - } - if(null == classStartTime || '' == classStartTime){ - Feng.error("上课时间不能为空"); - return - } - if(null == classWeeks || '' == classWeeks){ - Feng.error("上课时间不能为空"); - return - } + // if(null == maxSubscribeNumber || '' == maxSubscribeNumber){ + // Feng.error("最多预约人数不能为空"); + // return + // } + // if(null == codeTime || '' == codeTime){ + // Feng.error("扣除课时不能为空"); + // return + // } + // if(null == classStartTime || '' == classStartTime){ + // Feng.error("上课时间不能为空"); + // return + // } + // if(null == classWeeks || '' == classWeeks){ + // Feng.error("周不能为空"); + // return + // } classWeeks = classWeeks.substring(0, classWeeks.length - 1); if(null == coverDrawing || '' == coverDrawing){ @@ -292,10 +306,10 @@ Feng.error("课包介绍不能为空"); return } - if(null == validDays || '' == validDays){ - Feng.error("课时有效期不能为空"); - return - } + // if(null == validDays || '' == validDays){ + // Feng.error("课时有效期不能为空"); + // return + // } let obj = { id: id, @@ -310,17 +324,20 @@ coachId: coachId, maxSubscribeNumber: maxSubscribeNumber, codeTime: codeTime, - - classStartTime: classStartTime.split(" - ")[0], - classEndTime: classStartTime.split(" - ")[1], + type:type, + classStartTime: classStartTime, + // classEndTime: classStartTime.split(" - ")[1], classWeeks: classWeeks, coverDrawing: coverDrawing, detailDrawing: detailDrawing, introduceDrawing: introduceDrawing, sort: sort, validDays: validDays, - coursePackagePaymentConfig: JSON.stringify(price) + coursePackagePaymentConfig: JSON.stringify(price), + holitime:holitime } + + console.log("======="+obj) //提交信息 var ajax = new $ax(Feng.ctxPath + "/coursePackage/updateCoursePackage", function (data) { @@ -389,7 +406,8 @@ } -function addPrice(){ +function addPrice(y){ + console.log("===="+y) let cash = false; let paiCoin = false; $('input[name="payType"]:checked').each(function (index, e) { @@ -402,7 +420,25 @@ } }) var i = $('#price > div').length+1 - let htmlStr = '' + + let htmlStr = '' + + + if (y===1){ + + htmlStr += '<div class="form-group">\n' + + ' <label class="col-sm-3 control-label">*课时数:</label>\n' + + ' <div class="col-sm-8">\n' + + ' <span class="classNumber_span"><input class="classNumber" type="number" min="0" placeholder="请输入" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> </span> <span class="cash_span">\n'; + + } + if (y===2){ + + htmlStr += '<div class="form-group">\n' + + ' <label class="col-sm-3 control-label"></label>\n' + + ' <div class="col-sm-8">\n' + + ' <span class="classNumber_span" hidden="hidden"><input class="classNumber" type="number" min="0" placeholder="请输入" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> </span> <span class="cash_span">\n'; + + } '<div class="form-group">\n' + ' <label class="col-sm-3 control-label">*课时数:</label>\n' + ' <div class="col-sm-8">\n' + @@ -415,11 +451,11 @@ htmlStr += '玩湃币支付:<input class="paiCoin" type="number" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 \n'; } htmlStr += '<button type="button" class="btn btn-info " onclick="CoursePackageInfo.openDia('+i+')" id="ensure">\n' + - ' <i class="fa fa-check"></i> 优惠卷\n' + + ' <i class="fa fa-check"></i> 优惠券\n' + '</button>'; htmlStr += '</span> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(this)"></i>\n' + - '</div>\n' +'<input type="text" class = "counpons" id = "counpons'+i+'" >'+i+ + '</div>\n' +'<input type="text" hidden="hidden" class = "counpons" id = "counpons'+i+'" >'+i+ '</div>'; $('#price').append(htmlStr); } @@ -431,6 +467,11 @@ $(e).parent('div').parent('div').remove(); } +function removePrice1(e){ + $(e).parent('div').remove(); +} + + $(function () { $('#provinceCode').change(function () { -- Gitblit v1.7.1