HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4

This commit is contained in:
zhangds 2022-08-04 15:19:31 +08:00
parent 0d30d79c86 1ebf47ebd7
commit b756ef8075
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/knockGold/index.jsx
View File

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

3
src/pages/exchangecode/add/add.js
View File

@ -168,7 +168,6 @@ export default class acclist extends React.Component {
}) })
}) })
}) })
let model = { let model = {
title: req.plan_title, title: req.plan_title,
style: req.style, style: req.style,
@ -177,7 +176,7 @@ export default class acclist extends React.Component {
allow_loss: req.allow_loss, allow_loss: req.allow_loss,
merge_stock: req.merge_stock, merge_stock: req.merge_stock,
code_batch: req.code_batch, 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 copy_code_batch_id: req.id
} }
let codeInfo = { let codeInfo = {

8
src/pages/exchangecode/list/list.js
View File

@ -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') const today = moment().format('yyyy-MM-DD HH:mm:ss')
let element = '' 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 = ( element = (
<span <span
className='grid-link' className='grid-link'