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

src/modules/course-manage/DataList/CourseData.jsx

@@ -212,9 +212,10 @@ class DataList extends React.Component {
               <Tooltip 
               title={()=> {
                 return <div>
-                  <div>学员-已加入当前学院的企业员工</div>
-                  <div>待加入-未加入当前学院的企业员工</div>
-                  <div>游客-非企业员工</div>  
+                  <div>学员：已加入当前学院的企业员工</div>
+                  <div>待加入：未加入当前学院的企业员工</div>
+                  <div>游客：非企业员工</div>  
+                  <div>*企业员工以企业微信通讯录为准</div>
                 </div>
               }}>
                 <i className='icon iconfont' style={{fontSize:"14px",fontWeight:"400"}}> &#xe61d;</i>
@@ -237,8 +238,6 @@ class DataList extends React.Component {
       {
         title: '累计在线时长',
         dataIndex: 'totalDuration',
-        sorter: (a, b) => a.totalDuration - b.totalDuration,
-        sortDirections: ['descend', 'ascend'],
         render: (text, record) => {
           //如无离开时间，就置空
           return <span>{text ? dealTimeDuration(text) : '00:00:00'}</span>;

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

@@ -229,7 +229,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 </div>
             </div>
 
-            <div className="duration-time item">
+            <div className="duration-time item" id="odqboqwdq">
                 {
                     cusTime || props.type === "edit" ? (
                         <>
@@ -258,7 +258,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                     ) : (
                         <>
                         <span className="label"><span className="require">*</span>时长：</span>
-                        <Select onChange={onDurationChange} defaultValue={60} style={{width:"140px"}}>
+                        <Select onChange={onDurationChange} defaultValue={60} style={{width:"140px"}} getPopupContainer={()=> document.getElementById("odqboqwdq")}>
                             <Option value={30}>0.5小时</Option>
                             <Option value={60}>1.0小时</Option>
                             <Option value={120}>2.0小时</Option>
@@ -270,7 +270,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 }
 
             </div>
-            <div className="teacher item">
+            <div className="teacher item" id="ieouwowerwe">
                 <span className="label"><span className="require">*</span>讲师：</span>
                 <Select 
                 value={teacherId}
@@ -280,6 +280,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 placeholder="请选择讲师"
                 disabled={!props.isEdit ? true: false}
                 filterOption={(input, option) => option}
+                getPopupContainer={()=> document.getElementById("ieouwowerwe")}
                 showSearch
                 allowClear
                 onPopupScroll={handleScrollTeacherList}
@@ -314,9 +315,14 @@ export default function AddLiveClassInfoWorkWX(props) {
                     }
                 </Select>
             </div>
-            <div className="remind-time item">
+            <div className="remind-time item" id="jfjfiemc">
                 <span className="label"><span className="require">*</span>提醒时间：</span>
-                <Select onChange={onRemindChange} placeholder={"15分钟前"} style={{width:"130px"}}>
+                <Select 
+                onChange={onRemindChange} 
+                placeholder={"15分钟前"} 
+                style={{width:"130px"}} 
+                getPopupContainer={()=> document.getElementById("jfjfiemc")}
+                >
                     <Option value={0}>无</Option>
                     <Option value={300}>5分钟前</Option>
                     <Option value={900}>15分钟前</Option>

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

 .AddLiveClassInfoWorkWX {
     margin-left: 16px;
+    margin-bottom: 98px;
+    .remind-time {
+        .ant-select-single.ant-select-show-arrow .ant-select-selection-placeholder {
+            color: #333333;
+        }
+        
+    }
     .item {
         margin: 24px 0;
         .label {

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

@@ -10,7 +10,7 @@
         color: #333;
         font-weight: 500;
         line-height: 22px;
-        margin-bottom:8px;
+        margin-bottom:25px;
       }
       .add-live__class-info {
         margin-left: 14px;