Commit db9a4672 by chenshu

Merge branch 'feature/chenshu/graphics' into dev

parents eae6aa69 ec7e23da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-07-16 11:05:17 * @Date: 2020-07-16 11:05:17
* @Last Modified by: chenshu * @Last Modified by: chenshu
* @Last Modified time: 2021-03-19 15:44:56 * @Last Modified time: 2021-03-22 10:20:41
* @Description: 添加直播-简介 * @Description: 添加直播-简介
*/ */
...@@ -132,7 +132,7 @@ class AddGraphicsIntro extends React.Component { ...@@ -132,7 +132,7 @@ class AddGraphicsIntro extends React.Component {
} }
render() { render() {
const {data: { id, whetherVisitorsJoin, courseMedia, introduce, shelfState } } = this.props; const {data: { id, whetherVisitorsJoin, courseMedia, introduce, shelfState, loadcourseMedia, loadintroduce } } = this.props;
const { showSelectFileModal, selectType } = this.state; const { showSelectFileModal, selectType } = this.state;
return ( return (
<div className="add-video__intro-info"> <div className="add-video__intro-info">
...@@ -171,7 +171,7 @@ class AddGraphicsIntro extends React.Component { ...@@ -171,7 +171,7 @@ class AddGraphicsIntro extends React.Component {
<div className="content"> <div className="content">
<div className="intro-list"> <div className="intro-list">
<div className="intro-list__item content-editor"> <div className="intro-list__item content-editor">
{(!id || courseMedia) && {(!id || loadcourseMedia) &&
<GraphicsEditor <GraphicsEditor
id="content" id="content"
detail={{ detail={{
...@@ -189,7 +189,7 @@ class AddGraphicsIntro extends React.Component { ...@@ -189,7 +189,7 @@ class AddGraphicsIntro extends React.Component {
<div className="content"> <div className="content">
<div className="intro-list"> <div className="intro-list">
<div className="intro-list__item introduce-editor"> <div className="intro-list__item introduce-editor">
{(!id || introduce) && {(!id || loadintroduce) &&
<GraphicsEditor <GraphicsEditor
id="intro" id="intro"
isIntro={true} isIntro={true}
......
...@@ -30,7 +30,7 @@ export const menuList: any = [ ...@@ -30,7 +30,7 @@ export const menuList: any = [
}, },
{ {
groupName: "图文课", groupName: "图文课",
groupCode: "CourseVideoClass", groupCode: "GraphicLesson",
link: '/graphics-course' link: '/graphics-course'
}, },
] ]
......
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