From e77fc9f30dcdad39bf51f8e890e92750f40f7198 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 13 Oct 2021 16:13:01 +0800
Subject: [PATCH] no message

---
 pages/article/index.wxs        |  2 +-
 pages/mall/fragment/index.wxml |  7 +++++--
 pages/moment/index.wxs         | 36 +++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/pages/article/index.wxs b/pages/article/index.wxs
index 08d3bd7..866dcd6 100644
--- a/pages/article/index.wxs
+++ b/pages/article/index.wxs
@@ -24,7 +24,7 @@ function formatMTime(time) {
   } else if (gap > just) {
     return parseInt(gap / minute) + '分钟前'
   } else {
-    return '刚刚更新'
+    return '刚刚'
   }
 }
 
diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index 24031a4..a2f740a 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -56,8 +56,11 @@
 			</view>
 		</wux-skeleton>
 		<view wx:for="{{momentList}}" wx:key="index" data-index="{{index}}" class="flex flex-justify moment-pad" bindtap="postInfo">
-		  <view class="text-df text-black text-cut" style="max-width: 480rpx;">{{item.title}}</view>
-      <view class="text-gray" style="max-width: 160rpx;">{{moment.formateText(item.updateTime, 10)}}</view>
+		  <view class="text-df text-black text-cut" style="max-width: 480rpx;">
+				<text wx:if="{{item.categoryName}}">[{{item.categoryName}}]</text>
+				<text>{{item.title}}</text>
+			</view>
+      <view class="{{moment.infoColor(item.updateTime)}}" style="max-width: 160rpx;">{{moment.infoTime(item.updateTime)}}</view>
 		</view>
 	</view>
 
diff --git a/pages/moment/index.wxs b/pages/moment/index.wxs
index 6943672..6c2827c 100644
--- a/pages/moment/index.wxs
+++ b/pages/moment/index.wxs
@@ -51,9 +51,43 @@ function floatImage(price) {
   }
 }
 
+function infoTime(time){
+  if (isEmpty(time)) {
+    return ''
+  }
+  var oneday = 24 * 60 * 60 * 1000
+  time = time.replace(getRegExp('/\s/g', 'g'), '')
+  var datetime = getDate(time.trim())
+  var gap = getDate().getTime() - datetime.getTime()
+  
+  if (gap > oneday) {
+    return formateText(time, 10)
+  } else {
+    return time.substring(11, 16)
+  }
+}
+
+function infoColor(time){
+  if (isEmpty(time)) {
+    return ''
+  }
+  var oneday = 24 * 60 * 60 * 1000
+  time = time.replace(getRegExp('/\s/g', 'g'), '')
+  var datetime = getDate(time.trim())
+  var gap = getDate().getTime() - datetime.getTime()
+  
+  if (gap > oneday) {
+    return 'text-black'
+  } else {
+    return 'text-red'
+  }
+}
+
 module.exports = {
   formateDate: formateDate,
   formateText: formateText,
   colorText: colorText,
-  floatImage: floatImage
+  floatImage: floatImage,
+  infoTime: infoTime,
+  infoColor: infoColor
 }
\ No newline at end of file