diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx index 9c03fee0..72c0e18c 100644 --- a/src/components/knockGold/index.jsx +++ b/src/components/knockGold/index.jsx @@ -305,11 +305,19 @@ export default class addKnockGold extends Component { onDisabledRange2 = (date, type) => { let isdisabled = false let str = moment(date).format('YYYY-MM-DD HH:mm:ss') - console.log(str, moment(str).isAfter(this.state.model.entry_time[1])) + const isDay = moment(this.state.model.entry_time[1]).format('HH:mm:ss') if (type == 'start') { - isdisabled = - moment(str).isBefore(this.state.model.entry_time[0]) || - moment(str).subtract(1, 'days').isAfter(this.state.model.entry_time[1]) + if (isDay < '23:59:59') { + isdisabled = + moment(str).isBefore(this.state.model.entry_time[0]) || + moment(str) + .subtract(1, 'days') + .isAfter(this.state.model.entry_time[1]) + } else { + isdisabled = + moment(str).isBefore(this.state.model.entry_time[0]) || + moment(str).isAfter(this.state.model.entry_time[1]) + } } if (type == 'end') {