From 88781773b2a4bb497c882ece273ce7e19ec824b3 Mon Sep 17 00:00:00 2001
From: songsong428 <srf428110@163.com>
Date: Wed, 11 Mar 2020 10:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=A1=8C=E7=A8=8B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/script/filters.js    | 44 ++++++++++++++++++-------------------
 pages/my-trips/my-trips.vue |  7 +++++-
 2 files changed, 28 insertions(+), 23 deletions(-)

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 @@
 			<view class="cu-time">{{ +item.startTime | formatDate }}</view>
 			<view class="cu-item cuIcon-timefill text-blue">
 				<view class="content shadow-blur bg-blue light">
-					{{ +item.startTime | formatDate }} 至 {{ +item.endTime | formatDate }}
+					{{ +item.startTime | formatDate1 }} 至 {{ +item.endTime | formatDate1 }}
 				</view>
 			</view>
 			<view class="cu-item cuIcon-tagfill text-green">
@@ -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() {