From 4d6ee66557f272a74b2c26a51717e90aba97cd81 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 14 Oct 2021 09:52:41 +0800
Subject: [PATCH] =?UTF-8?q?ios=20=E6=97=B6=E9=97=B4=E5=85=BC=E5=AE=B9bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/index.wxs       |  2 +-
 pages/html/message/index.wxml |  1 +
 pages/moment/index.wxs        | 16 ++++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pages/article/index.wxs b/pages/article/index.wxs
index 866dcd6..5aa775e 100644
--- a/pages/article/index.wxs
+++ b/pages/article/index.wxs
@@ -11,7 +11,7 @@ function formatMTime(time) {
   var onehour = 60 * 60 * 1000
   var oneday = 24 * 60 * 60 * 1000
   var threeday = 3 * 24 * 60 * 60 * 1000
-  time = time.replace(getRegExp('/\s/g', 'g'), '')
+  time = time.replace(getRegExp('-', 'g'), '/')
   var datetime = getDate(time.trim())
   var gap = getDate().getTime() - datetime.getTime()
   
diff --git a/pages/html/message/index.wxml b/pages/html/message/index.wxml
index 9834f7b..9dc3d02 100644
--- a/pages/html/message/index.wxml
+++ b/pages/html/message/index.wxml
@@ -61,6 +61,7 @@
 		}
 		var dayCode = 24 * 60 * 60 * 1000
 		datetime = datetime.replace(getRegExp('/\s/g', 'g'), '')
+
 		var date = getDate(datetime.trim())
 		var today = getDate()
 		var yestoday = getDate(getDate().getTime() - dayCode)
diff --git a/pages/moment/index.wxs b/pages/moment/index.wxs
index 04812fd..10b85c7 100644
--- a/pages/moment/index.wxs
+++ b/pages/moment/index.wxs
@@ -55,12 +55,12 @@ function infoTime(time){
   if (isEmpty(time)) {
     return ''
   }
-  time = time.replace(getRegExp('/\s/g', 'g'), '')
+  time = time.replace(getRegExp('-', 'g'), '/')
   var datetime = getDate(time.trim())
-  if (getDate().toString().substring(3, 15) !== datetime.toString().substring(3, 15)) {
-    return formateText(time, 10)
-  } else {
+  if (getDate().toString().substring(3, 15) === datetime.toString().substring(3, 15)) {
     return time.substring(11, 16)
+  } else {
+    return formateText(time, 10)
   }
 }
 
@@ -68,12 +68,12 @@ function infoColor(time){
   if (isEmpty(time)) {
     return ''
   }
-  time = time.replace(getRegExp('/\s/g', 'g'), '')
+  time = time.replace(getRegExp('-', 'g'), '/')
   var datetime = getDate(time.trim())
-  if (getDate().toString().substring(3, 15) !== datetime.toString().substring(3, 15)) {
-    return 'text-black'
-  } else {
+  if (getDate().toString().substring(3, 15) === datetime.toString().substring(3, 15)) {
     return 'text-red'
+  } else {
+    return 'text-black'
   }
 }