Merge branch 'dev' of…

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

src/common/js/axios.ts

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:31
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-12 17:40:26
+ * @LastEditTime: 2021-07-14 10:49:14
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */

src/modules/course-manage/modal/PreviewCourseModal.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-07-23 14:54:16
- * @LastEditors: yuananting
- * @LastEditTime: 2021-07-12 11:39:35
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-14 11:43:49
  * @Description: 大班直播课预览弹窗
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */

src/modules/course-manage/offline-course/AddOfflineCourse.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-06 14:47:23
+ * @LastEditTime: 2021-07-14 11:44:14
  * @Description: 线下课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -340,9 +340,10 @@ class AddOfflineCourse extends React.Component {
   handleSelectCover = (file) => {
     this.setState({
       visible: true,
-      imageFile: file,
+      imageFile: file
     });
-  };
+  }
+
 
   //获取resourceId
   getSignature = (blob, fileName) => {
@@ -653,6 +654,11 @@ class AddOfflineCourse extends React.Component {
   };
 
   whetherVisitorsJoinChange = () => {
+    const {whetherSetApply,whetherVisitorsJoin} =this.state;
+    if(whetherSetApply =='NO'){
+      message.warning('关闭报名无法获取手机号!')
+      return
+    }
     if (this.state.whetherVisitorsJoin === 'NO') {
       this.setState({ whetherVisitorsJoin: 'YES' });
     } else {
@@ -847,13 +853,7 @@ class AddOfflineCourse extends React.Component {
                   })}
                 </Select>
               </div>
-              <div className='allow-tourist-join'>
-                <span className='label'>观看设置：</span>
-                <div className='content'>
-                  <Switch checked={whetherVisitorsJoin === 'NO' ? true : false} onChange={this.whetherVisitorsJoinChange} />
-                  <div className='desc'>{whetherVisitorsJoin === 'NO' ? '已开启，学员需绑定手机号才可观看' : '已关闭，学员无需绑定手机号即可观看'}</div>
-                </div>
-              </div>
+
               <div className='introduce'>
                 <span className='label'>课程简介：</span>
                 <div className='content'>
@@ -957,6 +957,7 @@ class AddOfflineCourse extends React.Component {
                           startTimeApply: undefined,
                           endTimeApply: undefined,
                           quota: null,
+                          whetherVisitorsJoin: whetherSetApply !== 'YES' ? whetherVisitorsJoin : false
                         });
                       }}
                     />
@@ -1068,6 +1069,13 @@ class AddOfflineCourse extends React.Component {
                   )}
                 </div>
               </div>
+              <div className='allow-tourist-join'>
+                <span className='label'>观看设置：</span>
+                <div className='content'>
+                  <Switch checked={whetherVisitorsJoin === 'NO' ? true : false} onChange={this.whetherVisitorsJoinChange} />
+                  <div className='desc'>{whetherVisitorsJoin === 'NO' ? '已开启，仅限绑定了手机号的学员报名线下课' : '已关闭，允许未绑定手机号的学员报名线下课'}</div>
+                </div>
+              </div>
               <div className='course-catalog'>
                 <span className='label'>考勤签到：</span>
                 <div className='switch-box'>

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

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-13 15:25:32
+ * @LastEditTime: 2021-07-14 11:39:18
  * @Description: 线上课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -343,13 +343,19 @@ class AddVideoCourse extends React.Component {
           })
         }
       }else{
+        let _mediaName = folderName;
+        if(folderFormat === 'PDF'){
+          _mediaName = folderName.replace('.pdf','')
+        }else{ 
+          _mediaName = folderName.replace('.doc','') && folderName.replace('.docx','')
+        }
         const suffix = _.last(folderName.split('.')).toUpperCase();
         _courseChapterList.push({
           mediaContent: resourceId,
           contentType: 'SCHEDULE',
           mediaType: suffix,
-          mediaName: folderName,
-          id: resourceId,
+          mediaName: _mediaName,
+          resourceId,
           mediaUrl: ossUrl,
           sort: _courseChapterList.length
         })

src/modules/course-manage/video-course/components/LearningDetailModal.jsx

@@ -57,7 +57,7 @@ class LearningDetailModal extends React.Component {
                   <div className="course-wrap">
                     <div className="course-ware" key={index}>
                       <div className="course-ware__index">{`${
-                        index > 9 ? index + 1 : `0${index + 1}`
+                        index < 9 ? `0${index + 1}` : index + 1
                       } `}</div>
                      <img className='course-ware__img' src={FileTypeIcon[item.mediaType]} alt='' />
                     <div className="course-ware__name">{item.courseChapterName && item.courseChapterName.replace('.MP4','')}</div>

src/modules/resource-disk/modal/ScanFileModal.less

@@ -10,4 +10,7 @@
       height: 60px;
     }
   }
+  .video-react .video-react-play-progress:after {
+    width: max-content;
+  }
 }