记得上下班打卡 | git大法好,push需谨慎

Commit 5010f968 authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

parents 4875c141 3f720d24
......@@ -21,20 +21,12 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">用户申请退款:</label>
<div class="col-sm-8" th:if="*{isCanRefund==1}">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isCanRefund" checked>开启</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isCanRefund">关闭</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isCanRefund==0}">
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isCanRefund">开启</label>
<input type="radio" value="0" name="performance_isCanRefund" th:checked="*{isCanRefund==0 ? true : false}" checked> 关闭</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isCanRefund" checked> 关闭</label>
<input type="radio" value="1" name="performance_isCanRefund" th:checked="*{isCanRefund==1 ? true : false}">开启</label>
</div>
</div>
</div>
......@@ -48,41 +40,25 @@
class="form-control" id="endTime" placeholder="结束时间选择" name="refundCloseTime"
required/>
</div>
<div class="form-group" >
<div class="form-group">
<label class="col-sm-3 control-label is-required">用户退款手续费:</label>
<div class="col-sm-8" th:if="*{isRefundPoundage==1}">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundPoundage" checked>开启</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundPoundage">关闭</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isRefundPoundage==0}">
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundPoundage">开启</label>
<input type="radio" value="0" name="performance_isRefundPoundage" th:checked="*{isRefundPoundage==0 ? true : false}" checked> 关闭</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundPoundage" checked> 关闭</label>
<input type="radio" value="1" name="performance_isRefundPoundage" th:checked="*{isRefundPoundage==1 ? true : false}">开启</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">用户退款快递票上门取货快递费:</label>
<div class="col-sm-8" th:if="*{isRefundExpress==1}">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundExpress" checked>用户承担</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundExpress">公司月结</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isRefundExpress==0}">
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundExpress">用户承担</label>
<input type="radio" value="0" name="performance_isRefundExpress" th:checked="*{isRefundExpress==0 ? true : false}" checked> 公司月结</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundExpress" checked>公司月结</label>
<input type="radio" value="1" name="performance_isRefundExpress" th:checked="*{isRefundExpress==1 ? true : false}">用户承担</label>
</div>
</div>
</div>
......@@ -90,10 +66,10 @@
<label class="col-sm-3 control-label is-required">用户退款快递票是否需要退回:</label>
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="0" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==0 ? true : false}" checked>需要</label>
<input type="radio" value="1" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==1 ? true : false}" checked> 需要</label>
</div>
<div class="radio check-box">
<input type="radio" value="1" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==1 ? true : false}">需要</label>
<input type="radio" value="0" name="isBackPaperTicket" th:checked="*{isBackPaperTicket==0 ? true : false}">需要</label>
</div>
</div>
</div>
......@@ -101,29 +77,21 @@
<label class="col-sm-3 control-label is-required">用户退款快递票快递费是否退回:</label>
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="0" name="isRefundExpressNew" th:checked="*{isRefundExpressNew==0 ? true : false}" checked>退回</label>
<input type="radio" value="1" name="isRefundExpressNew" th:checked="*{isRefundExpressNew==1 ? true : false}" checked> 退回</label>
</div>
<div class="radio check-box">
<input type="radio" value="1" name="isRefundExpressNew" th:checked="*{isRefundExpressNew==1 ? true : false}">退回</label>
<input type="radio" value="0" name="isRefundExpressNew" th:checked="*{isRefundExpressNew==0 ? true : false}">退回</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">退款是否退优惠券:</label>
<div class="col-sm-8" th:if="*{isRefundVoucher==1}">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundVoucher" checked>开启</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundVoucher">关闭</label>
</div>
</div>
<div class="col-sm-8" th:if="*{isRefundVoucher==0}">
<div class="col-sm-8">
<div class="radio check-box">
<input type="radio" value="1" name="performance_isRefundVoucher">开启</label>
<input type="radio" value="0" name="performance_isRefundVoucher" th:checked="*{isRefundVoucher==0 ? true : false}" checked> 关闭</label>
</div>
<div class="radio check-box">
<input type="radio" value="0" name="performance_isRefundVoucher" checked> 关闭</label>
<input type="radio" value="1" name="performance_isRefundVoucher" th:checked="*{isRefundVoucher==1 ? true : false}">开启</label>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment