diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.css b/public/react/src/modules/user/usersInfo/video/InfosVideo.css index 39e0ff123..1ed0b3555 100644 --- a/public/react/src/modules/user/usersInfo/video/InfosVideo.css +++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.css @@ -20,7 +20,7 @@ } .videoItem img.cover { width: 100%; - border-radius: 6px 6px 0px 0px; + border-radius: 12px 12px 0px 0px; height: 158px; } .nItem.videoItem:hover .mask { @@ -34,12 +34,12 @@ display: inline-block; } .nItem .mask { - border-radius: 6px 6px 0px 0px; + border-radius: 12px 12px 0px 0px; display: none; text-align: center; position: absolute; - background: #000; - opacity: 0.5; + background:rgba(0,0,0,0.39); + /*opacity: 0.5;*/ } .videoItem .playWrap { display: none; @@ -49,6 +49,7 @@ position: absolute; top: 0px; left: 0px; + cursor: pointer; } .videoItem img.play { margin-top: 20%; @@ -57,9 +58,9 @@ } .videoItem .square-main { padding: 9px 8px; - + background: #fff; - border-radius: 0px 0px 6px 6px; + border-radius: 0px 0px 12px 12px; } .videoItem .square-main .title{ max-width: 256px; @@ -71,7 +72,11 @@ background: #EAEAEA; } .videoItem .time { - color: #A0A0A0; + color: #C0C4CC; +} +.videoItem .square-main .buttonRow .dianjilianicon{ + color: #606266 !important; + font-size: 14px !important; } .videoItem .square-main .buttonRow { @@ -80,8 +85,8 @@ } .nItem.videoItem:hover .square-main { - color: #fff; - background: #333; + /*color: #fff;*/ + background: #fff; } /* 预览弹框 */ @@ -117,4 +122,23 @@ .infoVideo .toUploadBtn { height: 48px; margin-right: 20px; +} + +.play_duration{ + width: 100%; + height:30px; + background:rgba(0,0,0,0.39); + /*opacity:0.39;*/ + color:#fff; + font-size:12px; + line-height:30px; + text-align: right; + padding-right: 10px; +} +.mp23{ + margin-bottom: 23px; +} + +.videoItem:hover{ + box-shadow:0px 4px 10px 0px rgba(3,7,45,0.1); } \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js index 23fdaf450..53e39defc 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js +++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js @@ -20,13 +20,13 @@ const clipboardMap = {} function VideoInReviewItem (props) { const theme = useContext(ThemeContext); const { history, file_url, cover_url, title, created_at, published_at, isReview, id - , onEditVideo, onMaskClick, getCopyText, showNotification } = props; + , onEditVideo, onMaskClick, getCopyText, showNotification,vv,play_duration} = props; useEffect(()=> { if (!isReview) { _clipboard = new ClipboardJS(`.copybtn_item_${id}`); _clipboard.on('success', (e) => { showNotification('复制成功') - }); + }); clipboardMap[id] = _clipboard } return () => { @@ -45,28 +45,37 @@ function VideoInReviewItem (props) { } return (
- + {!isReview &&
onMaskClick(props)}> - +
} - {!isReview && + {!isReview &&
onMaskClick(props)}> - + + {play_duration===0?"":
累计学习时长:{play_duration} h
}
}
20 ? title : ''} >{title}
+
+ + {moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')} +
{/* 2019-09-01 10:00:22 */} - {moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')} + {vv===0?"": + + + {vv} + } { isReview != true &&
onEditVideo(props)} - style={{ marginTop: '1px', display: 'inline-block'}} + style={{ marginTop: '1px', display: 'inline-block'}} >