Merge remote-tracking branch 'origin/dev_video' into dev_video

# Conflicts:
#	public/react/src/modules/courses/Video/VideoIndex.js

public/react/src/modules/courses/Video/VideoIndex.js

@@ -142,6 +142,17 @@ class VideoIndex extends Component{
     })
     this.getList(page);
   }
+
+  toUpload =()=> {
+    const { admin , is_teacher} = this.props.user;
+    if (admin || (is_teacher && this.props.checkIfProfessionalCertification())) {
+      this.setState({
+        upload:true
+      })
+    } else {
+      this.props.showProfessionalCertificationDialog();
+    }
+  }
   render(){
     const { count , videos , upload , visible , videoVisible , videoId } = this.state;
     const CourseId=this.props.match.params.coursesId;
@@ -186,7 +197,7 @@ class VideoIndex extends Component{
                 upload ?
                 <WordsBtn style="grey" className="font-16" onClick={()=>this.uploadVideo(false)}>取消</WordsBtn>
                 :
-                <WordsBtn style="blue" className="font-16" onClick={()=>this.uploadVideo(true)}>上传视频</WordsBtn>
+                <WordsBtn style="blue" className="font-16" onClick={this.toUpload}>上传视频</WordsBtn>
               }
             </li>
           </p>

public/react/src/modules/courses/new/CoursesNew.js

@@ -869,7 +869,7 @@ class CoursesNew extends Component {
                                     >
                                         {getFieldDecorator("checkboxgroup", {
                                             initialValue: [
-                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group",
+                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video"
                                             ],
                                         })(
                                             <Checkbox.Group style={{ marginTop: "10px"}}>

public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js

@@ -76,14 +76,14 @@ function doCreateUploader (options) {
                     file_name: _random+fileName
                 }).then((response) => {
                     // if (response.data.status == )
-                    const data = response.data.data
-                    var uploadAuth = data.UploadAuth
-                    var uploadAddress = data.UploadAddress
-                    var videoId = data.VideoId
-                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
-
-                    
-
+                    if(response){
+                        const data = response.data.data
+                        var uploadAuth = data.UploadAuth
+                        var uploadAddress = data.UploadAddress
+                        var videoId = data.VideoId
+                        uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
+    
+                    }
                 }).catch((error) => {
                     // 删除当前出错的，并执行下一个任务
                     uploader.deleteFile(uploader._curIndex)

public/react/src/modules/user/usersInfo/video/VideoUpload.js

@@ -47,8 +47,8 @@ function VideoUpload (props) {
                 `
             }
           </style>
-            <div className="courseForm">
-                <span className="titleLabel">标题：</span>
+            <div className="courseForm" style={{display:"flex",alignItems:"center"}}>
+                <span className="titleLabel mt15">标题：</span>
                 <Input placeholder={`标题支持最多${MAX_LENGTH}个字符`} onInput={titleChange} maxLength={MAX_LENGTH} addonAfter={
                         <span className="color-grey-6 font-13">{String(title.length)}/{MAX_LENGTH}</span>
                     }

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -50,7 +50,8 @@ function VideoUploadList (props) {
     }
     const _beforeunload = beforeunload // .bind(this, noUploads, state)
 
-    const username = props.match.params.username
+    const username = props.match.params.username || props.CourseUser;
+    console.log("username",username);
     const { showNotification, history } = props;
     const uploaderOptions = {
             
@@ -237,15 +238,16 @@ function VideoUploadList (props) {
             })
         }).then((response) => {
            // to success page
-           if (response.data.status == 0) {
-               dispatch({type: 'removeAll'})
-            //    setCouldRouteNav(true)
-            if(flag){
-                successFunc(false)
-            }else{
-               history.push(`/users/${username}/videos/success`)
+            if(response){
+                if (response.data.status == 0) {
+                    dispatch({type: 'removeAll'})
+                    if(flag){
+                        successFunc(false)
+                    }else{
+                    history.push(`/users/${username}/videos/success`)
+                    }
+                }
             }
-           }
         }).catch((error) => {
             console.log(error)
         })