Merge branch 'feature/wufan/20210701/course-B-reform' into dev

src/modules/course-manage/video-course/AddVideoCourse.jsx

@@ -112,7 +112,8 @@ class AddVideoCourse extends React.Component {
     })
     })
   }
   }
 
 
-  catalogChange = (value, categoryName) => {
+  catalogChange = (value, _categoryName) => {
+    const categoryName =_.pluck(_categoryName,'categoryName').join('-')
     const changeValueLength = value.length
     const changeValueLength = value.length
     switch (changeValueLength) {
     switch (changeValueLength) {
       case 1:
       case 1:
@@ -527,7 +528,6 @@ class AddVideoCourse extends React.Component {
           })
           })
           return
           return
         }
         }
-    const { instId, adminId } = window.currentUserInstInfo
 
 
     const {
     const {
       id,
       id,
@@ -614,14 +614,6 @@ class AddVideoCourse extends React.Component {
         resolve(false);
         resolve(false);
         return;
         return;
       }
       }
-      // const textMedia = scheduleMedia.filter((item) => item.mediaType === 'TEXT')
-      // for (let i = 0, len = textMedia.length; i < len; i++) {
-      //   if (textMedia[i].mediaContentLength && textMedia[i].mediaContentLength.length > 1000) {
-      //     message.warning(`第${i + 1}个文字简介的字数超过了1000个字`)
-      //     resolve(false)
-      //     return false
-      //   }
-      // }
       resolve(true)
       resolve(true)
     })
     })
   }
   }

src/modules/course-manage/video-course/VideoCourseDetail.tsx

 /*
 /*
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-04-28 18:05:30
  * @Date: 2020-04-28 18:05:30
- * @LastEditors: wufan
- * @LastEditTime: 2021-07-05 10:36:15
+ * @LastEditors: yuananting
+ * @LastEditTime: 2021-07-09 16:21:13
  * @Description: 线上课课程课节详情
  * @Description: 线上课课程课节详情
  */
  */
 
 
@@ -117,7 +117,7 @@ function VideoCourseDetail(){
                             {
                             {
                                 underscore.map(courseChapterList,(item: any,index: number) => {
                                 underscore.map(courseChapterList,(item: any,index: number) => {
                                 return <div className='course-ware' onClick={()=>{handleScanFileModal("MP4",item)}} key={index}>
                                 return <div className='course-ware' onClick={()=>{handleScanFileModal("MP4",item)}} key={index}>
-                                        <div className="course-ware__index">{`${index > 9 ? index + 1 : `0${index + 1 }`} `}</div>
+                                        <div className="course-ware__index">{index < 9 ? `0${index + 1 } ` : index + 1}</div>
                                         <img className='course-ware__img' src='https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png' alt='' />
                                         <img className='course-ware__img' src='https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png' alt='' />
                                         <div className='course-ware__name'>{item.name}</div>
                                         <div className='course-ware__name'>{item.name}</div>
                                 </div>
                                 </div>