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

src/core/platform.js

@@ -41,7 +41,7 @@ module.exports = {
     },
     isMac() {
       const ua = navigator.platform.toLowerCase();
-      return ua.indexOf("mac") > 0
+      return ua.indexOf("mac") >= 0
     }
   };
   
\ No newline at end of file

src/modules/course-manage/components/AddLiveClassInfoWorkWX.less

@@ -17,6 +17,9 @@
                 color: red;
             }
         }
+        // .ant-picker:hover .ant-picker-focused {
+        //     border-color: red;
+        // }
     }
     .introduce {
         display: flex;
@@ -24,7 +27,13 @@
     .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
         color: #2966FF;
     }
-    // .ant-select:not(.ant-select-disabled):hover .ant-select-selector{
-    //     border: none;
+
+    
+    // .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+    //     border-color: red;
+    //     box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
+    // }
+    // .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
+    //     border-color: red;
     // }
 }
\ No newline at end of file

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

@@ -366,30 +366,53 @@ class LiveCourseList extends React.Component {
                 {(item.courseState === 'UN_START' || item.courseState === 'STARTING') &&
                   (item.teacherId === User.getUserId() || _.pluck(item.admins, 'adminId').includes(User.getUserId())) && (
                     <>
-                      <div
-                        key='enter_live_room1'
-                        className='operate__item'
-                        onClick={() => {
-                          this.handleEnterLiveRoom(item)
-                        }}>
-                        进入直播间
-                      </div>
+                      {
+                        isMac()?(
+                          <Tooltip title="请使用windows电脑进入直播间" placement="left">
+                            <div style={{fontSize:"14px",color:"#999999"}}>
+                            进入直播间
+                          </div>
+                          </Tooltip>
+                          
+                        ):(
+                          <div
+                          key='enter_live_room1'
+                          className='operate__item'
+                          onClick={() => {
+                            this.handleEnterLiveRoom(item)
+                          }}>
+                          进入直播间
+                        </div>
+                        )
+                      }
+                      
                       <span className='operate__item split' key='view_play_back_split'>
                         {' '}
                         |{' '}
                       </span>
                     </>
                   )}
-                {item.courseState === 'FINISH' && item.haveRecord === 'YES' && (
+                {item.courseState === 'FINISH' &&  (
                   <>
-                    <div
-                      key='view_play_back'
-                      className='operate__item'
-                      onClick={() => {
-                        this.handleViewPlayBack(item)
-                      }}>
-                      查看回放
-                    </div>
+                  {
+                    item.haveRecord === 'YES' ? (
+                      <div
+                        key='view_play_back'
+                        className='operate__item'
+                        onClick={() => {
+                          this.handleViewPlayBack(item)
+                        }}>
+                        查看回放
+                      </div>
+                    ) : (
+                      <Tooltip title="该直播未录制回放" placement="left">
+                        <div style={{fontSize:"14px",color:"#999999"}}>
+                          查看回放
+                        </div>
+                      </Tooltip>
+                    )
+                  }
+                    
                     <span className='operate__item split' key='view_play_back_split'>
                       {' '}
                       |{' '}