Skip to content

caosy / fun-admin

Go to a project
Commit 0d92ae3b by Huang Linyu
Options

调整系统管理 - 注册用户详情 用户等级 和抵用券详情显示顺序

parent f19ff500
Inline Side-by-side
Showing with 59 additions and 56 deletions
src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl
......@@ -494,62 +494,6 @@ $(function() {
</table>
</div>
<#if vourchers?? && (vourchers?size) gt 0>
<div class="div-orderDetail"><label style="font-size:16px">抵用券详情</label></div>
<div class="div-orderDetail">
<table class="table table-bordered table-striped table-font">
<tr>
<th>编号</th>
<th>金额</th>
<th style="width:260px;">有效期</th>
<th>使用状态</th>
<!--<th>使用时间</th>-->
<!--<th>订单号</th>-->
<th>备注</th>
<th>描述</th>
<th style="width:95px;">操作</th>
</tr>
<#list vourchers as vourcher>
<tr>
<th>${vourcher.id}</th>
<td>${vourcher.amount!}</td><td>${(vourcher.startUseDate?string("yyyy-MM-dd HH:mm:ss"))!}&nbsp;~&nbsp;
${(vourcher.endUseDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>
<td>
<#if vourcher.used == 1>
<font color="red">已使用</font>
<#else>
<#if vourcher.endUseDate?datetime gt .now?datetime >
<font color="green">未使用</font>
<#else>
<font color="grey">已过期</font>
</#if>
</#if>
</td>
<!--<td>${(vourcher.useDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
<!--<td><a href="javascript:;" onclick="javascript:window.open('/order/detailByOrderNo?orderNo=${vourcher.orderNo!}');">${vourcher.orderNo!}</a></td>-->
<td title="<#if vourcher.remark?? && vourcher.remark!="">${vourcher.remark!""}</#if>">
<#if vourcher.remark?? && vourcher.remark!="">${abbreviate(vourcher.remark!"",15, "...")}</#if>
</td>
<td title="<#if vourcher.description?? && vourcher.description!="">${vourcher.description!""}</#if>">
<#if vourcher.description?? && vourcher.description!="">${abbreviate(vourcher.description!"",20, "...")}</#if>
</td>
<td>
<form action="../deleteUserVoucher/${uid!}/${vourcher.id}" method="post">
<#if vourcher.ruleId??>
<button type="button" class="btn-warning view-voucher" data-ruleid="${vourcher.ruleId}">规则</button>
</#if>
<#if vourcher.sendToUserType==2>
<button type="button" class="btn-danger delete-voucher">删除</button>
</#if>
</form>
</td>
</tr>
</#list>
</table></div>
<#else><div class="div-orderDetail"><label style="font-size:16px">没有抵用券</label></div></#if>
<#--积分详情 -->
......@@ -643,6 +587,65 @@ $(function() {
{{/if}}
</script>
<#if vourchers?? && (vourchers?size) gt 0>
<div class="div-orderDetail"><label style="font-size:16px">抵用券详情</label></div>
<div class="div-orderDetail">
<table class="table table-bordered table-striped table-font">
<tr>
<th>编号</th>
<th>金额</th>
<th style="width:260px;">有效期</th>
<th>使用状态</th>
<!--<th>使用时间</th>-->
<!--<th>订单号</th>-->
<th>备注</th>
<th>描述</th>
<th style="width:95px;">操作</th>
</tr>
<#list vourchers as vourcher>
<tr>
<th>${vourcher.id}</th>
<td>${vourcher.amount!}</td><td>${(vourcher.startUseDate?string("yyyy-MM-dd HH:mm:ss"))!}&nbsp;~&nbsp;
${(vourcher.endUseDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>
<td>
<#if vourcher.used == 1>
<font color="red">已使用</font>
<#else>
<#if vourcher.endUseDate?datetime gt .now?datetime >
<font color="green">未使用</font>
<#else>
<font color="grey">已过期</font>
</#if>
</#if>
</td>
<!--<td>${(vourcher.useDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
<!--<td><a href="javascript:;" onclick="javascript:window.open('/order/detailByOrderNo?orderNo=${vourcher.orderNo!}');">${vourcher.orderNo!}</a></td>-->
<td title="<#if vourcher.remark?? && vourcher.remark!="">${vourcher.remark!""}</#if>">
<#if vourcher.remark?? && vourcher.remark!="">${abbreviate(vourcher.remark!"",15, "...")}</#if>
</td>
<td title="<#if vourcher.description?? && vourcher.description!="">${vourcher.description!""}</#if>">
<#if vourcher.description?? && vourcher.description!="">${abbreviate(vourcher.description!"",20, "...")}</#if>
</td>
<td>
<form action="../deleteUserVoucher/${uid!}/${vourcher.id}" method="post">
<#if vourcher.ruleId??>
<button type="button" class="btn-warning view-voucher" data-ruleid="${vourcher.ruleId}">规则</button>
</#if>
<#if vourcher.sendToUserType==2>
<button type="button" class="btn-danger delete-voucher">删除</button>
</#if>
</form>
</td>
</tr>
</#list>
</table></div>
<#else><div class="div-orderDetail"><label style="font-size:16px">没有抵用券</label></div></#if>
<#--账户余额弹层 -->
<div id="J_A_modal" class="modal hide fade">
<div class="modal-header">
......
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 sign in to comment