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

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

@@ -62,7 +62,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 setBeginTime(datetime)
                 props.onChange("beginTime",datetime)
                 if (!cusTime) {
-                    props.onChange("endTime",datetime+duration)
+                    props.onChange("endTime",datetime+duration*1000)
                 }
                 setBeginDate(_begindate)
             }
@@ -80,7 +80,7 @@ export default function AddLiveClassInfoWorkWX(props) {
         setBeginTime(begin)
         props.onChange("beginTime",begin)
         if (!cusTime) {
-            props.onChange("endTime",begin+duration)
+            props.onChange("endTime",begin+duration*1000)
         }
     }
 
@@ -93,7 +93,7 @@ export default function AddLiveClassInfoWorkWX(props) {
         setBeginTime(begin)
         props.onChange("beginTime",begin)
         if (!cusTime) {
-            props.onChange("endTime",begin+duration)
+            props.onChange("endTime",begin+duration*1000)
         }
         
     }
@@ -207,6 +207,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 value={beginTime===0?undefined:moment(beginTime)}
                 onChange={onBeginTimeChange} 
                 onOk={onBeginTimeOK} 
+                allowClear={false}
                 format="HH:mm" />
             </div>
             <div className="duration-time item">
@@ -226,6 +227,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                         value={endTime === 0?undefined:moment(endTime)}
                         onChange={onEndTimeChange} 
                         onOk={onEndTimeOK} 
+                        allowClear={false}
                         format="HH:mm" />
                         </>
                     ) : (

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

@@ -151,6 +151,7 @@ class LiveCourseFilter extends React.Component {
           courseState: undefined,
           current: 1,
           shelfState: null,
+          thirdPartType: null
         },
       },
       () => {
@@ -306,14 +307,10 @@ class LiveCourseFilter extends React.Component {
                   onClear={(value) => {
                     this.setState(
                       {
-                        teacherQuery: {
-                          size: 10,
-                          current: 1,
-                          nickName: null,
-                        },
+                        query: {...this.state.query,thirdPartType:null}
                       },
                       () => {
-                        this.getTeacherList()
+                        this.props.onChange(this.state.query)
                       }
                     )
                   }}