From 9b09d13712c0c005891450a3bf4b6d848ec0ff37 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 29 十一月 2023 10:28:24 +0800
Subject: [PATCH] 2023.11.29

---
 utils/util.js |   91 +++++++++++++++++++++++++--------------------
 1 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/utils/util.js b/utils/util.js
index 3aa9e77..7b753dd 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,79 +1,88 @@
-const moment = require('./moment.min')
-
-
+const moment = require('./moment.min');
 
 const formatTime = date => {
-  const time = moment(date)
-  const now = moment()
+  const time = moment(date);
+  const now = moment();
 
-  const timeYear = time.year()
-  const timeMonth = time.month() + 1
-  const timeDay = time.date()
+  const timeYear = time.year();
+  const timeMonth = time.month() + 1;
+  const timeDay = time.date();
 
-  const thisYear = now.year()
-  const thisMonth = now.month() + 1
-  const thisDay = now.date()
+  const thisYear = now.year();
+  const thisMonth = now.month() + 1;
+  const thisDay = now.date();
 
   if (timeYear < thisYear) {
-    return time.format('YYYY-MM-DD')
+    return time.format('YYYY-MM-DD');
   } else if (timeMonth < thisMonth) {
-    return time.format('MM-DD')
+    return time.format('MM-DD');
   } else if (timeDay < thisDay) {
     if (timeDay + 1 == thisDay) {
-      return '鏄ㄥぉ'
+      return '鏄ㄥぉ';
     } else {
-      return time.format('MM-DD')
+      return time.format('MM-DD');
     }
   } else {
-    return time.fromNow()
+    return time.fromNow();
   }
-}
+};
 
 const formatNumber = n => {
-  n = n.toString()
-  return n[1] ? n : '0' + n
-}
+  n = n.toString();
+  return n[1] ? n : '0' + n;
+};
 
 const navContentHeight = function () {
   //鑳跺泭楂樺害
-  const capsuleHeight = wx.getMenuButtonBoundingClientRect().bottom - wx.getMenuButtonBoundingClientRect().top
+  const capsuleHeight =
+    wx.getMenuButtonBoundingClientRect().bottom -
+    wx.getMenuButtonBoundingClientRect().top;
   //鑳跺泭涓婅竟妗嗚窛椤堕儴璺濈
-  const capsuleTop = wx.getMenuButtonBoundingClientRect().top
+  const capsuleTop = wx.getMenuButtonBoundingClientRect().top;
   //鐘舵�佹爮楂樺害
-  const statusBarHeight = wx.getSystemInfoSync().statusBarHeight
+  const statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
   //鑽泭涓婅竟璺濈姸鎬佹爮涓嬭竟鐨勮窛绂伙紝鍗宠嵂鍥婂湪瀵艰埅鍐呭鏍忎腑鐨勪笂涓嬭竟璺�
-  const capsuleGap = capsuleTop - statusBarHeight
+  const capsuleGap = capsuleTop - statusBarHeight;
   //瀵艰埅鍐呭鏍忕殑楂樺害鍔ㄦ�佽绠�
-  const navContentHeight = capsuleGap * 2 + capsuleHeight
+  const navContentHeight = capsuleGap * 2 + capsuleHeight;
 
-  return navContentHeight + statusBarHeight
-}
+  return navContentHeight + statusBarHeight;
+};
 
 const deepCopy = function (obj) {
-  let b1 = typeof obj
-  if (b1 != 'object' || (obj instanceof Array) || obj == null) {
+  let b1 = typeof obj;
+  if (b1 != 'object' || obj == null) {
     return obj;
   }
-  var newobj = {};
-  for (var attr in obj) {
-    newobj[attr] = this.deepCopy(obj[attr]);
+  let newobj;
+  if (obj instanceof Array) {
+    newobj = [];
+    obj.forEach(e => {
+      newobj.push(this.deepCopy(e));
+    });
+  } else {
+    newobj = {};
+    for (var attr in obj) {
+      newobj[attr] = this.deepCopy(obj[attr]);
+    }
   }
   return newobj;
-}
+};
 
 const lastMonth = function (year, month) {
-  var lM = month - 1
-  var lY = year
+  var lM = month - 1;
+  var lY = year;
   if (lM <= 0) {
-    lM += 12
-    lY -= 1
+    lM += 12;
+    lY -= 1;
   }
-  return [lY, lM]
-}
+  return [lY, lM];
+};
 
 module.exports = {
   formatTime: formatTime,
   navContentHeight: navContentHeight,
   deepCopy: deepCopy,
-  lastMonth: lastMonth
-}
\ No newline at end of file
+  lastMonth: lastMonth,
+  formatNumber: formatNumber,
+};

--
Gitblit v1.9.3