From 2e10dd5a3cb31a6bcce1da08c69bb927f22d3bac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 18:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 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 d5ac1aa..16da162 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -54,6 +54,18 @@
</div>
</form>
<table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
+ <style type="text/css">
+ .layui-table-cell{
+ text-align:center;
+ height: auto;
+ white-space: nowrap; /*文本不会换行，在同一行显示*/
+ overflow: hidden; /*超出隐藏*/
+ text-overflow: ellipsis; /*省略号显示*/
+ }
+ .layui-table img{
+ max-width:200px
+ }
+ </style>
</div>
</div>
</div>
@@ -108,6 +120,22 @@
maxmin: true,
});
}
+
+ if (layEvent === 'seePayImage') {
+ var t = $view.find('#seePayImage'+data.id+'');
+ //页面层
+ layer.open({
+ type: 1,
+ title: "支付凭证",
+ skin: 'layui-layer-rim', //加上边框
+ area: ['80%', '80%'], //宽高
+ shadeClose: true, //开启遮罩关闭
+ end: function (index, layero) {
+ return false;
+ },
+ content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
+ });
+ }
});
// 查询按钮
@@ -133,12 +161,17 @@
id: 'orderTable',
url: ctx + 'admin/order/orderList',
cols: [[
- {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
- {field: 'memberName', title: '购买人', minWidth: 150,align:'left'},
- {field: 'memberPhone', title: '联系方式', minWidth: 150,align:'left'},
- {field: 'amount', title: '订单金额', minWidth: 150,align:'left'},
- {field: 'orderTime', title: '下单时间', minWidth: 150,align:'left'},
- {field: 'payTime', title: '支付时间', minWidth: 150,align:'left'},
+ {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left'},
+ {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
+ {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
+ {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
+ {field: 'orderTime', title: '下单时间', minWidth: 120,align:'left'},
+ {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
+ {field: 'payOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
+ {field: 'payImage', title: '支付凭证',
+ templet: function (d) {
+ return '<a lay-event="seePayImage"><img id="seePayImage'+d.id+'" src="'+d.payImage+'" alt=""></a>';
+ }, minWidth: 200,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -159,17 +192,6 @@
return ''
}
}, minWidth: 80,align:'center'},
- // {field: 'accountStatus', title: '账号状态',
- // templet: function (d) {
- // if (d.accountStatus === 1) {
- // return '<span style="color:green;">正常</span>'
- // } else if (d.accountStatus === 2) {
- // return '<span style="color:red;">禁用</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 80,align:'center'},
- // {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
if (d.status === 2) {
--
Gitblit v1.9.1