From 2d410989d32380d31ae3fe6d42aa3b3ba9e09d00 Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期五, 03 十月 2025 22:13:29 +0800
Subject: [PATCH] UI优化和bug修复: 1.调整小程序消息列表图标样式 2.优化web端比赛晋级页面布局 3.修复小程序消息列表日期显示问题
---
wx/pages/message/utils.wxs | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/wx/pages/message/utils.wxs b/wx/pages/message/utils.wxs
index 687c244..ef6572f 100644
--- a/wx/pages/message/utils.wxs
+++ b/wx/pages/message/utils.wxs
@@ -1,19 +1,43 @@
var formatTime = function (dateStr) {
if (!dateStr) return '';
- // 鍏煎 iOS
- var date = getDate(dateStr.split('-').join('/'));
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- var day = date.getDate();
- var hour = date.getHours();
- var minute = date.getMinutes();
-
- var formatNumber = function(n) {
- n = n.toString();
- return n[1] ? n : '0' + n;
+
+ var date;
+
+ // 澶勭悊鏃堕棿鎴筹紙鏁板瓧锛�
+ if (typeof dateStr === 'number') {
+ date = getDate(dateStr);
+ }
+ // 澶勭悊瀛楃涓叉牸寮忕殑鏃ユ湡
+ else if (typeof dateStr === 'string') {
+ // 灏濊瘯鐩存帴瑙ｆ瀽
+ date = getDate(dateStr);
+ }
+ else {
+ return '';
}
+
+ // 妫�鏌ユ棩鏈熷璞℃槸鍚﹀垱寤烘垚鍔�
+ try {
+ var year = date.getFullYear();
+ var month = date.getMonth() + 1;
+ var day = date.getDate();
+ var hour = date.getHours();
+ var minute = date.getMinutes();
+
+ // 濡傛灉鑾峰彇鍒扮殑鍊兼槸NaN锛岃鏄庢棩鏈熸棤鏁�
+ if (year !== year || month !== month || day !== day) {
+ return '';
+ }
+
+ return year + '-' + formatNumber(month) + '-' + formatNumber(day) + ' ' + formatNumber(hour) + ':' + formatNumber(minute);
+ } catch (e) {
+ return '';
+ }
+}
- return year + '-' + formatNumber(month) + '-' + formatNumber(day) + ' ' + formatNumber(hour) + ':' + formatNumber(minute);
+var formatNumber = function(n) {
+ n = n.toString();
+ return n[1] ? n : '0' + n;
}
module.exports = {
--
Gitblit v1.8.0