From 597632478dec980aa215f1366b84bcefd61ecb7b Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Fri, 13 Mar 2020 23:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/DateUtil.js           | 30 +++++++++++++++++++
 public/react/src/common/educoder.js           |  2 +-
 .../react/src/modules/courses/Video/Video.js  |  2 +-
 .../user/usersInfo/video/VideoInReviewItem.js |  7 +++--
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/public/react/src/common/DateUtil.js b/public/react/src/common/DateUtil.js
index dc2288ff3..4bc481b10 100644
--- a/public/react/src/common/DateUtil.js
+++ b/public/react/src/common/DateUtil.js
@@ -38,6 +38,36 @@ export function getNextHalfHourOfMoment(moment) {
   return moment
 }
 
+ export function formatSeconds(value) {
+
+          var theTime = parseInt(value);// 秒
+          var middle= 0;// 分
+          var hour= 0;// 小时
+      
+          if(theTime > 60) {
+              middle= parseInt(theTime/60);
+              theTime = parseInt(theTime%60);
+              if(middle> 60) {
+                  hour= parseInt(middle/60);
+                  middle= parseInt(middle%60);
+              }
+          }
+          var result = ""+parseInt(theTime)+"秒";
+          if(middle > 0) {
+            if(hour>0){
+              result = ""+parseInt(middle)+"分";
+            }else{
+              result = ""+parseInt(middle)+"分"+result;
+            }
+              
+          }
+          if(hour> 0) {
+              result = ""+parseInt(hour)+"小时"+result;
+          }
+          return result;
+      }
+  
+
 export function formatDuring(mss){
   var days = parseInt(mss / (1000 * 60 * 60 * 24));
   var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 2cb074a6a..c990b5dea 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -20,7 +20,7 @@ export { bytesToSize as bytesToSize } from                './UnitUtil';
 
 export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections } from 	'./TextUtil'
-export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
+export { handleDateString, getNextHalfHourOfMoment,formatDuring,formatSeconds} from 	'./DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from 	'./util/ShareUtil'
 
diff --git a/public/react/src/modules/courses/Video/Video.js b/public/react/src/modules/courses/Video/Video.js
index 1ad16d702..181c082ae 100644
--- a/public/react/src/modules/courses/Video/Video.js
+++ b/public/react/src/modules/courses/Video/Video.js
@@ -243,7 +243,7 @@ class Video extends Component {
                       <div style={{display:'flex'}}>
                       <p className="font-grey-9 mt20 mb20 pl5">共 <span className="color-orange">{videoData && videoData.count}</span> 个视频</p>
 
-                      <p className="mt20 mb20 pl5" style={{marginLeft:'auto',color:'#C0C4CC'}}>播放数据从2020-03-13 24：00开始统计</p>
+                      <p className="mt20 mb20 pl5" style={{marginLeft:'auto',color:'#C0C4CC'}}>播放数据从2020-03-13 24:00开始统计</p>
                       </div>
                 
                       <div className="videoContent">
diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
index dd4de7ecd..299af0d08 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, memo } from 'react';
 import { Progress, Input, Tooltip , Spin } from 'antd'
-import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext } from 'educoder'
+import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext,formatSeconds} from 'educoder'
 import axios from 'axios'
 import moment from 'moment'
 import playIcon from './images/play.png'
@@ -38,6 +38,7 @@ function VideoInReviewItem (props) {
         }
     }, [])
 
+ 
 
     const username = props.match.params.username
     function toList() {
@@ -74,7 +75,9 @@ function VideoInReviewItem (props) {
                 {/* <div className={"play_duration"}>累计学习时长：{play_duration} h</div> */}
                 {/* <span className="time">{moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}{people_num}</span> */}
                 {link ?<span className="time"> </span>:<span className="time">累计学习时长：{
-                total_time<60?total_time+' s':total_time/60<60?(total_time/60).toFixed(0)+' min':(total_time/60/60).toFixed(1)+ ' h'}</span>}
+                    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' */}
+                </span>}
                 </div>
                 <div className="df buttonRow">
                     {/* 2019-09-01 10:00:22 */}