From 214f64ed571179d830beebe362c47d6e4be7b839 Mon Sep 17 00:00:00 2001
From: zhangds <wuyunbaxyz@163.com>
Date: Mon, 13 May 2024 16:22:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/knockGold/index.jsx        | 4 +++-
 src/components/knockGold/voucherBatch.jsx | 1 -
 src/pages/order/list/list.js              | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx
index 3929ee0e..c4464aa5 100644
--- a/src/components/knockGold/index.jsx
+++ b/src/components/knockGold/index.jsx
@@ -856,7 +856,9 @@ export default class addKnockGold extends Component {
 
   /* 渠道方法 */
   onHandleChangeChannel(value) {
-    this.refs.voucherBatchRef.setSubjectToggle()
+    if (this.refs.voucherBatchRef) {
+      this.refs.voucherBatchRef.setSubjectToggle()
+    }
     this.onHandleChange(value, "channel")
     if (value == 1) {
       this.onHandleChange(defaultInstructionZfb, "instruction")
diff --git a/src/components/knockGold/voucherBatch.jsx b/src/components/knockGold/voucherBatch.jsx
index 323c1a3a..6d003f3b 100644
--- a/src/components/knockGold/voucherBatch.jsx
+++ b/src/components/knockGold/voucherBatch.jsx
@@ -198,7 +198,6 @@ const VoucherBatch = forwardRef((props, ref) => {
 
     return new_data
   }
-
   // 判断是否有重复批次
   const checkDuplicates = (arr, key) => {
     let seenKeys = new Set()
diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index f6d94e06..04847407 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -683,6 +683,8 @@ 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(" , ")
   }
@@ -911,7 +913,7 @@ export default class orderList extends React.Component {
                 }
 
                 if (com == "voucher_batch") {
-                  return <>{this.voucherBatchForEl(rowData.voucher_batch)}</>
+                  return <>{this.voucherBatchForEl(rowData)}</>
                 }
 
                 if (com == "order_type") {
@@ -1171,7 +1173,7 @@ export default class orderList extends React.Component {
               }
 
               if (com == "voucher_batch") {
-                return <>{this.voucherBatchForEl(rowData.voucher_batch)}</>
+                return <>{this.voucherBatchForEl(rowData)}</>
               }
 
               if (com == "operation") {