From cf5a7157ac2ab84166bec743b860e2e2b433ca21 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Wed, 15 Jun 2022 14:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E5=B9=B3=E5=8F=B0=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=B1=95=E7=A4=BA=E2=80=9C-?=
 =?UTF-8?q?=E2=80=9D?=
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 63714936..0d25255a 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -120,7 +120,7 @@ const Column = [
   {
     title: '平台批次号',
     name: 'channel_activity_id',
-    type: 'normal',
+    type: 'slot',
     prop: 'channel_activity_id',
     width: 'auto'
   },
@@ -733,6 +733,9 @@ export default class orderlist extends React.Component {
                 if (com === 'type_text') {
                   return <span>{rowData.type === 1 ? '商品' : '立减金'}</span>
                 }
+                if(com=='channel_activity_id'){
+                  return <span>{rowData.channel_activity_id?rowData.channel_activity_id : '-'}</span>
+                }
                 if (com == 'opearo') {
                   return (
                     <div>