Commit 6bc3829d by maolipeng

fix:12121212

parent 62b78dbb
......@@ -46,6 +46,11 @@ export default function AddLiveClassInfoWorkWX(props) {
setIntroduce(intro)
},[props.introduce])
useEffect(()=> {
let query = {...defaultTeacherQuery,nickName:props.data.teacherName}
setTeacherQuery(query)
},[])
function disabledDate(current) {
// Can not select days before today and today
return current && current < moment().startOf('day');
......@@ -155,7 +160,7 @@ export default function AddLiveClassInfoWorkWX(props) {
function onTeacherChange(value, option) {
setTeacherId(value)
props.onChange("teacherId",value)
props.onChange("teacherId",{teacherId:value,teacherName:option.children})
}
function onRemindChange(value, option) {
......@@ -171,7 +176,7 @@ export default function AddLiveClassInfoWorkWX(props) {
}
function getTeacherList(current = 1) {
const _query = {
let _query = {
...teacherQuery
};
StoreService.getStoreUserBasicPage(_query).then((res) => {
......
......@@ -173,6 +173,7 @@ function CreateWorkWXCourse() {
switch (field) {
case 'intro':
setIntroduce(value)
console.log(value.length)
break;
case 'beginTime':
console.log(value)
......@@ -188,7 +189,8 @@ function CreateWorkWXCourse() {
setClassInfo(classinfo)
break;
case 'teacherId':
classinfo.teacherId = value
classinfo.teacherId = value.teacherId
classInfo.teacherName = value.teacherName
setClassInfo(classinfo)
break;
case 'remindTime':
......@@ -307,11 +309,11 @@ function CreateWorkWXCourse() {
return
}
if (_.isEmpty(classInfo.teacherId)) {
message.warning("课程分类未选择")
message.warning("未设置讲师")
resolve(false)
return
}
if (introduce.length > 1000) {
if (editorTextLength > 1000) {
message.warning("直播简介超过1000个字")
resolve(false)
return
......@@ -325,7 +327,8 @@ function CreateWorkWXCourse() {
function handleShowPreviewModal() {
// const { addLiveBasicInfo, addLiveClassInfo, addLiveIntroInfo, type, courseState } = this.state;
const previewLiveCourseModal = (
<PreviewCourseModal
<PreviewCourseModal
bizType="qiwei"
courseBasicInfo={basicInfo}
courseClassInfo={{...classInfo,endTime}}
courseIntroInfo={{introduce:introduce,categoryName:basicInfo.courseName}}
......
......@@ -113,41 +113,47 @@ class PreviewCourseModal extends React.Component {
let liveDateStr, startTimeStr, endTimeStr;
if (type === "add") {
const _liveDate = moment(calendarTime[0]).format("YYYY-MM-DD");
console.log("_liveDate", _liveDate);
const _timeHorizonStart = moment(startTime).format("HH:mm");
const _timeHorizonEnd = moment(endTime).format("HH:mm");
const _startTime = moment(_liveDate + " " + _timeHorizonStart).format(
"x"
);
const _endTime = moment(_liveDate + " " + _timeHorizonEnd).format("x");
const {
liveDateStr: _liveDateStr,
startTimeStr: _startTimeStr,
endTimeStr: _endTimeStr,
} = this.dealWithTime(_startTime, _endTime);
liveDateStr = _liveDateStr;
startTimeStr = _startTimeStr;
endTimeStr = _endTimeStr;
if (this.props.bizType === "qiwei") {
startTimeStr = moment(startTime === 0?moment().valueOf():startTime).format("YYYY-MM-DD HH:mm")
endTimeStr = moment(endTime === 0?moment().valueOf():endTime).format("HH:mm")
} else {
const _liveDate = moment(liveDate).format("YYYY-MM-DD");
const _timeHorizonStart = moment(timeHorizonStart).format("HH:mm");
const _timeHorizonEnd = moment(timeHorizonEnd).format("HH:mm");
const startTime = moment(_liveDate + " " + _timeHorizonStart).format("x");
const endTime = moment(_liveDate + " " + _timeHorizonEnd).format("x");
const {
liveDateStr: _liveDateStr,
startTimeStr: _startTimeStr,
endTimeStr: _endTimeStr,
} = this.dealWithTime(startTime, endTime);
liveDateStr = _liveDateStr;
startTimeStr = _startTimeStr;
endTimeStr = _endTimeStr;
if (type === "add") {
const _liveDate = moment(calendarTime[0]).format("YYYY-MM-DD");
console.log("_liveDate", _liveDate);
const _timeHorizonStart = moment(startTime).format("HH:mm");
const _timeHorizonEnd = moment(endTime).format("HH:mm");
const _startTime = moment(_liveDate + " " + _timeHorizonStart).format(
"x"
);
const _endTime = moment(_liveDate + " " + _timeHorizonEnd).format("x");
const {
liveDateStr: _liveDateStr,
startTimeStr: _startTimeStr,
endTimeStr: _endTimeStr,
} = this.dealWithTime(_startTime, _endTime);
liveDateStr = _liveDateStr;
startTimeStr = _startTimeStr;
endTimeStr = _endTimeStr;
} else {
const _liveDate = moment(liveDate).format("YYYY-MM-DD");
const _timeHorizonStart = moment(timeHorizonStart).format("HH:mm");
const _timeHorizonEnd = moment(timeHorizonEnd).format("HH:mm");
const startTime = moment(_liveDate + " " + _timeHorizonStart).format("x");
const endTime = moment(_liveDate + " " + _timeHorizonEnd).format("x");
const {
liveDateStr: _liveDateStr,
startTimeStr: _startTimeStr,
endTimeStr: _endTimeStr,
} = this.dealWithTime(startTime, endTime);
liveDateStr = _liveDateStr;
startTimeStr = _startTimeStr;
endTimeStr = _endTimeStr;
}
}
return (
<Modal
title="预览"
......
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