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

# Conflicts:
#	src/common/js/platform.js

src/common/js/platform.js

 
 
 module.exports = {
 module.exports = {
-    isWeiXin() {
-      const ua = navigator.userAgent.toLowerCase();
-      return ua.indexOf('micromessenger') > 0;
-    },
-    isWorkWx (){
-     return  /wxwork/i.test(navigator.userAgent)
-    },
-    isAlipay() {
-      const ua = navigator.userAgent.toLowerCase();
-      return ua.indexOf('aliapp') > 0 || ua.indexOf('alipay') > 0;
-    },
-  
-    isXiaoMaiApp() {
-      const ua = navigator.userAgent.toLowerCase();
-      return ua.match(/xiaomai_ios/i) === 'xiaomai_ios' || ua.match(/xiaomai_android/i) === 'xiaomai_android';
-    },
-  
-    isXiaoMaiIOSApp() {
-      const ua = navigator.userAgent.toLowerCase();
-      return ua.match(/xiaomai_ios/i) === 'xiaomai_ios';
-    },
-  
-    isXiaoMaiAndroidApp() {
-      const ua = navigator.userAgent.toLowerCase();
-      return ua.match(/xiaomai_android/i) === 'xiaomai_android';
-    },
-  
-    isAndroid() {
-      const ua = navigator.userAgent.toLowerCase();
-      return /android/i.test(ua);
-    },
-    isIOS() {
-      const ua = navigator.userAgent.toLowerCase();
-      return /iphone|ipad|ipod/i.test(ua);
-    },
-    isMeiKe() {
-      const ua = navigator.userAgent.toLowerCase();
-      return /xmappc/i.test(ua);
-    },
-  };
-  
+  isWeiXin() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.indexOf('micromessenger') > 0;
+  },
+  isWorkWx (){
+   return  /wxwork/i.test(navigator.userAgent)
+  },
+  isAlipay() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.indexOf('aliapp') > 0 || ua.indexOf('alipay') > 0;
+  },
+
+  isXiaoMaiApp() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.match(/xiaomai_ios/i) === 'xiaomai_ios' || ua.match(/xiaomai_android/i) === 'xiaomai_android';
+  },
+
+  isXiaoMaiIOSApp() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.match(/xiaomai_ios/i) === 'xiaomai_ios';
+  },
+
+  isXiaoMaiAndroidApp() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.match(/xiaomai_android/i) === 'xiaomai_android';
+  },
+
+  isAndroid() {
+    const ua = navigator.userAgent.toLowerCase();
+    return /android/i.test(ua);
+  },
+  isIOS() {
+    const ua = navigator.userAgent.toLowerCase();
+    return /iphone|ipad|ipod/i.test(ua);
+  },
+  isMeiKe() {
+    const ua = navigator.userAgent.toLowerCase();
+    return /xmappc/i.test(ua);
+  },
+  isMac() {
+    const ua = navigator.platform.toLowerCase();
+    return ua.indexOf("mac") > 0
+  }
+};

src/core/platform.js

@@ -39,5 +39,9 @@ module.exports = {
       const ua = navigator.userAgent.toLowerCase();
       const ua = navigator.userAgent.toLowerCase();
       return /xmappc/i.test(ua);
       return /xmappc/i.test(ua);
     },
     },
+    isMac() {
+      const ua = navigator.platform.toLowerCase();
+      return ua.indexOf("mac") > 0
+    }
   };
   };
   
   
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import WechatApi from '@/common/js/wechatApi';
 import college from '@/common/lottie/college';
 import college from '@/common/lottie/college';
 import { PageControl, XMTable } from '@/components';
 import { PageControl, XMTable } from '@/components';
 import DownloadLiveModal from '@/components/DownloadLiveModal';
 import DownloadLiveModal from '@/components/DownloadLiveModal';
-import { isWorkWx } from '@/core/platform';
+import { isWorkWx, isMac } from '@/core/platform';
 import BaseService from '@/domains/basic-domain/baseService';
 import BaseService from '@/domains/basic-domain/baseService';
 import { LIVE_SHARE } from '@/domains/course-domain/constants';
 import { LIVE_SHARE } from '@/domains/course-domain/constants';
 import CourseService from '@/domains/course-domain/CourseService';
 import CourseService from '@/domains/course-domain/CourseService';
@@ -771,6 +771,13 @@ class LiveCourseList extends React.Component {
         })
         })
         return
         return
       }
       }
+      if (isMac()) {
+        Modal.warning({
+          title:"提示",
+          content:"请使用windows客户端打开"
+        })
+        return
+      }
       CourseService.getWorkWXLiveCourseDetail({
       CourseService.getWorkWXLiveCourseDetail({
         liveCourseId: item.liveCourseId,
         liveCourseId: item.liveCourseId,
       }).then((res) => {
       }).then((res) => {