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')
}}>
领取后
@@ -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')
}}>
固定时间
@@ -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')
}}>
有效期内,不规则日期可用
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 = (