diff --git a/public/react/src/modules/courses/Video/video-play/index.jsx b/public/react/src/modules/courses/Video/video-play/index.jsx index 8c3a2eb20..e33439dcf 100644 --- a/public/react/src/modules/courses/Video/video-play/index.jsx +++ b/public/react/src/modules/courses/Video/video-play/index.jsx @@ -177,6 +177,9 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => { el.current.removeEventListener('seeking', onSeeking) el.current.removeEventListener('seeked', onSeeked) el.current.removeEventListener('timeupdate', onTimeupdate) + if(el.current.playing) { + log() + } } }, [el, src]) diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx index 7e933462e..4757cfecf 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx +++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx @@ -6,6 +6,6 @@ export default ({ callback(id) } return ( - {text} + {text} ) } \ No newline at end of file diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx index c58ae81aa..0430149a7 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx +++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx @@ -12,13 +12,13 @@ const DiffObject = [ { id: 3, text: '中高级' }, { id: 4, text: '高级' } ] -export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => { +export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist,parsedid,newpalce }) => { const [data, setData] = useState({ diff: 0, - searchValue: 'a', + searchValue: newpalce || 'a', navs: [], searchKey: '', - childValue: '' + childValue:parsedid }) const { diff, searchValue, navs, childValue, searchKey } = data function diffSearch(diff) { @@ -28,6 +28,15 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => { }) StatusEnquiry([{ 'type': 2 }, { 'value': diff }]) } + useEffect(() => { + setData({ + ...data, + searchValue: newpalce || 'a', + childValue: parsedid + }) + },[ + newpalce,navs,parsedid + ]) function onSearchAll() { if (searchValue !== 'a') { setData({ ...data, searchValue: 'a', childValue: '' }) @@ -61,12 +70,12 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => { function overlayMenu(item, id) { return