Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -40,7 +40,7 @@ class LiveItem extends Component{
         console.log('Cancel');
       },
     });
-    
+
   }
   render(){
     const { key, item , setLiveId } = this.props;
@@ -65,7 +65,7 @@ class LiveItem extends Component{
           </div>
           {
             item.on_status?
-            <a className="btns going" href={`${item.url}`}>进入</a>
+            <a className="btns going" target="_blank" href={`${item.url}`}>进入</a>
             :
             <span className="btns ect">进入</span>
           }

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

@@ -179,7 +179,7 @@ class VideoIndex extends Component{
   }
   render(){
     const { videos , upload , videoData , type , liveData , lives , page , liveVisible , isSpining , liveId } = this.state;
-    const { admin , is_teacher } = this.props.user;
+    const { admin , is_teacher , business } = this.props.user;
     return(
       <React.Fragment>
         <LivesNew 
@@ -199,7 +199,7 @@ class VideoIndex extends Component{
               </Menu>
             </div>
             {
-              (admin || is_teacher) &&
+              (admin || is_teacher || business) &&
               <li className="fr mt18">
                 {
                   upload ?

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

@@ -881,7 +881,7 @@ class CoursesNew extends Component {
                                             <Checkbox value={"exercise"} className="fl">试卷</Checkbox>
                                             <Checkbox value={"poll"} className="fl">问卷</Checkbox>
                                             <Checkbox value={"attachment"} className="fl">资源</Checkbox>
-                                            <Checkbox value={"video"} className="fl">视频</Checkbox>
+                                            <Checkbox value={"video"} className="fl">视频直播</Checkbox>
                                             <Checkbox value={"board"} className="fl">讨论</Checkbox>
                                             <Checkbox value={"course_group"} className="fl">分班</Checkbox>
 																						<Checkbox value={"statistics"} className="fl">统计</Checkbox>