@@ -50,6 +50,7 @@ export function timeAgo(dateTimeStamp) {
50
50
let week = day * 7 ;
51
51
let halfamonth = day * 15 ;
52
52
let month = day * 30 ;
53
+ let year = day * 365 ;
53
54
let now = new Date ( ) . getTime ( ) ; //获取当前时间毫秒
54
55
dateTimeStamp = dateTimeStamp . substring ( 0 , 18 ) ;
55
56
//必须把日期'-'转为'/'
@@ -67,14 +68,18 @@ export function timeAgo(dateTimeStamp) {
67
68
let dayC = diffValue / day ;
68
69
let weekC = diffValue / week ;
69
70
let monthC = diffValue / month ;
71
+ let yearC = diffValue / year ;
70
72
71
73
minC = parseInt ( minC )
72
74
hourC = parseInt ( hourC )
73
75
dayC = parseInt ( dayC )
74
76
weekC = parseInt ( weekC )
75
77
monthC = parseInt ( monthC )
78
+ yearC = parseInt ( yearC )
76
79
77
- if ( monthC >= 1 && monthC <= 3 ) {
80
+ if ( yearC > 1 ) {
81
+ result = " " + parseInt ( yearC ) + "年前"
82
+ } else if ( monthC >= 1 && monthC < 12 ) {
78
83
result = " " + parseInt ( monthC ) + "月前"
79
84
} else if ( weekC >= 1 && weekC <= 4 ) {
80
85
result = " " + parseInt ( weekC ) + "周前"
@@ -86,16 +91,6 @@ export function timeAgo(dateTimeStamp) {
86
91
result = " " + parseInt ( minC ) + "分钟前"
87
92
} else if ( diffValue >= 0 && diffValue <= minute ) {
88
93
result = "刚刚"
89
- } else {
90
- let datetime = new Date ( ) ;
91
- datetime . setTime ( dateTimeStamp ) ;
92
- let Nyear = datetime . getFullYear ( ) ;
93
- let Nmonth = datetime . getMonth ( ) + 1 < 10 ? "0" + ( datetime . getMonth ( ) + 1 ) : datetime . getMonth ( ) + 1 ;
94
- let Ndate = datetime . getDate ( ) < 10 ? "0" + datetime . getDate ( ) : datetime . getDate ( ) ;
95
- let Nhour = datetime . getHours ( ) < 10 ? "0" + datetime . getHours ( ) : datetime . getHours ( ) ;
96
- let Nminute = datetime . getMinutes ( ) < 10 ? "0" + datetime . getMinutes ( ) : datetime . getMinutes ( ) ;
97
- let Nsecond = datetime . getSeconds ( ) < 10 ? "0" + datetime . getSeconds ( ) : datetime . getSeconds ( ) ;
98
- result = Nyear + "-" + Nmonth + "-" + Ndate
99
94
}
100
95
return result ;
101
96
}
0 commit comments