From 0d514f7f31d992a91a9b28e44dfabffd034ba6c4 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Tue, 11 Oct 2022 15:41:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=85=8D=E5=90=88=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 69b58a4c..ad276a0f 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -148,10 +148,10 @@ const Column = [
   },
   {
     title: "商品类型",
-    name: "type_text",
-    prop: "type_text",
+    name: "product_type",
+    prop: "product_type",
     width: "50px",
-    type: "normal"
+    type: "slot"
   },
   {
     title: "订单类型",
@@ -859,6 +859,17 @@ export default class orderlist extends React.Component {
                 if (com == "order_type") {
                   return <span>虚拟</span>
                 }
+                if (com == "product_type") {
+                  return (
+                    <span>
+                      {rowData.product_type == 1
+                        ? "直充"
+                        : rowData.product_type == 2
+                        ? "卡密"
+                        : "立减金"}
+                    </span>
+                  )
+                }
                 if (com == "opearo") {
                   return (
                     <div>