From 0e014c0a1ec5280b70840f9ce205723c25b424ba Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 3 Aug 2022 18:29:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/add/add.js   | 3 +--
 src/pages/exchangecode/list/list.js | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js
index 72e8b3c9..badedf4e 100644
--- a/src/pages/exchangecode/add/add.js
+++ b/src/pages/exchangecode/add/add.js
@@ -168,7 +168,6 @@ export default class acclist extends React.Component {
                 })
               })
             })
-
             let model = {
               title: req.plan_title,
               style: req.style,
@@ -177,7 +176,7 @@ export default class acclist extends React.Component {
               allow_loss: req.allow_loss,
               merge_stock: req.merge_stock,
               code_batch: req.code_batch,
-              batch_name: `${req.batch_name}_${req.copyCount}`,
+              batch_name: `${req.batch_name}_${++req.copy_count}`,
               copy_code_batch_id: req.id
             }
             let codeInfo = {
diff --git a/src/pages/exchangecode/list/list.js b/src/pages/exchangecode/list/list.js
index 2b668bc7..503f78f4 100644
--- a/src/pages/exchangecode/list/list.js
+++ b/src/pages/exchangecode/list/list.js
@@ -186,10 +186,14 @@ export default class acclist extends React.Component {
   }
 
   /* 处理可复制数据逻辑  */
-  copyElementFunction({ key_batch_id, status, end_time, discard }) {
+  copyElementFunction({ key_batch_id, status, end_time, keyBatch }) {
     const today = moment().format('yyyy-MM-DD HH:mm:ss')
     let element = ''
-    if (![-1, 6, 7].includes(status) && end_time > today && discard === 0) {
+    if (
+      ![-1, 6, 7].includes(status) &&
+      end_time > today &&
+      keyBatch.discard === 0
+    ) {
       element = (
         <span
           className='grid-link'

From 1ebf47ebd789a2c77cfd73fd9b5099cb68c24085 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 4 Aug 2022 10:15:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=AB=8B=E5=87=8F?=
 =?UTF-8?q?=E9=87=91=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/knockGold/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx
index 1652822d..bd21ca46 100644
--- a/src/components/knockGold/index.jsx
+++ b/src/components/knockGold/index.jsx
@@ -1142,7 +1142,7 @@ export default class addKnockGold extends Component {
                     this.onHandleChange([], 'fixed_time')
                     this.onHandleChange([[]], 'irregularDate')
                     this.onHandleChange([[]], 'irregularTime')
-                    this.onHandleChange([[]], 'ruleWeek')
+                    this.onHandleChange([], 'ruleWeek')
                     this.onHandleChange([[]], 'ruleDate')
                   }}>
                   <Radio value='received'>领取后</Radio>
@@ -1193,7 +1193,7 @@ export default class addKnockGold extends Component {
                     this.onHandleChange('', 'effect_date')
                     this.onHandleChange([[]], 'irregularDate')
                     this.onHandleChange([[]], 'irregularTime')
-                    this.onHandleChange([[]], 'ruleWeek')
+                    this.onHandleChange([], 'ruleWeek')
                     this.onHandleChange([[]], 'ruleDate')
                   }}>
                   <Radio value='fiexd'>固定时间</Radio>
@@ -1286,7 +1286,7 @@ export default class addKnockGold extends Component {
                     this.onHandleChange('', 'effect_date_type')
                     this.onHandleChange('', 'effect_date')
                     this.onHandleChange([[]], 'fixed_time')
-                    this.onHandleChange([[]], 'ruleWeek')
+                    this.onHandleChange([], 'ruleWeek')
                     this.onHandleChange([[]], 'ruleDate')
                   }}>
                   <Radio value='irregular'>有效期内，不规则日期可用</Radio>