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

src/common/js/wechatApi.js

@@ -170,7 +170,23 @@ export default class WechatApi {
             resolve(true)
             resolve(true)
           } else {
           } else {
             let err = "进入回放失败"
             let err = "进入回放失败"
-            console.log(res.err_msg)
+            console.log(res.err_msg);
+            switch (res.err_msg) {
+              case "replayLiving:fail invalid living id":
+                err = "不合法的直播ID"
+                break;
+              case "replayLiving:fail living has no replay":
+                err = "直播回放已失效或不存在"
+                break
+              case "replayLiving:fail replay is beging creating":
+                err = "回放生成中，请耐心等待"
+                break
+              case "replayLiving:fail create replay failed":
+                err = "回放创建失败"
+                break
+              default:
+                err = "进入回放失败"
+            }
             if (res.err_msg === "replayLiving:fail invalid living id") {
             if (res.err_msg === "replayLiving:fail invalid living id") {
               err = "不合法的直播ID"
               err = "不合法的直播ID"
             } else if (res.err_msg === "replayLiving:fail not allow to cross corp") {
             } else if (res.err_msg === "replayLiving:fail not allow to cross corp") {

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

@@ -333,6 +333,7 @@ class ManageCoursewareModal extends React.Component {
     ];
     ];
     const { list, scanFileModal, editData, cancelObject, showSelectFileModal, selectedFileList, diskList, showPreviewModal, previewStatus, url } = this.state;
     const { list, scanFileModal, editData, cancelObject, showSelectFileModal, selectedFileList, diskList, showPreviewModal, previewStatus, url } = this.state;
     const _list = _.reject(list, (item) => cancelObject[item.id]);
     const _list = _.reject(list, (item) => cancelObject[item.id]);
+    const { thirdPartType } = this.props.data
     return (
     return (
       <Modal
       <Modal
         visible={true}
         visible={true}
@@ -348,10 +349,17 @@ class ManageCoursewareModal extends React.Component {
         {_.isEmpty(_list) ? (
         {_.isEmpty(_list) ? (
           <div className='empty-body'>
           <div className='empty-body'>
             <div id='lottie-box' className='empty-image'></div>
             <div id='lottie-box' className='empty-image'></div>
-            <Button className='empty-button' type='primary' onClick={() => this.addFile()}>
+            { thirdPartType === "WECHAT" && <div className="qiwei-tip">企微直播<br/>Mac暂不支持上传课件，Windows可在直播间添加课件</div>}
+            <Button className='empty-button' type='primary' 
+            disabled={thirdPartType === "WECHAT"}
+            onClick={() => {
+              if (thirdPartType !== "WECHAT") {
+                this.addFile()
+              }
+            }}>
               上传课件
               上传课件
             </Button>
             </Button>
-            <p className='empty-tip'>提前上传直播需要的课件和素材，直播将会变得更便捷！</p>
+            { thirdPartType !== "WECHAT" && <p className='empty-tip'>提前上传直播需要的课件和素材，直播将会变得更便捷！</p>}
           </div>
           </div>
         ) : (
         ) : (
           <div className='manage-body'>
           <div className='manage-body'>

src/modules/course-manage/modal/ManageCoursewareModal.less

@@ -11,6 +11,14 @@
       width:150px;
       width:150px;
       height:150px;
       height:150px;
     }
     }
+    .qiwei-tip {
+      font-size: 14px;
+      font-weight: 400;
+      color: #999;
+      text-align: center;
+      margin-top: 12px;
+      margin-bottom: 12px;
+    }
     .empty-button {
     .empty-button {
       display: block;
       display: block;
       margin: 0 auto 8px;
       margin: 0 auto 8px;