Merge branch 'feature/zhujian/0726/qwLiving' into rc

# Conflicts:
#	src/index.tsx

src/modules/course-manage/components/LiveCourseOpt.jsx

@@ -63,15 +63,16 @@ class LiveCourseOpt extends React.Component {
   // 下载直播客户端
   // 下载直播客户端
   handleDownloadClient = () => {
   handleDownloadClient = () => {
     const { isMac } = this.state;
     const { isMac } = this.state;
+    const BRAND = process.env.BRAND;
     // 判断学员系统
     // 判断学员系统
     let platform;
     let platform;
-    if(!isMac){
+    if (!isMac) {
       platform = 1
       platform = 1
     } else {
     } else {
       platform = 4
       platform = 4
     }
     }
     BaseService
     BaseService
-    .getLastedVersion({ model: 5, platform})
+      .getLastedVersion({ model: 5, platform })
       .then((res) => {
       .then((res) => {
         const a = document.createElement("a");
         const a = document.createElement("a");
         document.body.appendChild(a);
         document.body.appendChild(a);
@@ -79,6 +80,7 @@ class LiveCourseOpt extends React.Component {
         a.click();
         a.click();
         document.body.removeChild(a);
         document.body.removeChild(a);
       })
       })
+
   }
   }
   render() {
   render() {
     const userRole =  User.getUserRole();
     const userRole =  User.getUserRole();
@@ -87,7 +89,7 @@ class LiveCourseOpt extends React.Component {
       <div className="live-course-opt">
       <div className="live-course-opt">
         <LiveModeSelect onClose={this.onModeSelectClose} onSelected={this.onModeSelected} isShow={this.state.showModeSelect}/>
         <LiveModeSelect onClose={this.onModeSelectClose} onSelected={this.onModeSelected} isShow={this.state.showModeSelect}/>
         <div className="opt__left">
         <div className="opt__left">
-          { userRole !== "CloudLecturer" &&
+          {userRole !== "CloudLecturer" &&
             <Button type="primary" onClick={this.handleCreateLiveCouese}>新建直播课</Button>
             <Button type="primary" onClick={this.handleCreateLiveCouese}>新建直播课</Button>
           }
           }
             {/* <Button type="primary" onClick={this.handleCreateQWCouese}>新建企微直播课</Button> */}
             {/* <Button type="primary" onClick={this.handleCreateQWCouese}>新建企微直播课</Button> */}