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

src/common/js/wechatApi.js

@@ -169,7 +169,23 @@ export default class WechatApi {
           if (res.err_msg === "replayLiving:ok") {
           if (res.err_msg === "replayLiving:ok") {
             resolve(true)
             resolve(true)
           } else {
           } else {
-            reject(res.err_msg); //错误处理
+            let err = "进入回放失败"
+            if (res.err_msg === "replayLiving:fail invalid living id") {
+              err = "不合法的直播ID"
+            } else if (res.err_msg === "replayLiving:fail not allow to cross corp") {
+              err = "不可跨企业使用直播ID"
+            } else if (res.err_msg === "replayLiving:fail not allow to cross app") {
+              err = "不可跨应用使用直播ID"
+            } else if (res.err_msg === "replayLiving:fail living has no replay") {
+              err = "不存在直播回放"
+            } else if (res.err_msg === "replayLiving:fail replay is beging creating") {
+              err = "正在直播中，或回放正在生成中，稍后观看回放"
+            } else if (res.err_msg === "replayLiving:fail create replay failed") {
+              err = "回放创建失败"
+            } else if (res.err_msg === "replayLiving:fail invalid parameter") {
+              err = "参数不合法"
+            }
+            reject(err); //错误处理
           }
           }
       });
       });
       });
       });

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

@@ -800,7 +800,10 @@ class LiveCourseList extends React.Component {
         console.log("进入企微回放")
         console.log("进入企微回放")
       })
       })
       .catch((err)=> {
       .catch((err)=> {
-        console.log("进入企微回放失败",err)
+        Modal.warning({
+          title: '提示',
+          content: err,
+        });
       })
       })
       return
       return
     }
     }