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_add.html |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
index dd050df..d2a1140 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
@@ -4,6 +4,7 @@
         <div class="form-horizontal">
             <div class="row">
                 <div class="form-group">
+                    <input type="hidden" value="${type}" id="type" name="type">
                     <label class="col-sm-3 control-label">*所在省:</label>
                     <div class="col-sm-4">
                         <select class="form-control" id="provinceCode" name="provinceCode">
@@ -43,6 +44,13 @@
                         </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">
+                    </div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">*课包名称:</label>
                     <div class="col-sm-4">
@@ -70,14 +78,14 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group">
+                <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" type="number" min="0" placeholder="请输入最多预约人数">
                     </div>
                 </div>
 
-                <div class="form-group">
+                <div class="form-group" ${type == 3 ? 'hidden=hidden' : ''}>
                     <label class="col-sm-3 control-label">*上课时间:</label>
                     <div class="col-sm-4">
                         <input type="checkbox" name="classWeeks" value="周一"> 周一&nbsp;&nbsp;&nbsp;&nbsp;
@@ -89,7 +97,7 @@
                         <input type="checkbox" name="classWeeks" value="周日"> 周日&nbsp;&nbsp;&nbsp;&nbsp;
                     </div>
                 </div>
-                <div class="form-group"  >
+                <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" >
@@ -104,7 +112,7 @@
 
 
                 </div>
-                <div class="form-group">
+                <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" type="number" min="0" placeholder="请输入每节课扣除课时数">
@@ -192,14 +200,14 @@
                 </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" 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"></span>
+                            <span class="classNumber_span"  ${type == 2||type == 3 ? '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;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                            <span class="cash_span" ></span>
                             <span class="paiCoin_span"></span>
                             <#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()"></i>
-                            <input type="text" id = "counpons1" class="counpons"  >
+                            <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice(${type})"></i>
+                            <input type="text" id = "counpons1" class="counpons" hidden="hidden" >
                         </div>
                     </div>
                 </div>
@@ -221,6 +229,12 @@
         ,type: 'time'
         ,range: true
     });
+
+    laydate.render({
+        elem: '#holitime'
+        ,range: true //或 range: '~' 来自定义分割字符
+    });
+
     var avatarUp = new $WebUpload("coverDrawing");
     avatarUp.setUploadBarId("progressBar");
     avatarUp.init();
@@ -237,7 +251,7 @@
 
         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-plus-circle" style="font-size: 24px; margin-left: 10px;" onclick="addTime()"></i>\n' +
+            '                                <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice1(this)"></i>\n' +
             '                            </div>'
         $('#dayTime').append(htmlStr);
         console.log("========="+i)

--
Gitblit v1.7.1