From 60e26b0b129bb4fea9bb10ffae7af48c35e1c046 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 10 Mar 2020 17:06:17 +0800
Subject: [PATCH] issue

---
 .../user/usersInfo/video/InfosVideo.css       |  3 -
 .../user/usersInfo/video/InfosVideo.js        | 58 ++++++++++++++-----
 .../user/usersInfo/video/VideoInReviewItem.js | 10 ++--
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.css b/public/react/src/modules/user/usersInfo/video/InfosVideo.css
index a28f7cf5d..60813fb0c 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.css
+++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.css
@@ -68,9 +68,6 @@
 
 }
 
-.videoInReviewItem .square-main {
-    background: #EAEAEA;
-}
 .videoItem .time {
     color: #C0C4CC;
 }
diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.js b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
index 1557b0686..8f2f9dab3 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.js
+++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
@@ -65,8 +65,9 @@ function InfoVideo(props) {
     const videoEl = useRef(null);
 
     const { showNotification, history } = props;
-    const username = props.match.params.username
-
+    const username = props.match.params.username;
+    const { user } = props;
+    console.log(user);
     function toUpload() {
         if (props.current_user.admin || (props.current_user.is_teacher && props.checkIfProfessionalCertification())) {
             history.push(`/users/${username}/videos/upload`)
@@ -87,16 +88,15 @@ function InfoVideo(props) {
                 sort_direction: sorts[1],
                 //
             }
+        }).then((response) => {
+            setLoading(false)
+            if (response.data.videos) {
+                setvideos(response.data.videos)
+                setCount(response.data.count)
+            }
+        }).catch(() => {
+            setLoading(false)
         })
-            .then((response) => {
-                setLoading(false)
-                if (response.data.videos) {
-                    setvideos(response.data.videos)
-                    setCount(response.data.count)
-                }
-            }).catch(() => {
-                setLoading(false)
-            })
     }
     function fetchReviewvideos() {
         const fetchUrl = `/users/${username}/videos/review.json`
@@ -184,9 +184,8 @@ function InfoVideo(props) {
         videoId = {
             videoId: item.id,
             title: item.title,
-            file_url: item.file_url,
+            file_url: item.play_url || item.file_url,
             cover_url: item.cover_url
-
         }
         videoModalObj.setVisible(true)
     }
@@ -218,6 +217,36 @@ function InfoVideo(props) {
 
 
     }
+
+    function deleteVideo(item){
+        props.confirm({
+            content: '该视频将被删除，不可恢复',
+            subContent: '是否确认删除?',
+      
+            onOk: () => {
+              const url = `/users/${user && user.login}/videos/${item.id}.json`;
+              axios.delete(url).then(result => {
+                if (result) {
+                  props.showNotification(`视频删除成功!`);
+                  if (pageObj.current === 1) {
+                    if (categoryObj.category === 'all') {
+                        fetchvideos()
+                    } else {
+                        fetchReviewvideos()
+                    }
+                    } else {
+                        pageObj.onChange(1)
+                    }
+                }
+              }).catch(error => {
+                console.log(error);
+              })
+            },
+            onCancel() {
+              console.log('Cancel');
+            },
+        });
+    }
     function getCopyText(file_url, cover_url) {
         return `<video src="${file_url}" controls="true" controlslist="nodownload" width="${DEFAULT_VIDEO_WIDTH_IN_MD}" height="${DEFAULT_VIDEO_HEIGHT_IN_MD}" poster="${cover_url}">您的浏览器不支持 video 标签。</video>`
     }
@@ -397,7 +426,7 @@ function InfoVideo(props) {
                                         onEditVideo={onEditVideo}
                                         onMaskClick={onMaskClick}
                                         getCopyText={getCopyText}
-
+                                        deleteVideo={user && ((user.login === item.user_login) || user.admin) ? deleteVideo : undefined}
                                     >
                                     </VideoInReviewItem>)
                                 })
@@ -416,6 +445,7 @@ function InfoVideo(props) {
                                         {...item}
                                         key={item.id}
                                         isReview={true}
+                                        deleteVideo={user && ((user.login === item.user_login) || user.admin) ? deleteVideo : undefined}
                                     >
                                     </VideoInReviewItem>)
                                 })
diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
index 6849db062..4e0ca8fb2 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -79,9 +79,9 @@ function VideoInReviewItem (props) {
                              <i className={`icon-dianjiliang iconfont dianjilianicon`}></i>
                          </Tooltip> } {!vv || (vv && vv)===0?"":vv}
                     </span>
-                    { isReview != true && <div>
+                    <div>
                         {
-                            moveVideo && 
+                            isReview !== true && moveVideo && 
                             <Tooltip title="移动到" placement="bottom">
                                 <i className="icon-yidong iconfont font-15" onClick={() => moveVideo(props)}
                                     style={{    marginTop: '1px', display: 'inline-block'}}
@@ -98,7 +98,7 @@ function VideoInReviewItem (props) {
                         }
                         
                         {
-                            operation &&
+                            isReview !== true && operation &&
                             <Tooltip title="编辑" placement="bottom">
                                 <i className="icon-bianji1 iconfont" onClick={() => onEditVideo(props)}
                                 style={{    marginTop: '1px', display: 'inline-block'}}
@@ -106,13 +106,13 @@ function VideoInReviewItem (props) {
                             </Tooltip>
                         }
                         {
-                            !link ?
+                            isReview !== true && !link ?
                             <Tooltip title="复制视频地址" placement="bottom">
                                 <i className={`icon-fuzhi iconfont copybtn_item_${id}`} data-clipboard-text={getCopyText((play_url || file_url), cover_url)}></i>
                             </Tooltip>:""
                         }
                         
-                    </div> }
+                    </div> 
                 </div>
             </div>
         </div>