From 02fb8cddb6c0ec60b6ba6d08beb673214d9b6959 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 25 九月 2023 17:26:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
index 2fe98b4..9f4d080 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
@@ -4,6 +4,7 @@
<div class="form-horizontal">
<div class="row">
<input type="hidden" id="id" value="${item.id}">
+ <input type="hidden" id="type" name="type" value="${type}">
<div class="form-group">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-4">
@@ -44,6 +45,16 @@
</select>
</div>
</div>
+ <div class="form-group" ${type == 1||type == 3 ? 'hidden=hidden' : ''}>
+ <label class="col-sm-3 control-label">*假期有效期：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="holitime" name="holitime" value="${holi!}">
+ </div>
+ </div>
+
+
+
+
<div class="form-group">
<label class="col-sm-3 control-label">*课包名称：</label>
<div class="col-sm-4">
@@ -71,28 +82,44 @@
</select>
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*最多预约人数：</label>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
+ <label class="col-sm-3 control-label" >*最多预约人数：</label>
<div class="col-sm-4">
<input class="form-control" id="maxSubscribeNumber" name="maxSubscribeNumber" value="${item.maxSubscribeNumber}" type="number" min="0" placeholder="请输入最多预约人数">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">*上课时间：</label>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
+ <label class="col-sm-3 control-label" >*上课时间：</label>
<div class="col-sm-4">
- <input class="form-control" id="classStartTime" name="classStartTime" value="${classTime}" placeholder="请选择">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label"></label>
- <div class="col-sm-8">
+
@for(obj in classWeeks){
<input type="checkbox" name="classWeeks" value="${obj.value}" ${obj.checked ? 'checked' : ''}> ${obj.value}
@}
+<!-- <input class="form-control" id="classStartTime" name="classStartTime" value="${classTime}" placeholder="请选择">-->
</div>
</div>
+ <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''} >
+ <label class="col-sm-3 control-label"></label>
- <div class="form-group">
+ <div class="form-group" style="display: flex; align-items: center;" id = "dayTime" >
+
+
+ <div style="display:flex">
+ <input class="form-control" value="${time1}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
+ <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()"></i>
+ </div>
+ @for(o in times!){
+
+ <div style="display:flex">
+ <input class="form-control" value="${o}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;">
+ <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice1(this)"></i>
+ </div>
+ @}
+ </div>
+
+ </div>
+
+ <div class="form-group" ${type == 2||type == 3 ? 'hidden=hidden' : ''}>
<label class="col-sm-3 control-label">*扣除课时数：</label>
<div class="col-sm-4">
<input class="form-control" id="codeTime" name="codeTime" value="${item.codeTime}" type="number" min="0" placeholder="请输入每节课扣除课时数">
@@ -180,9 +207,9 @@
</div>
<div id="price">
<div class="form-group">
- <label class="col-sm-3 control-label">*课时数：</label>
+ <label class="col-sm-3 control-label" >${type == 2||type == 3 ? '' : '*课时数：'}</label>
<div class="col-sm-8">
- <span class="classNumber_span"><input class="classNumber" type="number" value="${coursePackagePaymentConfig.classHours}" 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="classNumber_span" ${type == 2||type == 3 ? 'hidden=hidden' : ''}><input class="classNumber" type="number" value="${coursePackagePaymentConfig.classHours}" 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">
@if(cashPayment){
现金支付：<input class="cash" type="number" value="${coursePackagePaymentConfig.cashPayment}" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> ￥
@@ -193,16 +220,16 @@
玩湃币支付：<input class="paiCoin" type="number" value="${coursePackagePaymentConfig.playPaiCoin}" 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>
- <input type="text" id="counpons1" value="${couponIds}" class="counpons">
- <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(1)"/>
- <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice()"></i>
+ <input type="hidden" id="counpons1" value="${couponIds}" class="counpons">
+ <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(1)"/>
+ <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice(${type})"></i>
</div>
</div>
@for(obj in coursePackagePaymentConfigs){
<div class="form-group">
- <label class="col-sm-3 control-label">*课时数：</label>
+ <label class="col-sm-3 control-label">${type == 2||type == 3 ? '' : '*课时数：'}</label>
<div class="col-sm-8">
- <span class="classNumber_span"><input class="classNumber" type="number" value="${obj.classHours}" 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="classNumber_span" ${type == 2||type == 3 ? 'hidden=hidden' : ''}><input class="classNumber" type="number" value="${obj.classHours}" 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">
@if(cashPayment){
现金支付：<input class="cash" type="number" value="${obj.cashPayment}" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> ￥
@@ -213,6 +240,7 @@
玩湃币支付：<input class="paiCoin" type="number" value="${obj.playPaiCoin}" 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>
+ <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons"> <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(${obj.id})"/>
<i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(4, this)"></i>
</div>
</div>
@@ -237,6 +265,11 @@
,type: 'time'
,range: true
});
+
+ laydate.render({
+ elem: '#holitime'
+ ,range: true //或 range: '~' 来自定义分割字符
+ });
var avatarUp = new $WebUpload("coverDrawing");
avatarUp.setUploadBarId("progressBar");
avatarUp.init();
@@ -248,5 +281,21 @@
var avatarUp1 = new $WebUpload("introduceDrawing");
avatarUp1.setUploadBarId("progressBar");
avatarUp1.init();
+
+ function addTime(){
+ var i = $('#dayTime > div').length
+
+ let htmlStr =' <div style="display:flex">\n' +
+ ' <input class="form-control" id="classStartTime'+i+'" name="classStartTime" placeholder="请选择" style="width: 200px;">\n' +
+ ' <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice1(this)"></i>\n' +
+ ' </div>'
+ $('#dayTime').append(htmlStr);
+ console.log("========="+i)
+ laydate.render({
+ elem: '#classStartTime'+i,
+ type: 'time',
+ range: true
+ });
+ }
</script>
@}
--
Gitblit v1.7.1