From fc8453995e0332ff313dacc27d081568caa0975f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 15:32:58 +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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 11bff7c..d5ac1aa 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -133,7 +133,12 @@
id: 'orderTable',
url: ctx + 'admin/order/orderList',
cols: [[
- {field: 'orderNo', title: '商品名称', minWidth: 150,align:'left'},
+ {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: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -169,6 +174,7 @@
templet: function (d) {
if (d.status === 2) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" 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>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
}
--
Gitblit v1.9.1