Skip to content

Commit c57333d

Browse files
committed
fix(SPA): 修正动态卡片时间
1 parent cb28cf7 commit c57333d

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

resources/spa/src/components/FeedCard/FeedCard.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@
9393

9494
<script>
9595
import { mapState } from 'vuex'
96+
import * as api from '@/api/feeds.js'
97+
import { transTime } from '@/util'
9698
import FeedImage from './FeedImage.vue'
9799
import FeedVideo from './FeedVideo.vue'
98100
import CommentItem from './CommentItem.vue'
99-
import * as api from '@/api/feeds.js'
100101
101102
export default {
102103
name: 'FeedCard',
@@ -168,8 +169,7 @@ export default {
168169
},
169170
time () {
170171
let str = this.feed.created_at
171-
if (typeof str === 'string') str = str.replace(/-/g, '/') // 兼容 IOS 保证传入数据格式 YYYY/MM/dd HH:mm:ss
172-
return new Date(str)
172+
return transTime(str)
173173
},
174174
isToday () {
175175
// 时间差 = 当前时间 - date (单位: 秒)

resources/spa/src/filters.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import plueMessageBundle from 'plus-message-bundle'
2+
import { transTime } from '@/util'
23

34
/**
45
* ThinkSNS Plus 消息解析器,获取顶部消息.
@@ -71,12 +72,7 @@ export const addTimeOffset = date => {
7172

7273
export const time2tips = date => {
7374
if (typeof date === 'string') {
74-
date = date.replace(/-/g, '/') // for safari
75-
// match 2018/10/17 01:48:52"
76-
if (date.match(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}$/)) {
77-
// 如果匹配到服务器返回的时间是非标准格式的祖鲁时间,需要进行本地化
78-
date = +new Date(date) - timeOffset
79-
}
75+
date = transTime(date)
8076
}
8177
const time = new Date(date)
8278
const offset = (new Date().getTime() - time) / 1000

resources/spa/src/util/index.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { timeOffset } from '@/filters'
2+
13
/**
24
* 空函数
35
* 用于默认函数引用判断
@@ -184,3 +186,13 @@ export const generateString = length => {
184186
.toString(36)
185187
.substr(2, length)
186188
}
189+
190+
export const transTime = (date) => {
191+
date = date.replace(/-/g, '/') // for safari
192+
// match 2018/10/17 01:48:52"
193+
if (date.match(/^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}$/)) {
194+
// 如果匹配到服务器返回的时间是非标准格式的祖鲁时间,需要进行本地化
195+
date = +new Date(date) - timeOffset
196+
}
197+
return new Date(date)
198+
}

0 commit comments

Comments
 (0)