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 @@ - {{item.title}} - {{moment.formateText(item.updateTime, 10)}} + + [{{item.categoryName}}] + {{item.title}} + + {{moment.infoTime(item.updateTime)}} 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