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

# Conflicts:
#	src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx

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

@@ -27,14 +27,14 @@ export default function AddLiveClassInfoWorkWX(props) {
     const [beginTime, setBeginTime] = useState(0)
     const [beginTime, setBeginTime] = useState(0)
     const [endDate, setEndDate] = useState(0)
     const [endDate, setEndDate] = useState(0)
     const [endTime, setEndTime] = useState(0)
     const [endTime, setEndTime] = useState(0)
-    const [teacherId, setTeacherId] = useState("")
-    const [remindTime, setRemindTime] = useState(0)
+    const [teacherId, setTeacherId] = useState()
+    const [remindTime, setRemindTime] = useState(900)
 
 
     useEffect(()=> {
     useEffect(()=> {
         setBeginTime(props.data.startTime)
         setBeginTime(props.data.startTime)
         setBeginDate(moment(props.data.startTime).startOf('day').valueOf())
         setBeginDate(moment(props.data.startTime).startOf('day').valueOf())
-        setEndTime(props.data.startTime+Number(props.data.duration))
-        setEndDate(moment(props.data.startTime+Number(props.data.duration)).startOf('day').valueOf())
+        setEndTime(props.data.startTime+Number(props.data.duration)*1000)
+        setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf())
         setTeacherId(props.data.teacherId)
         setTeacherId(props.data.teacherId)
         setRemindTime(props.data.remindTime)
         setRemindTime(props.data.remindTime)
     },[props.data])
     },[props.data])
@@ -75,9 +75,13 @@ export default function AddLiveClassInfoWorkWX(props) {
         console.log(date)
         console.log(date)
     }
     }
     //开始时间
     //开始时间
