From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
index 9437e45..33e9063 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
@@ -35,7 +35,7 @@
onclick="radio2()"
style="margin-left: 24.7%;">
<label class="col-sm-1" style="margin-left: -17px;width: 20%;">代金券: 可抵</label>
- <input class="col-sm-1" id="discountAmount" onkeyup="value=value.replace(/\D/g,'')"/>
+ <input class="col-sm-1" id="voucherAmount" onkeyup="value=value.replace(/\D/g,'')"/>
<label class="col-sm-1">元</label>
</div>
</div>
@@ -67,14 +67,14 @@
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label"><font style="color:red">*</font>发放方式: </label>
- <input class="col-sm-1 control-label" onclick="checkCompany()" name="company" type="radio"
- value="0" style="margin-top: 10px"/>
+ <input class="col-sm-1 control-label" onclick="distributionMethod1()" name="distributionMethod" type="radio"
+ value="1" style="margin-top: 10px"/>
<label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分购买</label>
- <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
- value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
+ <input class="col-sm-1 control-label" name="distributionMethod" onclick="distributionMethod2()" type="radio"
+ value="2" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">注册赠送</label>
- <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
- value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
+ <input class="col-sm-1 control-label" name="distributionMethod" onclick="distributionMethod3()" type="radio"
+ value="3" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">自动发券</label>
</div>
</div>
@@ -86,12 +86,15 @@
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label"><font style="color:red">*</font>兑换方式: </label>
- <input class="col-sm-1 control-label" onclick="checkCompany()" name="company" type="radio"
- value="0" style="margin-top: 10px"/>
+ <input class="col-sm-1 control-label" onclick="exchangeMethod1()" name="exchangeMethod" type="radio"
+ value="1" style="margin-top: 10px"/>
<label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分</label>
- <input class="col-sm-1 control-label" name="company" onclick="checkCompany2()" type="radio"
- value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
+ <input class="col-sm-1 control-label" name="exchangeMethod" onclick="exchangeMethod2()" type="radio"
+ value="2" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 20%;margin-top: 7px">现金+积分</label>
+ <input class="col-sm-1 control-label" name="exchangeMethod" onclick="exchangeMethod3()" type="radio"
+ value="2" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
+ <label class="col-sm-1" style="width: 20%;margin-top: 7px">现金</label>
</div>
</div>
</div>
@@ -120,14 +123,14 @@
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3 control-label"><font style="color:red">*</font>用户人群: </label>
- <input class="col-sm-1 control-label" onclick="userGroup1()" name="company" type="radio"
- value="0" style="margin-top: 10px"/>
+ <input class="col-sm-1 control-label" onclick="userGroup1()" name="userGroup" type="radio"
+ value="1" style="margin-top: 10px"/>
<label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">全部用户</label>
- <input class="col-sm-1 control-label" name="company" onclick="userGroup2()" type="radio"
- value="1" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
+ <input class="col-sm-1 control-label" name="userGroup" onclick="userGroup2()" type="radio"
+ value="2" checked style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">年度会员</label>
- <input class="col-sm-1 control-label" name="company" onclick="userGroup3()" type="radio"
- value="1" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
+ <input class="col-sm-1 control-label" name="userGroup" onclick="userGroup3()" type="radio"
+ value="3" checked style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 25%;margin-top: -16px">已有学员用户</label>
</div>
</div>
@@ -193,7 +196,7 @@
</div>
</div>
- <div class="row">
+ <div class="row" id="citySelect">
<div class="col-sm-5">
<div class="form-group">
<label class="col-sm-3 control-label"><font style="color:red">*</font>指定城市: </label>
@@ -202,11 +205,16 @@
<select id="city"></select>
<label class="col-sm-1" style="width: 16%;margin-top: 7px">市</label>
<select id="County"></select>
-
+ <div class="col-sm-1">
+ <label name="addBranch" class="form-control" onclick="couponInfoDlg.addBranch()" style="border: 0px;cursor: pointer"><i class="fa fa-plus-circle"></i></label>
+ <label name="addBranch" class="form-control" onclick="couponInfoDlg.delete()" style="border: 0px;cursor: pointer"><i class="fa fa-trash"></i></label>
+ </div>
</div>
</div>
</div>
- <div class="row">
+
+
+ <div class="row" id="storeSelect">
<div class="col-sm-5">
<div class="form-group">
<label class="col-sm-3 control-label"><font style="color:red">*</font>指定门店: </label>
--
Gitblit v1.7.1