From f3f055971f1f0a56ff7a2e060fb154d33a7dee9e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Feb 2023 17:22:54 +0800
Subject: [PATCH] ali短信服务

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 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 5731049..d257f3d 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -300,6 +300,8 @@
             ,accept: 'file' //普通文件
             ,done: function(res){
                 console.log("123");
+                febs.alert.success('操作成功');
+                $query.click();
             }
         });
 
@@ -374,28 +376,19 @@
                 elem: $view.find('table'),
                 id: 'orderTable',
                 url: ctx + 'admin/order/orderList?orderType=1',
-                defaultToolbar: [],
+                // defaultToolbar: [],
+                //系统自带打印导出
                 toolbar: '#tableToolBar',
                 cols: [[
                         {type: 'checkbox', fixed: 'left'},
                         {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                         {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                         {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
-                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
-                        {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
-                        // {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
+                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
+                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
+                        {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
-                        // {field: 'isHome', title: '配送方式',
-                        //     templet: function (d) {
-                        //         if (d.isHome === 2) {
-                        //             return '<span style="color:dodgerblue;">自提</span>'
-                        //         } else if (d.isHome === 1) {
-                        //             return '<span style="color:forestgreen;">送货上门</span>'
-                        //         }else{
-                        //             return ''
-                        //         }
-                        //     }, minWidth: 100,align:'center'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
                                 if (d.status === 1) {
@@ -416,18 +409,18 @@
                                     return ''
                                 }
                             }, minWidth: 80,align:'center'},
-                    {field: 'deliveryState', title: '配送状态',
-                        templet: function (d) {
-                            if (d.deliveryState === 1) {
-                                return '<span style="color:dodgerblue;">待配送</span>'
-                            } else if (d.deliveryState === 2) {
-                                return '<span style="color:forestgreen;">配送中</span>'
-                            } else if (d.deliveryState === 3) {
-                                return '<span style="color:forestgreen;">已送达</span>'
-                            }else{
-                                return ''
-                            }
-                        }, minWidth: 80,align:'center'},
+                    // {field: 'deliveryState', title: '配送状态',
+                    //     templet: function (d) {
+                    //         if (d.deliveryState === 1) {
+                    //             return '<span style="color:dodgerblue;">待配送</span>'
+                    //         } else if (d.deliveryState === 2) {
+                    //             return '<span style="color:forestgreen;">配送中</span>'
+                    //         } else if (d.deliveryState === 3) {
+                    //             return '<span style="color:forestgreen;">已送达</span>'
+                    //         }else{
+                    //             return ''
+                    //         }
+                    //     }, minWidth: 80,align:'center'},
                         {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
                         {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                         // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},

--
Gitblit v1.9.1