diff --git a/common/script/filters.js b/common/script/filters.js index 29eabbe..8e58bfa 100644 --- a/common/script/filters.js +++ b/common/script/filters.js @@ -1,24 +1,24 @@ // 定义过滤器 时间戳转化 -export function formatDate (date, fmt) { - if (/(y+)/.test(fmt)) { - fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)); - } - let o = { - 'M+': date.getMonth() + 1, - 'd+': date.getDate(), - 'h+': date.getHours(), - 'm+': date.getMinutes(), - 's+': date.getSeconds() - }; - for (let k in o) { - if (new RegExp(`(${k})`).test(fmt)) { - let str = o[k] + ''; - fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str)); - } - } - return fmt; - }; +export function formatDate(date, fmt) { + if (/(y+)/.test(fmt)) { + fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)); + } + let o = { + 'M+': date.getMonth() + 1, + 'd+': date.getDate(), + 'h+': date.getHours(), + 'm+': date.getMinutes(), + 's+': date.getSeconds() + }; + for (let k in o) { + if (new RegExp(`(${k})`).test(fmt)) { + let str = o[k] + ''; + fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str)); + } + } + return fmt; +}; - function padLeftZero (str) { - return ('00' + str).substr(str.length); - }; \ No newline at end of file +function padLeftZero(str) { + return ('00' + str).substr(str.length); +}; diff --git a/pages/my-trips/my-trips.vue b/pages/my-trips/my-trips.vue index d08541a..dfc7406 100644 --- a/pages/my-trips/my-trips.vue +++ b/pages/my-trips/my-trips.vue @@ -6,7 +6,7 @@ {{ +item.startTime | formatDate }} - {{ +item.startTime | formatDate }} 至 {{ +item.endTime | formatDate }} + {{ +item.startTime | formatDate1 }} 至 {{ +item.endTime | formatDate1 }} @@ -93,6 +93,11 @@ var data = new Date(time); return formatDate(data, 'MM-dd'); }, + + formatDate1(time) { + var data = new Date(time); + return formatDate(data, 'MM月dd日 hh:mm'); + }, }, onLoad() {