From fae314d6788a565a632d07f6144e38d4e3affed8 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 29 Jun 2023 11:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8A=20fix:=20=E3=80=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=91=E5=90=8E=E7=AB=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BA=86=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E5=89=8D=E7=AB=AF=E6=B2=A1=E6=9C=89=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index ec9f68b4..a3069627 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -760,20 +760,26 @@ export default class orderList extends React.Component {
                 }
 
                 if (com == "status_modify_time") {
-                  return <span>{rowData.orderVoucher?.status_modify_time || "-"}</span>
+                  return (
+                    <span>
+                      {rowData.type == 3
+                        ? rowData.update_time
+                        : rowData.orderVoucher?.status_modify_time || "-"}
+                    </span>
+                  )
                 }
 
                 if (com == "product_type") {
                   return (
                     <span>
-                      {rowData.product_type == 1
-                        ? "直充"
-                        : rowData.product_type == 2
+                      {rowData.type === 1 && rowData.product_type == 2
                         ? "卡密"
+                        : rowData.type == 1
+                        ? "直冲"
+                        : rowData.type == 2
+                        ? "立减金"
                         : rowData.type == 3
                         ? "兑换码现金红包"
-                        : rowData.product_type == 3
-                        ? "立减金"
                         : "-"}
                     </span>
                   )