Merge branch 'dev' of https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

src/modules/course-manage/graphics-course/components/AddGraphicsIntro.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁 
  * @Date: 2020-07-16 11:05:17 
  * @Last Modified by: chenshu
- * @Last Modified time: 2021-03-19 15:44:56
+ * @Last Modified time: 2021-03-22 10:20:41
  * @Description: 添加直播-简介
  */
 
@@ -132,7 +132,7 @@ class AddGraphicsIntro extends React.Component {
   }
 
   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;
     return (
       <div className="add-video__intro-info">
@@ -171,7 +171,7 @@ class AddGraphicsIntro extends React.Component {
           <div className="content">
             <div className="intro-list">
               <div className="intro-list__item content-editor">
-                {(!id || courseMedia) &&
+                {(!id || loadcourseMedia) &&
                   <GraphicsEditor
                     id="content"
                     detail={{
@@ -189,7 +189,7 @@ class AddGraphicsIntro extends React.Component {
           <div className="content">
             <div className="intro-list">
               <div className="intro-list__item introduce-editor">
-                {(!id || introduce) &&
+                {(!id || loadintroduce) &&
                   <GraphicsEditor
                     id="intro"
                     isIntro={true}

src/modules/home/Home.jsx

@@ -71,9 +71,11 @@ class Home extends React.Component {
           incCustomerNum: res.result.incCustomerNum,
           incLiveCourseNum: res.result.incLiveCourseNum,
           incVideoCourseNum: res.result.incVideoCourseNum,
+          incPictureCourseNum: res.result.incPictureCourseNum,
           liveCourseNum: res.result.liveCourseNum,
           totalCustomerNum: res.result.totalCustomerNum,
           videoCourseNum: res.result.videoCourseNum,
+          pictureCourseNum: res.result.pictureCourseNum,
         })
       }
     })
@@ -182,9 +184,11 @@ class Home extends React.Component {
       incCustomerNum,
       incLiveCourseNum,
       incVideoCourseNum,
+      incPictureCourseNum,
       liveCourseNum,
       totalCustomerNum,
       videoCourseNum,
+      pictureCourseNum,
       timeRange,
       scheduleType,
       studyTimeRange,
@@ -212,7 +216,7 @@ class Home extends React.Component {
               <img className="header-icon" src="https://image.xiaomaiketang.com/xm/jPrRhw8EMF.png" />
               <span className="header-word">课程总数 (个)</span>
             </div>
-            <div className="data-number">{videoCourseNum + liveCourseNum}</div>
+            <div className="data-number">{videoCourseNum + liveCourseNum + pictureCourseNum}</div>
             <div className="course-box">
               <div className="course-item">
                 <div className="course-title">直播课</div>
@@ -239,12 +243,12 @@ class Home extends React.Component {
               <div className="course-item">
                 <div className="course-title">图文课</div>
                 <div className="data">
-                  <span className="course-number">0</span>
+                  <span className="course-number">{pictureCourseNum}</span>
                   <span className="course-word">本月新增</span>
-                  {false &&
+                  {incPictureCourseNum > 0 &&
                     <span className="icon iconfont">&#xe635;</span>
                   }
-                  <span className="add-number">0</span>
+                  <span className="add-number">{incPictureCourseNum}</span>
                 </div>
               </div>
               <div className="course-item">
@@ -304,8 +308,8 @@ class Home extends React.Component {
                   onClick={() => this.setState({ scheduleType: 'VOICE' }, () => this.getHotCourse())}
                 >视频课</span>
                 <span 
-                  className={`tab${scheduleType === 'GRAPHICS' ? ' selected' : ''}`}
-                  onClick={() => this.setState({ scheduleType: 'GRAPHICS' }, () => this.getHotCourse())}
+                  className={`tab${scheduleType === 'PICTURE' ? ' selected' : ''}`}
+                  onClick={() => this.setState({ scheduleType: 'PICTURE' }, () => this.getHotCourse())}
                 >图文课</span>
               </div>
               <div className="study-select">

src/routes/config/menuList.tsx

@@ -30,7 +30,7 @@ export const menuList: any = [
       },
       {
         groupName: "图文课",
-        groupCode: "CourseVideoClass",
+        groupCode: "GraphicLesson",
         link: '/graphics-course'
       },
     ]