From 32d22e10474e423013a6134183ba250104fb1e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 17 Mar 2020 23:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/Video/Video.js | 1 + .../user/usersInfo/video/VideoInReviewItem.js | 39 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/Video/Video.js b/public/react/src/modules/courses/Video/Video.js index 229dedb53..5fe6d99b3 100644 --- a/public/react/src/modules/courses/Video/Video.js +++ b/public/react/src/modules/courses/Video/Video.js @@ -269,6 +269,7 @@ class Video extends Component { operation={operation || item.user_id === user_id} deleteVideo={(admin || item.user_id === user_id) ? this.deleteVideo : undefined} moveVideo={videoData && videoData.has_category && flagMove ? () => this.moveVideo(item.id, (course_identity > 2 && item.user_id !== user_id)) : undefined} + > ) diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js index 71b16fab2..fe19c57e6 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js +++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js @@ -38,7 +38,7 @@ function VideoInReviewItem (props) { } }, []) - + const username = props.match.params.username function toList() { @@ -48,15 +48,16 @@ function VideoInReviewItem (props) { history.push(`/users/${username}/videos/upload`) } const imgUrl = (!transcoded && !link) ? defaultImg : (cover_url || defaultImg); + return (
- { link ? + { link ? 外链 - - : "" + + : "" } {!isReview &&
onMaskClick(props)}>
} @@ -76,7 +77,7 @@ function VideoInReviewItem (props) { {/* {moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}{people_num} */} {link||total_time===undefined? :累计学习时长:{ - formatSeconds(total_time)} + formatSeconds(total_time)} {/* total_time<60?total_time+' s':total_time/60<60?(total_time/60).toFixed(0)+' min':(total_time/3600).toFixed(1)+ ' h' */} }
@@ -85,28 +86,38 @@ function VideoInReviewItem (props) { {total_time===undefined?'':!people_num || (people_num && people_num)===0 ? "" : {!people_num || (people_num && people_num)===0?"":people_num} - } + } - +
+ + { + props&&props.mykt!=undefined?isReview !== true && moveVideo && + + moveVideo(props)} + style={{ marginTop: '1px', display: 'inline-block'}} + > + :"" + } + { - isReview !== true && moveVideo && - + isReview !== true && moveVideo && + moveVideo(props)} style={{ marginTop: '1px', display: 'inline-block'}} > } { - deleteVideo && + deleteVideo && deleteVideo(props)} style={{ marginTop: '1px', display: 'inline-block'}} > } - + { isReview !== true && operation && @@ -117,12 +128,12 @@ function VideoInReviewItem (props) { } { isReview !== true && !link ? - + :"" } - -
+ +