From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index ac7a50a..b0f0799 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,22 +7,25 @@
<div class="layui-form-item">
<div class="layui-col-md10">
<div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
+ <label class="layui-form-label">订单编号：</label>
<div class="layui-input-inline">
<input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">订单状态</label>
+ <label class="layui-form-label">购买人：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">商品信息：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="商品信息" name="goodsName" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">状态：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -37,24 +40,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">支付状态</label>
- <div class="layui-input-inline">
- <select name="payResult">
- <option value="">请选择</option>
- <option value="1">成功</option>
- <option value="2">未成功</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <label class="layui-form-label">开始时间：</label>
<div class="layui-input-inline">
<input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">结束时间</label>
+ <label class="layui-form-label">结束时间：</label>
<div class="layui-input-inline">
<input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -198,6 +191,11 @@
delOrder(data.id);
});
}
+ if (layEvent === 'orderMoneyFlow') {
+ febs.modal.open( '订单流水', 'modules/order/orderMoneyFlow/' + data.id, {
+ maxmin: true,
+ });
+ }
if (layEvent === 'seePayImage') {
var t = $view.find('#seePayImage'+data.id+'');
//页面层
@@ -311,15 +309,18 @@
if(d.deliverType ===2){
return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" shiro:hasPermission="user:update">自提</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" shiro:hasPermission="user:update" lay-event="orderMoneyFlow">资金流水</button>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" shiro:hasPermission="user:update" lay-event="orderMoneyFlow">资金流水</button>'
}
}else if(d.status === 7){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+'<button class="layui-btn layui-btn-xs layui-btn-normal layui-btn-danger" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs " lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" shiro:hasPermission="user:update" lay-event="orderMoneyFlow">资金流水</button>'
}
// }
},minWidth: 200,align:'center', fixed:'right'}
@@ -341,7 +342,6 @@
name: $searchForm.find('input[name="name"]').val().trim(),
orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
- payResult: $searchForm.find("select[name='payResult']").val(),
status: $searchForm.find("select[name='status']").val(),
};
}
--
Gitblit v1.9.1