From b88180c05a090c9b8d52d6bc7b94d9a5a2082cf7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Sep 2022 10:32:34 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 b95c28e..3f31990 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -149,6 +149,11 @@
                     cancelOrder(data.id);
                 });
             }
+            if (layEvent === 'delOrder') {
+                febs.modal.confirm('删除订单', '确认删除订单?', function () {
+                    delOrder(data.id);
+                });
+            }
             if (layEvent === 'seePayImage') {
                 var t = $view.find('#seePayImage'+data.id+'');
                 //页面层
@@ -168,6 +173,13 @@
 
         function cancelOrder(id) {
             febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+
+        function delOrder(id) {
+            febs.get(ctx + 'admin/order/delOrder/' + id, null, function () {
                 febs.alert.success('操作成功');
                 $query.click();
             });
@@ -203,6 +215,7 @@
                         {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                         {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
+                        {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
@@ -232,6 +245,9 @@
                                     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 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>'
                                     }else{
                                         return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                     }

--
Gitblit v1.9.1