diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json index 622b7f6d..55b6b7c6 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json +++ b/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", diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json index e6c3385d..515b4ce9 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json +++ b/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": "总折扣", diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json index a5efa664..63e4fc76 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json +++ b/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": "總折扣", diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.css b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.css index e69de29b..3a4f487a 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.css +++ b/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 { +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.js b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.js index 3cef19de..ff583b8a 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/index.js +++ b/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 '' + l('OrderOrderStatusPending') + '' + } + if (data === 2) { + return '' + l('OrderOrderStatusProcessing') + '' + } + if (data === 4) { + return '' + l('OrderOrderStatusCompleted') + '' + } + if (data === 8) { + return '' + l('OrderOrderStatusCanceled') + '' + } + return '' + } + }, { data: "currency" }, { data: "actualTotalPrice" }, ]