update
This commit is contained in:
yan.y
@@ -0,0 +1,89 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
|
||||
</head>
|
||||
<body>
|
||||
<div class="layui-form timo-compile">
|
||||
<form th:action="@{/orders/coupons/save}">
|
||||
<input type="hidden" name="id" th:if="${coupons}" th:value="${coupons.id}">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">优惠券名称</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="name" placeholder="请输入优惠券名称" th:value="${coupons?.name}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">有效商品子类型（子类型商品可使用）</label>
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="goodsSubType" mo:dict="GOODS_SUB_TYPE"
|
||||
mo-selected="${coupons?.goodsSubType}"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">折扣（10-100）</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="discount" placeholder="请输入折扣" th:value="${coupons?.discount}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">来源</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="source" placeholder="请输入来源" th:value="${coupons?.source}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">使用限制</label>
|
||||
<div class="layui-input-inline">
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="periodType" mo:dict="PERIOD_TYPE"
|
||||
mo-selected="${coupons?.periodType}"></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">使用限制信息</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="period" placeholder="请输入使用限制信息" th:value="${coupons?.period}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">领取过期时间</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" id="expireTime" name="expireTimeStr" placeholder="请输入过期时间" th:value="${coupons?.expireTimeStr}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">下发类型</label>
|
||||
<div class="layui-input-inline">
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="sendStatus" mo:dict="COUPONS_SEND_STATUS"
|
||||
mo-selected="${coupons?.sendStatus}"></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">领取后过期天数</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="drawDay" placeholder="领取后过期天数" th:value="${coupons?.drawDay}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item timo-finally">
|
||||
<button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
|
||||
<button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
<script>
|
||||
layui.use(['laydate'], function () {
|
||||
var laydate = layui.laydate;
|
||||
// 渲染
|
||||
laydate.render({
|
||||
elem: '#expireTime',
|
||||
type: 'datetime'
|
||||
});
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,53 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
|
||||
</head>
|
||||
<body>
|
||||
<div class="timo-detail-page">
|
||||
<div class="timo-detail-title">基本信息</div>
|
||||
<table class="layui-table timo-detail-table">
|
||||
<colgroup>
|
||||
<col width="100px"><col>
|
||||
<col width="100px"><col>
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>主键ID</th>
|
||||
<td th:text="${coupons.id}"></td>
|
||||
<th>优惠券名称</th>
|
||||
<td th:text="${coupons.name}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>有效商品子类型</th>
|
||||
<td th:text="${coupons.goodsSubType}"></td>
|
||||
<th>折扣</th>
|
||||
<td th:text="${coupons.discount}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>来源</th>
|
||||
<td th:text="${coupons.source}"></td>
|
||||
<th>使用限制</th>
|
||||
<td th:text="${coupons.periodType}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>使用限制信息</th>
|
||||
<td th:text="${coupons.period}"></td>
|
||||
<th>过期时间戳</th>
|
||||
<td th:text="${coupons.expireTime}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>下发类型</th>
|
||||
<td th:text="${coupons.sendStatus}"></td>
|
||||
<th>创建时间</th>
|
||||
<td th:text="${coupons.createTime}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>更新时间</th>
|
||||
<td th:text="${#dates.format(coupons.updateDate, 'yyyy-MM-dd HH:mm:ss')}" colspan="3"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,79 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org"
|
||||
xmlns:mo="http://www.thymeleaf.org">
|
||||
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
|
||||
</head>
|
||||
<body class="timo-layout-page">
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-header timo-card-header">
|
||||
<span><i class="fa fa-bars"></i> 优惠券管理</span>
|
||||
<i class="layui-icon layui-icon-refresh refresh-btn"></i>
|
||||
</div>
|
||||
<div class="layui-card-body">
|
||||
<div class="layui-row timo-card-screen">
|
||||
<div class="pull-right screen-btn-group">
|
||||
<button class="layui-btn open-popup" data-title="添加优惠券" th:attr="data-url=@{/orders/coupons/add}" data-size="auto">
|
||||
<i class="fa fa-plus"></i> 添加</button>
|
||||
<div class="btn-group">
|
||||
<button class="layui-btn">操作<span class="caret"></span></button>
|
||||
<dl class="layui-nav-child layui-anim layui-anim-upbit">
|
||||
<dd><a class="ajax-status" th:href="@{/orders/coupons/status/ok}">启用</a></dd>
|
||||
<dd><a class="ajax-status" th:href="@{/orders/coupons/status/freezed}">冻结</a></dd>
|
||||
<dd><a class="ajax-status" th:href="@{/orders/coupons/status/delete}">删除</a></dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="timo-table-wrap">
|
||||
<table class="layui-table timo-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="timo-table-checkbox">
|
||||
<label class="timo-checkbox"><input type="checkbox">
|
||||
<i class="layui-icon layui-icon-ok"></i></label>
|
||||
</th>
|
||||
<th>优惠券ID</th>
|
||||
<th>优惠券名称</th>
|
||||
<th>有效商品子类型</th>
|
||||
<th>折扣</th>
|
||||
<th>来源</th>
|
||||
<th>使用限制</th>
|
||||
<th>使用限制信息</th>
|
||||
<th>可领取过期时间</th>
|
||||
<th>下发类型</th>
|
||||
<th>领取后过期天数</th>
|
||||
<th>创建时间</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="item:${list}">
|
||||
<td><label class="timo-checkbox"><input type="checkbox" th:value="${item.id}">
|
||||
<i class="layui-icon layui-icon-ok"></i></label></td>
|
||||
<td th:text="${item.id}">优惠券ID</td>
|
||||
<td th:text="${item.name}">优惠券名称</td>
|
||||
<td th:text="${#dicts.goodsSubType(item.goodsSubType)}">有效商品子类型（子类型商品可使用）</td>
|
||||
<td th:text="${item.discount}">折扣（10-100）</td>
|
||||
<td th:text="${item.source}">来源</td>
|
||||
<td th:text="${#dicts.periodType(item.periodType)}">使用限制</td>
|
||||
<td th:text="${item.period}">使用限制信息</td>
|
||||
<td th:text="${#dates.format(new java.util.Date(item.expireTime), 'yyyy-MM-dd HH:mm:ss')}">过期时间</td>
|
||||
<td th:text="${#dicts.couponsSendStatus(item.sendStatus)}">下发类型</td>
|
||||
<td th:text="${item.drawDay}">领取后过期天数</td>
|
||||
<td th:text="${item.createTime}">创建时间</td>
|
||||
<td>
|
||||
<!-- <a class="ajax-get" data-msg="一键下发所有用户" th:href="@{/orders/coupons/send(ids=${item.id})}">一键下发</a> -->
|
||||
<a class="open-popup" data-title="下发优惠券" th:if="${item.sendStatus == 5}" th:attr="data-url=@{'/orders/coupons/toSend/'+${item.id}}" data-size="auto" href="#">下发优惠券</a>
|
||||
<a class="open-popup" data-title="编辑优惠券" th:attr="data-url=@{'/orders/coupons/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
|
||||
<a class="ajax-get" data-msg="您是否确认删除" th:href="@{/orders/coupons/status/delete(ids=${item.id})}">删除</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div th:replace="/common/fragment :: page"></div>
|
||||
</div>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,33 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
|
||||
</head>
|
||||
<body>
|
||||
<div class="layui-form timo-compile">
|
||||
<form th:action="@{/orders/coupons/send}">
|
||||
<input type="hidden" name="id" th:if="${coupons}" th:value="${coupons.id}">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">下发类型</label>
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="sendType">
|
||||
<option value="1">指定用户</option>
|
||||
<option value="2">所有用户</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">用户ID（指定用户必须传入）</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" type="text" name="uid" placeholder="请输入用户">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item timo-finally">
|
||||
<button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
|
||||
<button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -20,6 +20,13 @@
|
||||
mo-selected="${goods?.goodsType}"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">商品子类型</label>
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="goodsSubType" mo:dict="GOODS_SUB_TYPE"
|
||||
mo-selected="${goods?.goodsSubType}"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">商品服务时间</label>
|
||||
<div class="layui-input-inline">
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
<th>商品ID</th>
|
||||
<th>商品名称</th>
|
||||
<th>商品类型</th>
|
||||
<th>商品子类型</th>
|
||||
<th>商品服务时间</th>
|
||||
<th>商品价格</th>
|
||||
<th>是否可购买多个</th>
|
||||
@@ -55,6 +56,7 @@
|
||||
<td th:text="${item.id}">商品ID</td>
|
||||
<td th:text="${item.name}">商品名称</td>
|
||||
<td th:text="${#dicts.goodsType(item.goodsType)}">商品类型</td>
|
||||
<td th:text="${#dicts.goodsSubType(item.goodsSubType)}">商品子类型</td>
|
||||
<td th:text="${item.time}">商品服务时间</td>
|
||||
<td th:text="${item.price}">商品价格</td>
|
||||
<td th:text="${#dicts.goodsBuyMany(item.buyMany)}">是否可购买多个</td>
|
||||
|
||||
@@ -83,8 +83,11 @@
|
||||
<th>支付类型</th>
|
||||
<th>总金额</th>
|
||||
<th>支付金额</th>
|
||||
<th>会员折扣支付金额</th>
|
||||
<th>折扣</th>
|
||||
<th>会员折扣金额</th>
|
||||
<th>会员折扣</th>
|
||||
<th>优惠券折扣金额</th>
|
||||
<th>优惠券ID</th>
|
||||
<th>优惠券名称</th>
|
||||
<th>订单ID</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -112,12 +115,14 @@
|
||||
<td th:text="${#dicts.payStatus(item.payStatus)}">付款状态</td>
|
||||
<td th:text="${#dicts.payType(item.payType)}">支付类型</td>
|
||||
<td th:text="${item.totalAmount}">总金额</td>
|
||||
<td th:text="${item.payTotalAmount > 0 ? item.payAmount / 10.0 : item.payTotalAmount}">支付金额</td>
|
||||
<td th:text="${item.payTotalAmount / 10.0}">会员折扣支付金额</td>
|
||||
<td th:text="${item.payDiscount / 100.0}">折扣</td>
|
||||
<td th:text="${item.payAmount / 10.0}">支付金额</td>
|
||||
<td th:text="${item.vipDiscountAmount / 10.0}">会员折扣金额</td>
|
||||
<td th:text="${item.payDiscount / 100.0}">会员折扣</td>
|
||||
<td th:text="${item.goodsDiscountAmount / 10.0}">优惠券折扣金额</td>
|
||||
<td th:text="${item.ucid}">优惠券ID</td>
|
||||
<td th:text="${item.coupons?.name}">优惠券名称</td>
|
||||
<td th:text="${item.orderId}">订单ID</td>
|
||||
|
||||
|
||||
<!--<td>
|
||||
<a class="open-popup" data-title="编辑订单" th:attr="data-url=@{'/orders/orderMain/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
|
||||
<a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/orders/orderMain/detail/'+${item.id}}" data-size="800,600" href="#">详细</a>
|
||||
|
||||
@@ -60,6 +60,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>用户ID</th>
|
||||
<th>邀请人ID</th>
|
||||
<th>昵称</th>
|
||||
<th>头像地址</th>
|
||||
<th>余额</th>
|
||||
@@ -68,6 +69,7 @@
|
||||
<th>手机号</th>
|
||||
<th>角色</th>
|
||||
<th>用户宠物</th>
|
||||
<th>优惠券</th>
|
||||
<th>创建时间</th>
|
||||
<th>用户操作</th>
|
||||
</tr>
|
||||
@@ -75,6 +77,7 @@
|
||||
<tbody>
|
||||
<tr th:each="item:${list}">
|
||||
<td th:text="${item.id}">用户ID</td>
|
||||
<td th:text="${item.inviteUserId}">邀请人ID</td>
|
||||
<td th:text="${item.nickName}">昵称</td>
|
||||
<td><img th:src="${item.headImgUrl}" alt="url" style="width: 100px; height: auto;"/> </td>
|
||||
<td th:text="${item.amount == null ? 0 : item.amount / 10.0}">余额</td>
|
||||
@@ -85,6 +88,9 @@
|
||||
<td>
|
||||
<a class="open-popup" data-title="宠物下单" th:attr="data-url=@{'/users/users/toPetInfos/'+${item.id}}" data-size="auto" href="#">宠物下单</a>
|
||||
</td>
|
||||
<td>
|
||||
<a class="open-popup" data-title="优惠券列表" th:attr="data-url=@{'/users/users/toCouponsInfos/'+${item.id}}" data-size="auto" href="#">优惠券列表</a>
|
||||
</td>
|
||||
<td th:text="${item.createTime}">创建时间</td>
|
||||
<td>
|
||||
<a class="open-popup" data-title="充值" th:attr="data-url=@{'/users/users/toRecharge/'+${item.id}}" data-size="auto" href="#">充值</a>
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org"
|
||||
xmlns:mo="http://www.thymeleaf.org">
|
||||
<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
|
||||
</head>
|
||||
<body class="timo-layout-page">
|
||||
<div class="layui-card">
|
||||
|
||||
<div class="layui-card-body">
|
||||
<div class="timo-table-wrap">
|
||||
<table class="layui-table timo-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>优惠券ID</th>
|
||||
<th>优惠券名称</th>
|
||||
<th>优惠券折扣</th>
|
||||
<th>优惠券状态</th>
|
||||
<th>过期时间</th>
|
||||
<th>最后更新时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="item:${userCouponsList}">
|
||||
<td th:text="${item.id}">优惠券ID</td>
|
||||
<td th:text="${item.coupons.name}">优惠券名称</td>
|
||||
<td th:text="${item.coupons.discount / 10.0}">优惠券折扣</td>
|
||||
<td th:text="${#dicts.userCouponsStatus(item.couponsStatus)}">优惠券状态</td>
|
||||
<td th:text="${item.lastExpireTime}">过期时间</td>
|
||||
<td th:text="${item.updateTime}">最后更新时间</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user