后台功能更新
This commit is contained in:
yan.y
@@ -51,6 +51,24 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item" id="catPz">
|
||||
<label class="layui-form-label">宠物品种</label>
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="catPz" mo-selected="0">
|
||||
<option value="0">无</option>
|
||||
<option th:each="c,PetBaseInfo:${cats}" th:value="${c.id}" th:text="${c.assortment}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item" id="dogPz" style="display: none">
|
||||
<label class="layui-form-label">宠物品种</label>
|
||||
<div class="layui-input-inline">
|
||||
<select class="timo-search-select" name="dogPz" o-selected="0">
|
||||
<option value="0">无</option>
|
||||
<option th:each="c,PetBaseInfo:${dogs}" th:value="${c.id}" th:text="${c.assortment}"></option>
|
||||
</select>
|
||||
</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>
|
||||
@@ -67,10 +85,14 @@
|
||||
var petType = data.value
|
||||
if (petType === "1") {
|
||||
$("#catWeight").show()
|
||||
$("#catPz").show()
|
||||
$("#dogWeight").hide()
|
||||
$("#dogPz").hide()
|
||||
} else {
|
||||
$("#catWeight").hide()
|
||||
$("#catPz").hide()
|
||||
$("#dogWeight").show()
|
||||
$("#dogPz").show()
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -81,6 +81,7 @@
|
||||
<th>洗护时长</th>
|
||||
<th>付款状态</th>
|
||||
<th>支付类型</th>
|
||||
<th>定金付款状态</th>
|
||||
<th>总金额</th>
|
||||
<th>支付金额</th>
|
||||
<th>会员折扣金额</th>
|
||||
@@ -89,6 +90,7 @@
|
||||
<th>优惠券ID</th>
|
||||
<th>优惠券名称</th>
|
||||
<th>订单ID</th>
|
||||
<th>支付订单号</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -114,6 +116,7 @@
|
||||
<td th:text="${item.projectionServiceTime}">洗护时长</td>
|
||||
<td th:text="${#dicts.payStatus(item.payStatus)}">付款状态</td>
|
||||
<td th:text="${#dicts.payType(item.payType)}">支付类型</td>
|
||||
<td th:text="${item.payDj}">定金付款状态</td>
|
||||
<td th:text="${item.totalAmount}">总金额</td>
|
||||
<td th:text="${item.payAmount / 10.0}">支付金额</td>
|
||||
<td th:text="${item.vipDiscountAmount / 10.0}">会员折扣金额</td>
|
||||
@@ -122,6 +125,7 @@
|
||||
<td th:text="${item.ucid}">优惠券ID</td>
|
||||
<td th:text="${item.coupons?.name}">优惠券名称</td>
|
||||
<td th:text="${item.orderId}">订单ID</td>
|
||||
<td th:text="${item.payOrderId}">支付订单号</td>
|
||||
|
||||
<!--<td>
|
||||
<a class="open-popup" data-title="编辑订单" th:attr="data-url=@{'/orders/orderMain/edit/'+${item.id}}" data-size="auto" href="#">编辑</a>
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="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-left layui-form-pane timo-search-box">
|
||||
<div class="layui-form timo-compile layui-form-item">
|
||||
<!--<label class="layui-form-label">状态</label>
|
||||
<div class="layui-input-block timo-search-status">
|
||||
<select class="timo-search-select" name="status" mo:dict="SEARCH_STATUS"
|
||||
mo-selected="${param.status}"></select>
|
||||
</div>-->
|
||||
<label class="layui-form-label">订单ID</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" name="orderId" th:value="${param.orderId}" placeholder="请输入订单ID"
|
||||
autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<label class="layui-form-label">用户ID</label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" name="uid" th:value="${param.uid}" placeholder="请输入用户ID"
|
||||
autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<button class="layui-btn timo-search-btn">
|
||||
<i class="fa fa-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="timo-table-wrap">
|
||||
<table class="layui-table timo-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>订单ID</th>
|
||||
<th>用户ID</th>
|
||||
<th>订单名称</th>
|
||||
<th>订单金额</th>
|
||||
<th>订单状态</th>
|
||||
<th>支付ID</th>
|
||||
<th>充值商品ID</th>
|
||||
<th>创建时间</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="item:${list}">
|
||||
<td th:text="${item.orderId}">订单ID</td>
|
||||
<td th:text="${item.uid}">用户ID</td>
|
||||
<td th:text="${item.orderName}">订单名称</td>
|
||||
<td th:text="${item.orderStatus == 3 ? item.orderPrice / 10.0 : item.orderPrice}">订单金额</td>
|
||||
<td th:text="${#dicts.payOrderStatus(item.orderStatus)}">订单状态</td>
|
||||
<td th:text="${item.payId}">订单名称</td>
|
||||
<td th:text="${item.rechargeId}">充值商品ID</td>
|
||||
<td th:text="${item.createTime}">订单创建时间</td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div th:replace="/common/fragment :: page"></div>
|
||||
</div>
|
||||
</div>
|
||||
<script th:replace="/common/template :: script"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -43,6 +43,7 @@
|
||||
<i class="layui-icon layui-icon-ok"></i></label>
|
||||
</th>
|
||||
<th>id</th>
|
||||
<th>宠物品种</th>
|
||||
<th>宠物类型</th>
|
||||
<th>宠物体重</th>
|
||||
<th>宠物毛发</th>
|
||||
@@ -59,6 +60,7 @@
|
||||
<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.assortmentDesc}">宠物品种</td>
|
||||
<td th:text="${#dicts.petType(item.petType)}">宠物类型</td>
|
||||
<td th:if="${item.petType == 1}" th:text="${#dicts.petCatWeight(item.weight)}">宠物体重</td>
|
||||
<td th:if="${item.petType == 2}" th:text="${#dicts.petDogWeight(item.weight)}">宠物体重</td>
|
||||
|
||||
Reference in New Issue
Block a user