-    function onBeginTimeChange(date, dateString) {
-        console.log("onBeginTimeChange",date)
-        // props.onChange("beginTime",date.valueOf())
+    function onBeginTimeChange(time, dateString) {
+        let begin = beginDate+(time.hour()*60+time.minute())*60*1000
+        setBeginTime(begin)
+        props.onChange("beginTime",begin)
+        if (!cusTime) {
+            props.onChange("endTime",begin+duration)
+        }
     }
     }
 
 
     function onBeginTimeOK(time) {
     function onBeginTimeOK(time) {
@@ -112,8 +116,14 @@ export default function AddLiveClassInfoWorkWX(props) {
 
 
     }
     }
     //结束时间
     //结束时间
-    function onEndTimeChange(date, dateString) {
-        // props.onChange("endTime",date.valueOf())
+    function onEndTimeChange(time, dateString) {
+        if (time.isSameOrBefore(moment(beginTime))) {
+            message.warning('结束时间不能早于开始时间')
+            return
+        }
+        let end = endDate+(time.hour()*60+time.minute())*60*1000
+        setEndTime(end)
+        props.onChange("endTime",end)
     }
     }
 
 
     function onEndTimeOK(time) {
     function onEndTimeOK(time) {
@@ -270,9 +280,10 @@ export default function AddLiveClassInfoWorkWX(props) {
             </div>
             </div>
             <div className="remind-time item">
             <div className="remind-time item">
                 <span className="label"><span className="require">*</span>提醒时间：</span>
                 <span className="label"><span className="require">*</span>提醒时间：</span>
-                <Select value={remindTime} onChange={onRemindChange} defaultValue={0} style={{width:"100px"}}>
+                <Select onChange={onRemindChange} placeholder={"15分钟前"} style={{width:"130px"}}>
                     <Option value={0}>无</Option>
                     <Option value={0}>无</Option>
                     <Option value={300}>5分钟前</Option>
                     <Option value={300}>5分钟前</Option>
+                    <Option value={900}>15分钟前</Option>
                     <Option value={3600}>1小时前</Option>
                     <Option value={3600}>1小时前</Option>
                     <Option value={86400}>1天前</Option>
                     <Option value={86400}>1天前</Option>
                 </Select>
                 </Select>

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

@@ -42,7 +42,7 @@ const defaultClassInfo = {
   teacherId: null, //讲师的Id
   teacherId: null, //讲师的Id
   courseName: '', //课程名称
   courseName: '', //课程名称
   duration: 3600, //直播时长默认1小时
   duration: 3600, //直播时长默认1小时
-  remindTime: 0,  //提醒时间
+  remindTime: 900,  //提醒时间
   startTime: new Date().getTime() + 300000,
   startTime: new Date().getTime() + 300000,
 };
 };
 
 
@@ -361,7 +361,7 @@ function CreateWorkWXCourse() {
           </div>
           </div>
           <div className='add-live-page__form'>
           <div className='add-live-page__form'>
             <div className='basic-info__wrap'>
             <div className='basic-info__wrap'>
-              <div className='title'>基本信息</div>
+              <div className='title'>基本信息<span style={{marginLeft:"24px",color:"#2966FF",fontSize:"14px"}}>温馨提示：在直播间可控制回放录制功能。</span></div>
               <AddLiveBasic isEdit={isEdit} pageType={type} data={basicInfo} onChange={handleChangeBasicInfo} />
               <AddLiveBasic isEdit={isEdit} pageType={type} data={basicInfo} onChange={handleChangeBasicInfo} />
             </div>
             </div>
 
 

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

@@ -303,6 +303,20 @@ class LiveCourseFilter extends React.Component {
                   style={{ width: 'calc(100% - 70px)' }}
                   style={{ width: 'calc(100% - 70px)' }}
                   placeholder='请选择'
                   placeholder='请选择'
                   allowClear={true}
                   allowClear={true}
+                  onClear={(value) => {
+                    this.setState(
+                      {
+                        teacherQuery: {
+                          size: 10,
+                          current: 1,
+                          nickName: null,
+                        },
+                      },
+                      () => {
+                        this.getTeacherList()
+                      }
+                    )
+                  }}
                   value={thirdPartType}
                   value={thirdPartType}
                   onChange={(value) => {
                   onChange={(value) => {
                     this.handleChangeQuery('thirdPartType', value)
                     this.handleChangeQuery('thirdPartType', value)

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

@@ -646,15 +646,48 @@ class LiveCourseList extends React.Component {
         }
         }
       }}
       }}
       >
       >
-        <Menu.Item disabled={!(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager')} key="link">
-          关联培训计划
-        </Menu.Item>
-        <Menu.Item disabled={item.courseState === "STARTING" || item.courseState === "FINISH"} key="edit">
-          编辑
-        </Menu.Item>
-        <Menu.Item disabled={item.courseState === "STARTING" || (now > item.startTime && now < item.endTime)} key="del">
-          删除
-        </Menu.Item>
+        {
+          item.thirdPartType === "WECHAT" &&
+          <Tooltip placement="left" title="企微直播，暂不支持关联培训任务">
+            <Menu.Item style={{color:"#999999"}}>
+              关联培训计划
+            </Menu.Item>
+          </Tooltip>
+        }
+        { 
+          item.thirdPartType !== "WECHAT" && 
+          <Menu.Item disabled={!(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager')} key="link">
+            关联培训计划
+          </Menu.Item> 
+        }
+        {
+          (item.courseState === "STARTING" || item.courseState === "FINISH") && 
+          <Tooltip placement="left" title={`${item.courseState === "STARTING"?"直播已开始，不能编辑":"直播已结束，不能编辑"}`}>
+            <Menu.Item style={{color:"#999999"}}>
+              编辑
+            </Menu.Item>
+          </Tooltip>
+        }
+        {
+          item.courseState !== "STARTING" && item.courseState !== "FINISH" &&
+          <Menu.Item key="edit">
+            编辑
+          </Menu.Item>
+        }
+        {
+          (item.courseState === "STARTING" || (now > item.startTime && now < item.endTime)) &&
+          <Tooltip placement="left" title="直播进行中，不能删除">
+            <Menu.Item style={{color:"#999999"}}>
+            删除
+          </Menu.Item>
+          </Tooltip>
+        }
+        {
+          (item.courseState !== "STARTING" && (now < item.startTime || now > item.endTime)) &&
+          <Menu.Item key="del">
+           删除
+          </Menu.Item>
+        }
       </Menu>
       </Menu>
     )
     )
     // return (
     // return (