Merge branch 'master' of http://git.ycjcjy.com/state_grid/training-wx

src/util/formattingData.js

@@ -3,11 +3,13 @@
 
 // 日期格式化
 export function parseTime (time, pattern) {
-  let aTime = time
+  let aTime
+  if (time) {
+    aTime = time
     .toLocaleString()
     .replace(/T/g, ' ')
     .replace(/\.[\d]{3}Z/, '')
-
+  }
 
   if (arguments.length === 0 || !aTime) {
     return null