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

提交

This commit is contained in:
wangsongsole 2022-08-19 15:14:06 +08:00
parent b825fa2ed9
commit 2264e57920
3 changed files with 874 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,10 +287,16 @@ export default class addKnockGold extends Component {
let step1 = JSON.parse(sessionStorage.getItem('knockGold_effectDate')) let step1 = JSON.parse(sessionStorage.getItem('knockGold_effectDate'))
let isdisabled = false let isdisabled = false
let str = moment(date).format('YYYY-MM-DD HH:mm:ss') let str = moment(date).format('YYYY-MM-DD HH:mm:ss')
const isDay = moment(step1.begin_time).format('HH:mm:ss')
if (type == 'start') { if (type == 'start') {
isdisabled = if (isDay < '23:59:59') {
isdisabled =
moment(str).isBefore(step1.begin_time) ||
moment(str).subtract(1, 'days').isAfter(step1.end_time)
} else {
moment(str).isBefore(step1.begin_time) || moment(str).isBefore(step1.begin_time) ||
moment(str).isAfter(step1.end_time) moment(str).isAfter(step1.end_time)
}
} }
if (type == 'end') { if (type == 'end') {

11
src/pages/exchangecode/copyCode/index.jsx
View File

@ -816,9 +816,16 @@ export default class acclist extends React.Component {
let str = moment(date).format('YYYY-MM-DD HH:mm:ss') let str = moment(date).format('YYYY-MM-DD HH:mm:ss')
let beign_time = this.state.begintime let beign_time = this.state.begintime
let end_time = this.state.endtime let end_time = this.state.endtime
const isDay = moment(beign_time).format('HH:mm:ss')
if (type == 'start') { if (type == 'start') {
isdisabled = if (isDay < '23:59:59') {
moment(str).isBefore(beign_time) || moment(str).isAfter(end_time) isdisabled =
moment(str).isBefore(beign_time) ||
moment(str).subtract(1, 'days').isAfter(end_time)
} else {
isdisabled =
moment(str).isBefore(beign_time) || moment(str).isAfter(end_time)
}
} }
if (type == 'end') { if (type == 'end') {

1748
src/pages/plan/add/step2.js
View File

File diff suppressed because it is too large Load Diff