From 7042adfac9eb4fcdb6cae5c9471727cdaeb358b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 09:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html |   10 ++++++++--
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html      |    6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
index fc6326e..3b9b198 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscount/coursePackageDiscount.html
@@ -13,7 +13,7 @@
                     <div class="col-sm-10">
                         <label class="col-sm-2 control-label">审核状态：</label>
                         <div class="col-sm-4" style="margin-top: 6px;">
-                            <span>审核状态:${type}</span>
+                            <span>${type}</span>
                         </div>
                     </div>
                 </div>
@@ -71,9 +71,13 @@
                         <label class="col-sm-2 control-label">*折扣类型：</label>
                         <div class="col-sm-6" id="types" style="margin-top: 6px;">
                             <input type="checkbox" name="type" value="1"> 会员折扣&nbsp;&nbsp;&nbsp;&nbsp;
+                            @if(type!=2){
                             <input type="checkbox" name="type" value="2"> 续课优惠&nbsp;&nbsp;&nbsp;&nbsp;
+                            @}
                             <input type="checkbox" name="type" value="3"> 限时折扣&nbsp;&nbsp;&nbsp;&nbsp;
+                            @if(type!=2){
                             <input type="checkbox" name="type" value="4"> 赠送课时&nbsp;&nbsp;&nbsp;&nbsp;
+                            @}
                         </div>
                     </div>
                 </div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html
index 262c1bc..6c1e33f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDiscountAudit/coursePackageDiscount.html
@@ -12,7 +12,7 @@
                     <div class="col-sm-10">
                         <label class="col-sm-2 control-label">审核状态：</label>
                         <div class="col-sm-4" style="margin-top: 6px;">
-                            <span>审核状态:${type}</span>
+                            <span>${type}</span>
                         </div>
                     </div>
                 </div>
@@ -42,9 +42,11 @@
                     <div class="col-sm-10">
                         <div class="col-sm-2">
                         </div>
-
+                        @if(type2 == 3){
                         <div class="col-sm-6" id="classHours" style="margin-top: 6px;">
                         </div>
+                        @}
+
                     </div>
                 </div>
                 <div class="form-group">
@@ -71,9 +73,13 @@
                         <label class="col-sm-2 control-label">*折扣类型：</label>
                         <div class="col-sm-6" id="types" style="margin-top: 6px;">
                             <input type="checkbox" name="type" value="1"> 会员折扣&nbsp;&nbsp;&nbsp;&nbsp;
+                            @if(type2!=2){
                             <input type="checkbox" name="type" value="2"> 续课优惠&nbsp;&nbsp;&nbsp;&nbsp;
+                            @}
                             <input type="checkbox" name="type" value="3"> 限时折扣&nbsp;&nbsp;&nbsp;&nbsp;
+                            @if(type2!=2){
                             <input type="checkbox" name="type" value="4"> 赠送课时&nbsp;&nbsp;&nbsp;&nbsp;
+                            @}
                         </div>
                     </div>
                 </div>

--
Gitblit v1.7.1