Skip to content

X
xiaomai-cloud-class-web
Commit 62b78dbb by maolipeng
Options

fix:1212313123

parent 465a94f5
Showing with 51 additions and 43 deletions
src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx
...@@ -23,21 +23,23 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -23,21 +23,23 @@ export default function AddLiveClassInfoWorkWX(props) {
const [duration, setDuration] = useState(props.data.duration) const [duration, setDuration] = useState(props.data.duration)
const [cusTime, setCusTime] = useState(false) const [cusTime, setCusTime] = useState(false)
const [beginDate, setBeginDate] = useState(0) const [beginDate, setBeginDate] = useState(props.data.startTime===0?0:moment(props.data.startTime).startOf('day').valueOf())
const [beginTime, setBeginTime] = useState(0) const [beginTime, setBeginTime] = useState(props.data.startTime)
const [endDate, setEndDate] = useState(0) const [endDate, setEndDate] = useState((moment(props.data.endTime).startOf('day').valueOf()))
const [endTime, setEndTime] = useState(0) const [endTime, setEndTime] = useState(props.data.endTime)
const [teacherId, setTeacherId] = useState() const [teacherId, setTeacherId] = useState(props.data.teacherId)
const [remindTime, setRemindTime] = useState(900) const [remindTime, setRemindTime] = useState(props.data.remindTime)
useEffect(()=> { // useEffect(()=> {
setBeginTime(props.data.startTime) // setBeginTime(props.data.startTime)
setBeginDate(moment(props.data.startTime).startOf('day').valueOf()) // setBeginDate(props.data.startTime===0?0:moment(props.data.startTime).startOf('day').valueOf())
setEndTime(props.data.startTime+Number(props.data.duration)*1000) // if (props.data.startTime !== 0) {
setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf()) // setEndTime(props.data.startTime+Number(props.data.duration)*1000)
setTeacherId(props.data.teacherId) // setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf())
setRemindTime(props.data.remindTime) // }
},[props.data]) // setTeacherId(props.data.teacherId)
// setRemindTime(props.data.remindTime)
// },[props.data])
useEffect(()=> { useEffect(()=> {
let intro = {content:props.introduce}; let intro = {content:props.introduce};
...@@ -52,23 +54,19 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -52,23 +54,19 @@ export default function AddLiveClassInfoWorkWX(props) {
//开始日期 //开始日期
function onBeginDateChange(date, dateString) { function onBeginDateChange(date, dateString) {
if (date) { if (date) {
if (date.isBefore(moment())) { // if (date.isBefore(moment())) {
message.warning('开始日期不能早于当前日期') // message.warning('开始日期不能早于当前日期')
setBeginDate(moment().startOf('day').valueOf()) // setBeginDate(moment().startOf('day').valueOf())
} else { // } else {
let _begindate = date.startOf('day').valueOf(); let _begindate = date.startOf('day').valueOf();
let _begintime = moment(beginTime) let _begintime = moment(beginTime)
let datetime = _begindate+(_begintime.hour()*60+_begintime.minute())*60*1000 let datetime = _begindate+(_begintime.hour()*60+_begintime.minute())*60*1000
setBeginTime(datetime) setBeginTime(datetime)
props.onChange("beginTime",datetime) props.onChange("beginTime",datetime)
if (!cusTime) {
props.onChange("endTime",datetime+duration*1000)
}
setBeginDate(_begindate) setBeginDate(_begindate)
} // }
} else { } else {
setBeginDate(0) setBeginDate(0)
setBeginTime(0)
} }
} }
...@@ -78,25 +76,26 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -78,25 +76,26 @@ export default function AddLiveClassInfoWorkWX(props) {
//开始时间 //开始时间
function onBeginTimeChange(time, dateString) { function onBeginTimeChange(time, dateString) {
let begin = beginDate+(time.hour()*60+time.minute())*60*1000 let begin = beginDate+(time.hour()*60+time.minute())*60*1000
if (beginDate === 0) {
begin = time.valueOf()
}
setBeginTime(begin) setBeginTime(begin)
props.onChange("beginTime",begin) props.onChange("beginTime",begin)
if (!cusTime) {
props.onChange("endTime",begin+duration*1000)
}
} }
function onBeginTimeOK(time) { function onBeginTimeOK(time) {
if (time.isBefore(moment())) {
message.warning('开始时间不能早于当前时间') // if (time.isBefore(moment())) {
return // message.warning('开始时间不能早于当前时间')
} // return
// }
let begin = beginDate+(time.hour()*60+time.minute())*60*1000 let begin = beginDate+(time.hour()*60+time.minute())*60*1000
setBeginTime(begin) if (beginDate === 0) {
props.onChange("beginTime",begin) begin = time.valueOf()
if (!cusTime) {
props.onChange("endTime",begin+duration*1000)
} }
setBeginTime(begin)
props.onChange("beginTime",begin)
} }
//结束日期 //结束日期
function onEndDateChange(date, dateString) { function onEndDateChange(date, dateString) {
...@@ -118,21 +117,28 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -118,21 +117,28 @@ export default function AddLiveClassInfoWorkWX(props) {
} }
//结束时间 //结束时间
function onEndTimeChange(time, dateString) { function onEndTimeChange(time, dateString) {
if (time.isSameOrBefore(moment(beginTime))) { // if (time.isSameOrBefore(moment(beginTime))) {
message.warning('结束时间不能早于开始时间') // message.warning('结束时间不能早于开始时间')
return // return
} // }
let end = endDate+(time.hour()*60+time.minute())*60*1000 let end = endDate+(time.hour()*60+time.minute())*60*1000
if (endDate === 0) {
end = time.valueOf()
}
setEndTime(end) setEndTime(end)
props.onChange("endTime",end) props.onChange("endTime",end)
} }
function onEndTimeOK(time) { function onEndTimeOK(time) {
if (time.isSameOrBefore(moment(beginTime))) {
message.warning('结束时间不能早于开始时间') // if (time.isSameOrBefore(moment(beginTime))) {
return // message.warning('结束时间不能早于开始时间')
} // return
// }
let end = endDate+(time.hour()*60+time.minute())*60*1000 let end = endDate+(time.hour()*60+time.minute())*60*1000
if (endDate === 0) {
end = time.valueOf()
}
setEndTime(end) setEndTime(end)
props.onChange("endTime",end) props.onChange("endTime",end)
} }
......
src/modules/course-manage/components/CreateWorkWXCourse.jsx
...@@ -43,7 +43,8 @@ const defaultClassInfo = { ...@@ -43,7 +43,8 @@ const defaultClassInfo = {
courseName: '', //课程名称 courseName: '', //课程名称
duration: 3600, //直播时长默认1小时 duration: 3600, //直播时长默认1小时
remindTime: 900, //提醒时间 remindTime: 900, //提醒时间
startTime: new Date().getTime() + 300000, // startTime: new Date().getTime() + 300000,
startTime: 0
}; };
function CreateWorkWXCourse() { function CreateWorkWXCourse() {
...@@ -124,6 +125,7 @@ function CreateWorkWXCourse() { ...@@ -124,6 +125,7 @@ function CreateWorkWXCourse() {
teacherName, teacherName,
duration, duration,
startTime, startTime,
endTime: startTime+Number(duration)*1000,
remindTime, remindTime,
}; };
......
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