From 60592990d77b00cd53b38441f76d80be721ea273 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Tue, 14 Jun 2022 10:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index c141a862..641657c8 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -143,7 +143,7 @@ const Column = [
     name: 'type_text',
     prop: 'type_text',
     width: 'auto',
-    type: 'normal'
+    type: 'slot'
   },
   {
     title: '折扣',
@@ -730,6 +730,9 @@ export default class orderlist extends React.Component {
                     </p>
                   )
                 }
+                if (com === 'type_text') {
+                  return <span>{rowData.type === 1 ? '商品' : '立减金'}</span>
+                }
                 if (com == 'opearo') {
                   return (
                     <div>