fix:1212313123

src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx

@@ -23,21 +23,23 @@ export default function AddLiveClassInfoWorkWX(props) {
     const [duration, setDuration] = useState(props.data.duration)
     const [cusTime, setCusTime] = useState(false)
 
-    const [beginDate, setBeginDate] = useState(0)
-    const [beginTime, setBeginTime] = useState(0)
-    const [endDate, setEndDate] = useState(0)
-    const [endTime, setEndTime] = useState(0)
-    const [teacherId, setTeacherId] = useState()
-    const [remindTime, setRemindTime] = useState(900)
+    const [beginDate, setBeginDate] = useState(props.data.startTime===0?0:moment(props.data.startTime).startOf('day').valueOf())
+    const [beginTime, setBeginTime] = useState(props.data.startTime)
+    const [endDate, setEndDate] = useState((moment(props.data.endTime).startOf('day').valueOf()))
+    const [endTime, setEndTime] = useState(props.data.endTime)
+    const [teacherId, setTeacherId] = useState(props.data.teacherId)
+    const [remindTime, setRemindTime] = useState(props.data.remindTime)
 
-    useEffect(()=> {
-        setBeginTime(props.data.startTime)
-        setBeginDate(moment(props.data.startTime).startOf('day').valueOf())
-        setEndTime(props.data.startTime+Number(props.data.duration)*1000)
-        setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf())
-        setTeacherId(props.data.teacherId)
-        setRemindTime(props.data.remindTime)
-    },[props.data])
+    // useEffect(()=> {
+    //     setBeginTime(props.data.startTime)
+    //     setBeginDate(props.data.startTime===0?0:moment(props.data.startTime).startOf('day').valueOf())
+    //     if (props.data.startTime !== 0) {
+    //         setEndTime(props.data.startTime+Number(props.data.duration)*1000)
+    //         setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf())
+    //     }
+    //     setTeacherId(props.data.teacherId)
+    //     setRemindTime(props.data.remindTime)
+    // },[props.data])
 
     useEffect(()=> {
         let intro = {content:props.introduce};
@@ -52,23 +54,19 @@ export default function AddLiveClassInfoWorkWX(props) {
     //开始日期
     function onBeginDateChange(date, dateString) {
         if (date) {
-            if (date.isBefore(moment())) {
-                message.warning('开始日期不能早于当前日期')
-                setBeginDate(moment().startOf('day').valueOf())
-            } else {
+            // if (date.isBefore(moment())) {
+            //     message.warning('开始日期不能早于当前日期')
+            //     setBeginDate(moment().startOf('day').valueOf())
+            // } else {
                 let _begindate = date.startOf('day').valueOf();
                 let _begintime = moment(beginTime)
                 let datetime = _begindate+(_begintime.hour()*60+_begintime.minute())*60*1000
                 setBeginTime(datetime)
                 props.onChange("beginTime",datetime)
-                if (!cusTime) {
-                    props.onChange("endTime",datetime+duration*1000)
-                }
                 setBeginDate(_begindate)
-            }
+            // }
         } else {
             setBeginDate(0)
-            setBeginTime(0)
         }
     }
 
@@ -78,25 +76,26 @@ export default function AddLiveClassInfoWorkWX(props) {
     //开始时间
     function onBeginTimeChange(time, dateString) {
         let begin = beginDate+(time.hour()*60+time.minute())*60*1000
+        if (beginDate === 0) {
+            begin = time.valueOf()
+        }
         setBeginTime(begin)
         props.onChange("beginTime",begin)
-        if (!cusTime) {
-            props.onChange("endTime",begin+duration*1000)
-        }
     }
 
     function onBeginTimeOK(time) {
-        if (time.isBefore(moment())) {
-            message.warning('开始时间不能早于当前时间')
-            return
-        }
+
+        // if (time.isBefore(moment())) {
+        //     message.warning('开始时间不能早于当前时间')
+        //     return
+        // }
         let begin = beginDate+(time.hour()*60+time.minute())*60*1000
-        setBeginTime(begin)
-        props.onChange("beginTime",begin)
-        if (!cusTime) {
-            props.onChange("endTime",begin+duration*1000)
+        if (beginDate === 0) {
+            begin = time.valueOf()
         }
+        setBeginTime(begin)
         
+        props.onChange("beginTime",begin)       
     }
     //结束日期
     function onEndDateChange(date, dateString) {
@@ -118,21 +117,28 @@ export default function AddLiveClassInfoWorkWX(props) {
     }
     //结束时间
     function onEndTimeChange(time, dateString) {
-        if (time.isSameOrBefore(moment(beginTime))) {
-            message.warning('结束时间不能早于开始时间')
-            return
-        }
+        // if (time.isSameOrBefore(moment(beginTime))) {
+        //     message.warning('结束时间不能早于开始时间')
+        //     return
+        // }
         let end = endDate+(time.hour()*60+time.minute())*60*1000
+        if (endDate === 0) {
+            end = time.valueOf()
+        }
         setEndTime(end)
         props.onChange("endTime",end)
     }
 
     function onEndTimeOK(time) {
-        if (time.isSameOrBefore(moment(beginTime))) {
-            message.warning('结束时间不能早于开始时间')
-            return
-        }
+        
+        // if (time.isSameOrBefore(moment(beginTime))) {
+        //     message.warning('结束时间不能早于开始时间')
+        //     return
+        // }
         let end = endDate+(time.hour()*60+time.minute())*60*1000
+        if (endDate === 0) {
+            end = time.valueOf()
+        }
         setEndTime(end)
         props.onChange("endTime",end)
     }

src/modules/course-manage/components/CreateWorkWXCourse.jsx

@@ -43,7 +43,8 @@ const defaultClassInfo = {
   courseName: '', //课程名称
   duration: 3600, //直播时长默认1小时
   remindTime: 900,  //提醒时间
-  startTime: new Date().getTime() + 300000,
+  // startTime: new Date().getTime() + 300000,
+  startTime: 0
 };
 
 function CreateWorkWXCourse() {
@@ -124,6 +125,7 @@ function CreateWorkWXCourse() {
         teacherName,
         duration,
         startTime,
+        endTime: startTime+Number(duration)*1000,
         remindTime,
       };