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_info.html |  393 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 246 insertions(+), 147 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html
index 6cc25f2..c7345e9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.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,159 +45,257 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*课包名称:</label>
-                    <div class="col-sm-4">
-                        <input class="form-control" id="name" name="name" value="${item.name}" readonly>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*上课场地:</label>
-                    <div class="col-sm-4">
-                        <select class="form-control" id="siteId" name="siteId" disabled>
-                            @for(obj in site){
-                            <option value="${obj.id}" ${item.siteId == obj.id ? 'selected' : ''}>${obj.name}</option>
-                            @}
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*授课教师:</label>
-                    <div class="col-sm-4">
-                        <select class="form-control" id="coachId" name="coachId" disabled>
-                            <option value="">请选择</option>
-                            @for(obj in coach){
-                            <option value="${obj.id}" ${item.coachId == obj.id ? 'selected' : ''}>${obj.name}</option>
-                            @}
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <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="请输入最多预约人数" readonly>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*上课时间:</label>
-                    <div class="col-sm-4">
-                        <input class="form-control" id="classStartTime" name="classStartTime" value="${classTime}" placeholder="请选择" readonly>
-                    </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}&nbsp;&nbsp;&nbsp;&nbsp;
-                        @}
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*课包封面:</label>
-                    <div class="col-sm-4">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label">*列表页</label>
-                    <div class="col-sm-2">
-                        <div id="coverDrawingPreId">
-                            <div><img width="100px" height="100px" src="${item.coverDrawing}"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label"></label>
-                    <label>推荐像素:210x280px</label>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label">*详情页</label>
-                    <div class="col-sm-2">
-                        <div id="detailDrawingPreId">
-                            <div><img width="100px" height="100px" src="${item.detailDrawing}"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label"></label>
-                    <label>推荐像素:780x440px</label>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label">*课包介绍</label>
-                    <div class="col-sm-2">
-                        <div id="introduceDrawingPreId">
-                            <div><img width="100px" height="100px" src="${item.introduceDrawing}"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label head-scu-label"></label>
-                    <label>推荐像素:宽780x</label>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">排序:</label>
-                    <div class="col-sm-4">
-                        <input class="form-control" id="sort" name="sort" value="${item.sort}" type="number" placeholder="请输入排序">
-                    </div>
-                </div>
-                <div class="hr-line-dashed"></div>
-                <h3>课时设置</h3>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*支付方式:</label>
-                    <div class="col-sm-4" style="margin-top: 6px;">
-                        <input type="checkbox" name="payType" value="1" ${cashPayment ? 'checked' : ''}> 现金&nbsp;&nbsp;&nbsp;&nbsp;
-                        <input type="checkbox" name="payType" value="2" ${playPaiCoin ? 'checked' : ''}> 玩湃币&nbsp;&nbsp;&nbsp;&nbsp;
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">*课时有效期:</label>
-                    <div class="col-sm-4">
-                        购买后 <input id="validDays" name="validDays" type="number" value="${item.validDays}" min="0" placeholder="天数" style="width: 80px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;" readonly> 天内有效
-                    </div>
-                </div>
-                <div id="price">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*课时数:</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;" readonly>&nbsp;&nbsp;&nbsp;&nbsp;</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;" readonly> ¥&nbsp;&nbsp;&nbsp;&nbsp;
-                                @}
-                            </span>
-                            <span class="paiCoin_span">
-                                @if(playPaiCoin){
-                                玩湃币支付:<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;" readonly> 币&nbsp;&nbsp;&nbsp;&nbsp;
-                                @}
-                            </span>
-                        </div>
-                    </div>
-                    @for(obj in coursePackagePaymentConfigs){
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*课时数:</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;" readonly>&nbsp;&nbsp;&nbsp;&nbsp;</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;" readonly> ¥&nbsp;&nbsp;&nbsp;&nbsp;
-                                @}
-                            </span>
-                            <span class="paiCoin_span">
-                                @if(playPaiCoin){
-                                玩湃币支付:<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;" readonly> 币&nbsp;&nbsp;&nbsp;&nbsp;
-                                @}
-                            </span>
-                        </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!}" disabled>
                 </div>
             </div>
