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

# Conflicts:
#	src/common/js/wechatApi.js
#	src/modules/course-manage/components/LiveCourseList.jsx

src/common/js/wechatApi.js

@@ -42,7 +42,7 @@ export default class WechatApi {
                 timestamp: res2.timestamp, // 必填，生成签名的时间戳
                 nonceStr: res2.nonceStr, // 必填，生成签名的随机串
                 signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
-                jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving'],
+                jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
                 success: (res) => {
                   console.log(res, 'res-agentconfig');
                   console.info('window.WWOpenData', window.WWOpenData);
@@ -77,7 +77,7 @@ export default class WechatApi {
               timestamp: res2.timestamp, // 必填，生成签名的时间戳
               nonceStr: res2.nonceStr, // 必填，生成签名的随机串
               signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
-              jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving'],
+              jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
               success: (res) => {
                 console.log(res, 'res-agentconfig');
                 console.info('window.WWOpenData', window.WWOpenData);
@@ -157,7 +157,21 @@ export default class WechatApi {
             reject(res.err_msg); //错误处理
           }
       });
-
+      });
+    })
+  }
+  static replayLiving(id) {
+    return new Promise((resolve, reject) => {
+      wx.ready(() => {
+        wx.invoke('replayLiving', {
+          "livingId": id,
+        }, function(res) {
+          if (res.err_msg === "replayLiving:ok") {
+            resolve(true)
+          } else {
+            reject(res.err_msg); //错误处理
+          }
+      });
       });
     })
   }

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

@@ -794,7 +794,17 @@ class LiveCourseList extends React.Component {
     })
   }
   handleViewPlayBack = (item) => {
-    let htmlUrl
+    if (item.thirdPartType === "WECHAT") {
+      WechatApi.replayLiving(item.livingId)
+      .then((res)=> {
+        console.log("进入企微回放")
+      })
+      .catch((err)=> {
+        console.log("进入企微回放失败",err)
+      })
+      return
+    }
+    let htmlUrl;
     if (item.teacherId === User.getUserId()) {
       htmlUrl = `${LIVE_SHARE}replay/${item.liveCourseId}?teacherId=${User.getUserId()}&id=${User.getStoreId()}`
     } else if (_.pluck(item.admins, 'adminId').includes(User.getUserId())) {