|
@@ -232,7 +232,7 @@ export function dateFromNow (originTime, useOld = false) {
|
|
// 10天前
|
|
// 10天前
|
|
const tenDaysAgo = diffTimeStampAbsS > days11
|
|
const tenDaysAgo = diffTimeStampAbsS > days11
|
|
// 是否是当天
|
|
// 是否是当天
|
|
- const isCurrentDay = new Date(originTimeStamp).pattern('yyyy.MM.dd') === new Date().pattern('yyyy.MM.dd')
|
|
|
|
|
|
+ const isCurrentDay = dateFormatter(originTimeStamp, 'yyyy.MM.dd') === dateFormatter(nowTimeStamp, 'yyyy.MM.dd')
|
|
|
|
|
|
let condition = !isCurrentDay
|
|
let condition = !isCurrentDay
|
|
if (useOld) {
|
|
if (useOld) {
|
|
@@ -247,7 +247,7 @@ export function dateFromNow (originTime, useOld = false) {
|
|
const sameYear = originDate.getFullYear() === nowDate.getFullYear()
|
|
const sameYear = originDate.getFullYear() === nowDate.getFullYear()
|
|
// 如果是当年,则不显示年
|
|
// 如果是当年,则不显示年
|
|
const patternString = sameYear ? 'MM-dd' : 'yyyy-MM-dd'
|
|
const patternString = sameYear ? 'MM-dd' : 'yyyy-MM-dd'
|
|
- timeString = originDate.pattern(patternString)
|
|
|
|
|
|
+ timeString = dateFormatter(originDate, patternString)
|
|
} else {
|
|
} else {
|
|
for (let i = 0; i < 7; i++) {
|
|
for (let i = 0; i < 7; i++) {
|
|
const inm = Math.floor(diffTimeStampAbsS / dataMap.number[i])
|
|
const inm = Math.floor(diffTimeStampAbsS / dataMap.number[i])
|