Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDr...

puzhibing

2023-08-14 753c4aede53b07041841d9aa94859b59e366bd5d

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html

@@ -44,7 +44,7 @@
                        <div class="initialLevel col-sm-12 control-label form-group" id="coupon1"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label">优惠券限制数量：</label>
                                <input id="couponCount" name="couponCount1" type="number" min="0" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponCount" name="couponCount1" type="number" min="0" maxlength="12" placeholder="最多12位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -52,7 +52,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠券限制数量：</label>
                                <input id="couponCount" name="couponCount2" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponCount" name="couponCount2" type="number" min="1" placeholder="请输入优惠券限制数量" style="height: 30px" required>
                            </div>
                        </div>

@@ -60,7 +60,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">条件金额：订单满</label>
                                <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" min="14"  maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" min="14"  maxlength="12" placeholder="最多12位数字" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>可使用</label>
@@ -71,7 +71,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠金额：</label>
                                <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" min="1"  maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" min="1"  maxlength="12" placeholder="最多12位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -79,7 +79,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">有效期：</label>
                                <input id="couponValidity" name="couponValidity" type="number" min="1"  maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponValidity" name="couponValidity" type="number" min="1"  maxlength="12" placeholder="最多12位数字" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>天</label>
@@ -90,7 +90,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠券总量：</label>
                                <input id="remainingQuantity" name="remainingQuantity" min="1"  type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="remainingQuantity" name="remainingQuantity" min="1"  type="number" maxlength="12" placeholder="最多12位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -98,7 +98,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">赠送数量：</label>
                                <input id="couponSendQuantity" name="couponSendQuantity"  min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                                <input id="couponSendQuantity" name="couponSendQuantity"  min="1" type="number" placeholder="请输入赠送数量" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>张</label>
@@ -120,6 +120,10 @@
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon_info.js"></script>
<script src="${ctxPath}/static/modular/system/tCoupon/tCoupon.js"></script>
<script type="text/javascript">
    $(function () {
        $("#coupon1").show()
        $("#coupon2").hide()
    });
    //监听下拉菜单的变动操作
    $("#couponType").change(function(){
        if(this.value == 1){