-            <div class="row btn-group-m-t">
-                <div class="col-sm-10">
-                    <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="CoursePackageInfo.close()"/>
+
+
+
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">*课包名称:</label>
+                <div class="col-sm-4">
+                    <input class="form-control" id="name" name="name" value="${item.name}" disabled>
                 </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">*上课场地:</label>
+                <div class="col-sm-4">
+                    <select class="form-control" id="siteId" name="siteId" disabled>
+                        @for(obj in site){
+                        <option value="${obj.id}" ${item.siteId == obj.id ? 'selected' : ''}>${obj.name}</option>
+                        @}
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">*授课教师:</label>
+                <div class="col-sm-4">
+                    <select class="form-control" id="coachId" name="coachId" disabled>
+                        <option value="">请选择</option>
+                        @for(obj in coach){
+                        <option value="${obj.id}" ${item.coachId == obj.id ? 'selected' : ''}>${obj.name}</option>
+                        @}
+                    </select>
+                </div>
+            </div>
+            <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="请输入最多预约人数" disabled>
             </div>
         </div>
+        <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
+        <label class="col-sm-3 control-label" >*上课时间:</label>
+        <div class="col-sm-4">
+
+            @for(obj in classWeeks){
+            <input type="checkbox" disabled name="classWeeks" value="${obj.value}" ${obj.checked ? 'checked' : ''}> ${obj.value}&nbsp;&nbsp;&nbsp;&nbsp;
+            @}
+            <!--                        <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" 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;" disabled>
+            <i class="fa fa-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()" disabled></i>
+        </div>
+        @for(o in times!){
+
+        <div style="display:flex">
+            <input class="form-control"  value="${o}" id="classStartTime" name="classStartTime" placeholder="请选择" style="width: 200px;" disabled>
+            <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice1(this)" disabled></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" disabled id="codeTime" name="codeTime" value="${item.codeTime}" type="number" min="0" placeholder="请输入每节课扣除课时数">
+</div>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label">*课包封面:</label>
+    <div class="col-sm-4">
     </div>
 </div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label">*列表页</label>
+    <div class="col-sm-2">
+        <div id="coverDrawingPreId">
+            <div><img width="100px" height="100px" src="${item.coverDrawing}" disabled></div>
+        </div>
+    </div>
+    <div class="col-sm-2">
+<!--        <div class="head-scu-btn upload-btn" id="coverDrawingBtnId">-->
+<!--&lt;!&ndash;            <i class="fa fa-upload" disabled></i>&nbsp;上传&ndash;&gt;-->
+<!--        </div>-->
+    </div>
+    <input type="hidden" id="coverDrawing" value="${item.coverDrawing}" disabled/>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label"></label>
+    <label>推荐像素:210x280px</label>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label">*详情页</label>
+    <div class="col-sm-2">
+        <div id="detailDrawingPreId">
+            <div><img width="100px" height="100px" src="${item.detailDrawing}" disabled></div>
+        </div>
+    </div>
+    <div class="col-sm-2">
+<!--        <div class="head-scu-btn upload-btn" id="detailDrawingBtnId" disabled>-->
+<!--            <i class="fa fa-upload" disabled></i>&nbsp;上传-->
+<!--        </div>-->
+    </div>
+    <input type="hidden" id="detailDrawing" value="${item.detailDrawing}" disabled/>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label"></label>
+    <label>推荐像素:780x440px</label>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label">*课包介绍</label>
+    <div class="col-sm-2">
+        <div id="introduceDrawingPreId">
+            <div><img width="100px" height="100px" src="${item.introduceDrawing}" disabled></div>
+        </div>
+    </div>
+    <div class="col-sm-2">
+<!--        <div class="head-scu-btn upload-btn" id="introduceDrawingBtnId" disabled>-->
+<!--            <i class="fa fa-upload" disabled></i>&nbsp;上传-->
+<!--        </div>-->
+    </div>
+    <input type="hidden" id="introduceDrawing" value="${item.introduceDrawing}"/>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label"></label>
+    <label>推荐像素:宽780x</label>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label">排序:</label>
+    <div class="col-sm-4">
+        <input class="form-control" disabled id="sort" name="sort" value="${item.sort}" type="number" placeholder="请输入排序">
+    </div>
+</div>
+<div class="hr-line-dashed"></div>
+<h3>课时设置</h3>
+<div class="form-group">
+    <label class="col-sm-3 control-label">*支付方式:</label>
+    <div class="col-sm-4" style="margin-top: 6px;">
+        <input type="checkbox" disabled name="payType" value="1" ${cashPayment ? 'checked' : ''}> 现金&nbsp;&nbsp;&nbsp;&nbsp;
+        <input type="checkbox" disabled name="payType" value="2" ${playPaiCoin ? 'checked' : ''}> 玩湃币&nbsp;&nbsp;&nbsp;&nbsp;
+    </div>
+</div>
+<div class="form-group">
+    <label class="col-sm-3 control-label">*课时有效期:</label>
+    <div class="col-sm-4">
+        购买后 <input id="validDays" disabled name="validDays" type="number" value="${item.validDays}" min="0" placeholder="天数" style="width: 80px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 天内有效
+    </div>
+</div>
+<div id="price">
+    <div class="form-group">
+        <label class="col-sm-3 control-label" >${type == 2||type == 3 ? '' : '*课时数:'}</label>
+        <div class="col-sm-8">
+            <span class="classNumber_span" disabled ${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;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="cash_span" disabled>
+                                @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;"> ¥&nbsp;&nbsp;&nbsp;&nbsp;
+                                @}
+                            </span>
+            <span class="paiCoin_span" disabled>
+                                @if(playPaiCoin){
+                                玩湃币支付:<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;"> 币&nbsp;&nbsp;&nbsp;&nbsp;
+                                @}
+                            </span>
+            <input type="hidden" 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(${type})" disabled></i>
+        </div>
+    </div>
+    @for(obj in coursePackagePaymentConfigs){
+    <div class="form-group">
+        <label class="col-sm-3 control-label">${type == 2||type == 3 ? '' : '*课时数:'}</label>
+        <div class="col-sm-8">
+            <span class="classNumber_span" disabled ${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;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="cash_span" disabled>
+                                @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;"> ¥&nbsp;&nbsp;&nbsp;&nbsp;
+                                @}
+                            </span>
+            <span class="paiCoin_span" disabled>
+                                @if(playPaiCoin){
+                                玩湃币支付:<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;"> 币&nbsp;&nbsp;&nbsp;&nbsp;
+                                @}
+                            </span>
+            <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons">                            <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(${obj.id})"/>
+            <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(4, this)" disabled></i>
+        </div>
+    </div>
+    @}
+</div>
+</div>
+<div class="row btn-group-m-t">
+    <div class="col-sm-10">
+        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.editSubmit()"/>
+        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CoursePackageInfo.close()"/>
+    </div>
+</div>
+</div>
+</div>
+</div>
 <script src="${ctxPath}/modular/system/coursePackage/coursePackage_info.js"></script>
+<script type="text/javascript">
+
+    console.log("============>"+`${couponIds}`)
+    laydate.render({
+        elem: '#classStartTime'
+        ,type: 'time'
+        ,range: true
+    });
+
+    laydate.render({
+        elem: '#holitime'
+        ,range: true //或 range: '~' 来自定义分割字符
+    });
+    var avatarUp = new $WebUpload("coverDrawing");
+    avatarUp.setUploadBarId("progressBar");
+    avatarUp.init();
+
+    var avatarUp1 = new $WebUpload("detailDrawing");
+    avatarUp1.setUploadBarId("progressBar");
+    avatarUp1.init();
+
+    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