From d8192db6359084d162afafabaa510e0eefb42476 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Oct 2022 10:34:37 +0800
Subject: [PATCH] 20220902
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 dd46f40..9406ba3 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -188,6 +188,11 @@
cancelOrder(data.id);
});
}
+ if (layEvent === 'takeGoods') {
+ febs.modal.confirm('自提商品', '确认自提商品？', function () {
+ takeGoods(data.id);
+ });
+ }
if (layEvent === 'delOrder') {
febs.modal.confirm('删除订单', '确认删除订单？', function () {
delOrder(data.id);
@@ -209,6 +214,13 @@
});
}
});
+
+ function takeGoods(id) {
+ febs.get(ctx + 'admin/order/takeGoods/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
function cancelOrder(id) {
febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
@@ -257,10 +269,20 @@
{field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
{field: 'remark', title: '备注', minWidth: 200,align:'left'},
+ {field: 'deliverType', title: '配送方式',
+ templet: function (d) {
+ if (d.deliverType === 1) {
+ return '<span style="color:green;">快递寄送</span>'
+ } else if (d.deliverType === 2) {
+ return '<span style="color:blue;">到店自提</span>'
+ }else{
+ return '<span style="color:green;">快递寄送</span>'
+ }
+ }, minWidth: 120,align:'center'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
{field: 'carriage', title: '运费', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- {field: 'status', title: '状态',
+ {field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
return '<span style="color:red;">待支付</span>'
@@ -286,8 +308,13 @@
{title: '操作',
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>'
+ if(d.deliverType ===2){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" 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>'
+ }else{
+ 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 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-normal layui-btn-xs" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
--
Gitblit v1.9.1