Commit 2ff9f5cf by maolipeng

fix:.......

parent 38740bfa
...@@ -189,9 +189,9 @@ export default class WechatApi { ...@@ -189,9 +189,9 @@ export default class WechatApi {
} else if (res.err_msg === "replayLiving:fail not allow to cross app") { } else if (res.err_msg === "replayLiving:fail not allow to cross app") {
err = "不可跨应用使用直播ID" err = "不可跨应用使用直播ID"
} else if (res.err_msg === "replayLiving:fail living has no replay") { } else if (res.err_msg === "replayLiving:fail living has no replay") {
err = "不存在直播回放" err = "直播回放已失效或不存在"
} else if (res.err_msg === "replayLiving:fail replay is beging creating") { } else if (res.err_msg === "replayLiving:fail replay is beging creating") {
err = "正在直播中,或回放正在生成中,稍后观看回放" err = "回放生成中,请耐心等待"
} else if (res.err_msg === "replayLiving:fail create replay failed") { } else if (res.err_msg === "replayLiving:fail create replay failed") {
err = "回放创建失败" err = "回放创建失败"
} else if (res.err_msg === "replayLiving:fail invalid parameter") { } else if (res.err_msg === "replayLiving:fail invalid parameter") {
......
...@@ -37,7 +37,6 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -37,7 +37,6 @@ export default function AddLiveClassInfoWorkWX(props) {
setEndDate(moment(props.data.startTime+Number(props.data.duration)).startOf('day').valueOf()) setEndDate(moment(props.data.startTime+Number(props.data.duration)).startOf('day').valueOf())
setTeacherId(props.data.teacherId) setTeacherId(props.data.teacherId)
setRemindTime(props.data.remindTime) setRemindTime(props.data.remindTime)
console.log(props.data)
},[props.data]) },[props.data])
useEffect(()=> { useEffect(()=> {
...@@ -57,7 +56,8 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -57,7 +56,8 @@ export default function AddLiveClassInfoWorkWX(props) {
message.warning('开始日期不能早于当前日期') message.warning('开始日期不能早于当前日期')
setBeginDate(moment().startOf('day').valueOf()) setBeginDate(moment().startOf('day').valueOf())
} else { } else {
setBeginDate(date.startOf('day').valueOf()) let _begindate = date.startOf('day').valueOf();
setBeginDate(_begindate)
} }
} else { } else {
setBeginDate(0) setBeginDate(0)
...@@ -89,7 +89,8 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -89,7 +89,8 @@ export default function AddLiveClassInfoWorkWX(props) {
//结束日期 //结束日期
function onEndDateChange(date, dateString) { function onEndDateChange(date, dateString) {
if (date) { if (date) {
setEndDate(date.startOf('day').valueOf()) let _endDate = date.startOf('day').valueOf()
setEndDate(_endDate)
} else { } else {
setEndDate(0) setEndDate(0)
} }
...@@ -171,8 +172,6 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -171,8 +172,6 @@ export default function AddLiveClassInfoWorkWX(props) {
} }
} }
// console.log(moment(beginDate).format("YYYY-MM-DD HH:mm"))
// console.log(moment(endDate).format("YYYY-MM-DD HH:mm"))
return ( return (
<div className="AddLiveClassInfoWorkWX"> <div className="AddLiveClassInfoWorkWX">
<div className="begin-time item"> <div className="begin-time item">
...@@ -276,7 +275,7 @@ export default function AddLiveClassInfoWorkWX(props) { ...@@ -276,7 +275,7 @@ export default function AddLiveClassInfoWorkWX(props) {
maxLimit={1000} maxLimit={1000}
detail={introduce} detail={introduce}
onChange={(val) => { onChange={(val) => {
onChangeIntro(val); onChangeIntro(val);
}} }}
></GraphicsEditor> ></GraphicsEditor>
</div> </div>
......
...@@ -58,12 +58,15 @@ function CreateWorkWXCourse() { ...@@ -58,12 +58,15 @@ function CreateWorkWXCourse() {
const [classInfo, setClassInfo] = useState(defaultClassInfo) const [classInfo, setClassInfo] = useState(defaultClassInfo)
const [endTime, setEndTime] = useState(0) const [endTime, setEndTime] = useState(0)
const [introduce, setIntroduce] = useState('') const [introduce, setIntroduce] = useState('')
const [getInfo, setGetInfo] = useState(false)
const [previewLiveCourseModal, setPreviewLiveCourseModal] = useState() const [previewLiveCourseModal, setPreviewLiveCourseModal] = useState()
useEffect(()=> { useEffect(()=> {
routeHook.addSaveCase(); routeHook.addSaveCase();
if (type === 'edit') { if (type === 'edit') {
getCourseDetail(); getCourseDetail();
}else{
setGetInfo(true)
} }
Bus.bind('editorLimit', (editorTextLength) => { Bus.bind('editorLimit', (editorTextLength) => {
setEditorTextLength(editorTextLength) setEditorTextLength(editorTextLength)
...@@ -144,6 +147,7 @@ function CreateWorkWXCourse() { ...@@ -144,6 +147,7 @@ function CreateWorkWXCourse() {
success: (res) => { success: (res) => {
setLoadintroduce(true) setLoadintroduce(true)
setIntroduce(res) setIntroduce(res)
setGetInfo(true)
}, },
error: () => { error: () => {
message.warning('获取简介失败'); message.warning('获取简介失败');
...@@ -432,7 +436,10 @@ function CreateWorkWXCourse() { ...@@ -432,7 +436,10 @@ function CreateWorkWXCourse() {
<div className='class-info__wrap'> <div className='class-info__wrap'>
<div className='title'>上课信息</div> <div className='title'>上课信息</div>
{/* <AddLiveClass isEdit={isEdit} pageType={type} data={{ ...addLiveClassInfo, id }} onChange={handleChangeClassInfo} /> */} {/* <AddLiveClass isEdit={isEdit} pageType={type} data={{ ...addLiveClassInfo, id }} onChange={handleChangeClassInfo} /> */}
<AddLiveClassInfoWorkWX type={type} data={classInfo} isEdit={isEdit} introduce={introduce} onChange={onClassInfoChange}/> {
getInfo && <AddLiveClassInfoWorkWX type={type} data={classInfo} isEdit={isEdit} introduce={introduce} onChange={onClassInfoChange}/>
}
</div> </div>
</div> </div>
......
...@@ -736,7 +736,10 @@ class LiveCourseList extends React.Component { ...@@ -736,7 +736,10 @@ class LiveCourseList extends React.Component {
WechatApi.enterLiveRoom(item.livingId).then((res)=> { WechatApi.enterLiveRoom(item.livingId).then((res)=> {
console.log(res) console.log(res)
}).catch((err)=> { }).catch((err)=> {
console.log(err) Modal.warning({
title:"提示",
content: err
})
}) })
return return
} }
......
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