From 3d851269075191b863a8fadb11b95008780cf782 Mon Sep 17 00:00:00 2001
From: zhangds <wuyunbaxyz@163.com>
Date: Mon, 13 May 2024 16:36:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js  | 12 ------------
 src/pages/order/list/utils.js | 12 ++++++------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 04847407..dd4a6c49 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -682,13 +682,6 @@ export default class orderList extends React.Component {
     }
   }
 
-  voucherBatchForEl(data) {
-    console.log("data 1 =>", data)
-    return data.channel_activity_id
-    let el = data.map((item) => item.channel_activity_id)
-    return el.join(" , ")
-  }
-
   //过滤表格枚举状态
   render() {
     const date = (
@@ -911,11 +904,6 @@ export default class orderList extends React.Component {
                     </p>
                   )
                 }
-
-                if (com == "voucher_batch") {
-                  return <>{this.voucherBatchForEl(rowData)}</>
-                }
-
                 if (com == "order_type") {
                   return <span>虚拟</span>
                 }
diff --git a/src/pages/order/list/utils.js b/src/pages/order/list/utils.js
index 1958379b..073b9fa4 100644
--- a/src/pages/order/list/utils.js
+++ b/src/pages/order/list/utils.js
@@ -99,9 +99,9 @@ export const Column = [
   },
   {
     title: "批次号",
-    prop: "voucher_batch",
-    name: "voucher_batch",
-    type: "slot"
+    prop: "channel_activity_id",
+    name: "channel_activity_id",
+    type: "normal"
   },
   {
     title: "创建时间",
@@ -294,9 +294,9 @@ export const detailColumns = [
   },
   {
     title: "渠道立减金批次号",
-    prop: "voucher_batch",
-    name: "voucher_batch",
-    type: "slot",
+    prop: "channel_activity_id",
+    name: "channel_activity_id",
+    type: "normal",
     width: "150px"
   },
   {