Merge pull request #171 from EasyAbp/improve-status-on-order-list-page

Improve order-status display on the list page

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json

@@ -9,6 +9,10 @@
     "OrderOrderNumber": "Order number",
     "OrderCustomerUserId": "Customer user ID",
     "OrderOrderStatus": "Status",
+    "OrderOrderStatusPending": "Pending",
+    "OrderOrderStatusProcessing": "Processing",
+    "OrderOrderStatusCompleted": "Completed",
+    "OrderOrderStatusCanceled": "Canceled",
     "OrderCurrency": "Currency",
     "OrderProductTotalPrice": "Product total price",
     "OrderTotalDiscount": "Total discount",

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json

@@ -9,6 +9,10 @@
     "OrderOrderNumber": "订单号",
     "OrderCustomerUserId": "客户 ID",
     "OrderOrderStatus": "状态",
+    "OrderOrderStatusPending": "待支付",
+    "OrderOrderStatusProcessing": "进行中",
+    "OrderOrderStatusCompleted": "已完成",
+    "OrderOrderStatusCanceled": "已取消",
     "OrderCurrency": "币种",
     "OrderProductTotalPrice": "商品总价",
     "OrderTotalDiscount": "总折扣",

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json

@@ -9,6 +9,10 @@
     "OrderOrderNumber": "訂單號",
     "OrderCustomerUserId": "客戶 ID",
     "OrderOrderStatus": "狀態",
+    "OrderOrderStatusPending": "待支付",
+    "OrderOrderStatusProcessing": "進行中",
+    "OrderOrderStatusCompleted": "已完成",
+    "OrderOrderStatusCanceled": "已取消",
     "OrderCurrency": "幣種",
     "OrderProductTotalPrice": "商品總價",
     "OrderTotalDiscount": "總折扣",

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.css

@@ -0,0 +1,14 @@
+.status-pending-text {
+    color: orange;
+}
+
+.status-processing-text {
+    color: green;
+}
+
+.status-completed-text {
+    color: blue;
+}
+
+.status-canceled-text {
+}

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.js

@@ -31,7 +31,24 @@ $(function () {
             },
             { data: "orderNumber" },
             { data: "customerUserId" },
-            { data: "orderStatus" },
+            {
+                data: "orderStatus",
+                render: function (data, type, row) {
+                    if (data === 1) {
+                        return '<span class="status-pending-text">' + l('OrderOrderStatusPending') + '</span>'
+                    }
+                    if (data === 2) {
+                        return '<span class="status-processing-text">' + l('OrderOrderStatusProcessing') + '</span>'
+                    }
+                    if (data === 4) {
+                        return '<span class="status-completed-text">' + l('OrderOrderStatusCompleted') + '</span>'
+                    }
+                    if (data === 8) {
+                        return '<span class="status-canceled-text">' + l('OrderOrderStatusCanceled') + '</span>'
+                    }
+                    return ''
+                }
+            },
             { data: "currency" },
             { data: "actualTotalPrice" },
         ]