Skip to content

X
xiaomai-cloud-class-web
Commit 1bfcd523 by chenshu
Options

fix:修复

parent adcbd68e
Showing with 12 additions and 6 deletions
src/modules/course-manage/offline-course/AddOfflineCourse.jsx
...@@ -628,7 +628,7 @@ class AddOfflineCourse extends React.Component { ...@@ -628,7 +628,7 @@ class AddOfflineCourse extends React.Component {
} else if(data.whetherSetApply === 'YES' && data.startTimeApply >= data.endTimeApply){ } else if(data.whetherSetApply === 'YES' && data.startTimeApply >= data.endTimeApply){
message.warning('报名结束时间需大于报名开始时间'); message.warning('报名结束时间需大于报名开始时间');
resolve(false); resolve(false);
} else if(data.whetherSetApply === 'YES' && data.endTimeApply > moment(moment(data.calendarTime[0]).format('YYYY-MM-DD') + moment(data.endTime).format(' HH:mm')).valueOf()){ } else if(data.whetherSetApply === 'YES' && data.endTimeApply > moment(moment(data.calendarTime[0]).format('YYYY-MM-DD') + moment(data.endTime).format(' HH:mm:ss')).valueOf()){
message.warning('报名结束时间需小于上课开始时间'); message.warning('报名结束时间需小于上课开始时间');
resolve(false); resolve(false);
} else if(data.whetherSetSignIn === 'YES' && !data.signInTimeNum){ } else if(data.whetherSetSignIn === 'YES' && !data.signInTimeNum){
...@@ -714,7 +714,7 @@ class AddOfflineCourse extends React.Component { ...@@ -714,7 +714,7 @@ class AddOfflineCourse extends React.Component {
data.endTimeApply = undefined; data.endTimeApply = undefined;
} else { } else {
data.startTimeApply = dates[0].valueOf(); data.startTimeApply = dates[0].valueOf();
data.endTimeApply = moment(dates[1]).endOf('minute').valueOf(); data.endTimeApply = dates[0].startOf('minute').valueOf() + 59000;
} }
this.setState(data); this.setState(data);
} }
...@@ -1041,7 +1041,7 @@ class AddOfflineCourse extends React.Component { ...@@ -1041,7 +1041,7 @@ class AddOfflineCourse extends React.Component {
onChange={(dates) => { this.handleChangeDates(dates) }} onChange={(dates) => { this.handleChangeDates(dates) }}
renderExtraFooter={() => calendarTime[0] ? <div style={{ position: 'absolute', bottom: 8, cursor: 'pointer' }}> renderExtraFooter={() => calendarTime[0] ? <div style={{ position: 'absolute', bottom: 8, cursor: 'pointer' }}>
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#FFB714',
border: '1px solid #FFB714', border: '1px solid #FFB714',
...@@ -1051,7 +1051,7 @@ class AddOfflineCourse extends React.Component { ...@@ -1051,7 +1051,7 @@ class AddOfflineCourse extends React.Component {
}} }}
>上课前1天</span> >上课前1天</span>
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#FFB714',
border: '1px solid #FFB714', border: '1px solid #FFB714',
...@@ -1061,7 +1061,7 @@ class AddOfflineCourse extends React.Component { ...@@ -1061,7 +1061,7 @@ class AddOfflineCourse extends React.Component {
}} }}
>上课前2天</span> >上课前2天</span>
<span <span
onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })} onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() - 1000 })}
style={{ style={{
color: '#FFB714', color: '#FFB714',
border: '1px solid #FFB714', border: '1px solid #FFB714',
......
src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
...@@ -68,7 +68,13 @@ class OfflineCourseList extends React.Component { ...@@ -68,7 +68,13 @@ class OfflineCourseList extends React.Component {
render: (val, record) => { render: (val, record) => {
const { courseMediaVOS, courseName, offlinePlace, calendarTime, startTime, endTime } = record; const { courseMediaVOS, courseName, offlinePlace, calendarTime, startTime, endTime } = record;
const coverUrl = (_.find(courseMediaVOS, data => data.contentType === 'COVER') || {}).mediaUrl; const coverUrl = (_.find(courseMediaVOS, data => data.contentType === 'COVER') || {}).mediaUrl;
const time = `${calendarTime.map(item => moment(item).format('MM-DD')).join('、')} ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`; let isContinue = calendarTime.length > 1;
_.reduce(calendarTime, (a, b) => {
isContinue = isContinue && (b - a === 86400000);
return b;
})
const lastTime = _.last(calendarTime);
const time = `${!isContinue ? calendarTime.map(item => moment(item).format('MM-DD')).join('、') : `${moment(calendarTime[0]).format('MM-DD')}~${moment(lastTime).format('MM-DD')}`} ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`;
return ( return (
<div className="record__item"> <div className="record__item">
<img className="course-cover" src={coverUrl || defaultCoverUrl} /> <img className="course-cover" src={coverUrl || defaultCoverUrl} />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment