fix: error timestamp format #242

lijinke666 · Jan 5, 2021 · 6ecbf73 · 6ecbf73
1 parent e88b857
commit 6ecbf73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/__tests__/tests/player.test.js b/__tests__/tests/player.test.js
@@ -217,7 +217,9 @@ describe('<ReactJkMusicPlayer/>', () => {
   })
   it('should print second return format time', () => {
     assert(formatTime(30000) === '08:20:00')
-    assert(formatTime(60) === '00:60')
+    assert(formatTime(60) === '01:00')
+    assert(formatTime(120) === '02:00')
+    assert(formatTime(121) === '02:01')
     assert(formatTime(140) === '02:20')
     assert(formatTime(2 * 60 * 60) === '02:00:00')
     assert(formatTime(2 * 60 * 60 + 30) === '02:00:30')

diff --git a/src/utils.js b/src/utils.js
@@ -1,20 +1,21 @@
-//秒转换成 时间格式
+/* eslint-disable radix */
+/* eslint-disable no-bitwise */
 export function formatTime(second) {
   let i = 0
   let h = 0
   let s = parseInt(second)
-  if (s > 60) {
+  if (s >= 60) {
     i = parseInt(s / 60)
     s = parseInt(s % 60)
-    if (i > 60) {
+    if (i >= 60) {
       h = parseInt(i / 60)
       i = parseInt(i % 60)
     }
   }
   // 补零
   const zero = (v) => (v >> 0 < 10 ? `0${v}` : v)
   if (h > 0) return [zero(h), zero(i), zero(s)].join(':')
-  else return [zero(i), zero(s)].join(':')
+  return [zero(i), zero(s)].join(':')
 }
 
 export function createRandomNum(minNum, maxNum) {
@@ -24,7 +25,7 @@ export function createRandomNum(minNum, maxNum) {
 export function distinct(array) {
   return array
     .map((item) => JSON.stringify(item))
-    .filter((item, idx, arry) => idx === arry.indexOf(item))
+    .filter((item, idx, arr) => idx === arr.indexOf(item))
     .map((item) => JSON.parse(item))
 }