From ba6b5667b5ab59be51ee326ffe15aa622dc75b67 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Oct 2022 10:41:20 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 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 9406ba3..4c1c5f5 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -269,6 +269,7 @@
                         {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
                         {field: 'remark', title: '备注', minWidth: 200,align:'left'},
+                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                         {field: 'deliverType', title: '配送方式',
                             templet: function (d) {
                                 if (d.deliverType === 1) {
@@ -279,29 +280,28 @@
                                     return '<span style="color:green;">快递寄送</span>'
                                 }
                             }, minWidth: 120,align:'center'},
-                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
+                    {field: 'status', title: '状态',
+                        templet: function (d) {
+                            if (d.status === 1) {
+                                return '<span style="color:red;">待支付</span>'
+                            } else if (d.status === 2) {
+                                return '<span style="color:green;">待发货</span>'
+                            }else if (d.status === 3) {
+                                return '<span style="color:green;">待收货</span>'
+                            }else if (d.status === 4) {
+                                return '<span style="color:green;">已完成</span>'
+                            }else if (d.status === 5) {
+                                return '<span style="color:green;">退款中</span>'
+                            }else if (d.status === 6) {
+                                return '<span style="color:green;">已退款</span>'
+                            }else if (d.status === 7) {
+                                return '<span style="color:green;">已取消</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 80,align:'center'},
                         {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
-                    {field: 'status', title: '状态',
-                            templet: function (d) {
-                                if (d.status === 1) {
-                                    return '<span style="color:red;">待支付</span>'
-                                } else if (d.status === 2) {
-                                    return '<span style="color:green;">待发货</span>'
-                                }else if (d.status === 3) {
-                                    return '<span style="color:green;">待收货</span>'
-                                }else if (d.status === 4) {
-                                    return '<span style="color:green;">已完成</span>'
-                                }else if (d.status === 5) {
-                                    return '<span style="color:green;">退款中</span>'
-                                }else if (d.status === 6) {
-                                    return '<span style="color:green;">已退款</span>'
-                                }else if (d.status === 7) {
-                                    return '<span style="color:green;">已取消</span>'
-                                }else{
-                                    return ''
-                                }
-                            }, minWidth: 80,align:'center'},
                         {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
                         {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
                         {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},

--
Gitblit v1.9.1