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 'clickCopyv1.4' into lazyRouter

This commit is contained in:
wangsongsole 2022-08-19 15:58:04 +08:00
parent 0c77acfc2a 3de1c2fd75
commit 180bd5953b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,13 +287,14 @@ 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') const isDay = moment(step1.end_time).format('HH:mm:ss')
if (type == 'start') { if (type == 'start') {
if (isDay < '23:59:59') { if (isDay < '23:59:59') {
isdisabled = isdisabled =
moment(str).isBefore(step1.begin_time) || moment(str).isBefore(step1.begin_time) ||
moment(str).subtract(1, 'days').isAfter(step1.end_time) moment(str).subtract(1, 'days').isAfter(step1.end_time)
} else { } else {
isdisabled =
moment(str).isBefore(step1.begin_time) || moment(str).isBefore(step1.begin_time) ||
moment(str).isAfter(step1.end_time) moment(str).isAfter(step1.end_time)
} }

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

@ -816,7 +816,7 @@ 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') const isDay = moment(end_time).format('HH:mm:ss')
if (type == 'start') { if (type == 'start') {
if (isDay < '23:59:59') { if (isDay < '23:59:59') {
isdisabled = isdisabled =

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

@ -542,7 +542,7 @@ export default class acclist extends React.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')
let isDay = moment(step1.begin_time).format('HH:mm:ss') let isDay = moment(step1.end_time).format('HH:mm:ss')
if (type == 'start') { if (type == 'start') {
if (isDay < '23:59:59') { if (isDay < '23:59:59') {
isdisabled = isdisabled =