From a0976834b56a085a6ee7001fa78c82ac22deacfa Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 10 Oct 2022 10:10:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E2=80=9C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 867a82d8..69b58a4c 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -147,10 +147,17 @@ const Column = [
     width: "auto"
   },
   {
-    title: "订单类型",
+    title: "商品类型",
     name: "type_text",
     prop: "type_text",
     width: "50px",
+    type: "normal"
+  },
+  {
+    title: "订单类型",
+    name: "order_type",
+    prop: "order_type",
+    width: "50px",
     type: "slot"
   },
   {
@@ -840,9 +847,6 @@ export default class orderlist extends React.Component {
                     </p>
                   )
                 }
-                if (com === "type_text") {
-                  return <span>虚拟</span>
-                }
                 if (com == "channel_activity_id") {
                   return (
                     <span>
@@ -852,6 +856,9 @@ export default class orderlist extends React.Component {
                     </span>
                   )
                 }
+                if (com == "order_type") {
+                  return <span>虚拟</span>
+                }
                 if (com == "opearo") {
                   return (
                     <div>