提交代码

src/web/staticres/js/dateFunc.js

@@ -1,6 +1,6 @@
-function dateTime (date, fmt='yyyy年MM月dd日 hh:mm') {// 时间戳转换
+function dateTimed (date, fmt='yyyy年MM月dd日 hh:mm') {// 时间戳转换
   if (!date) return ''
-  d = new Date(date)
+  var d = new Date(date)
   var o = {
     "M+": d.getMonth() + 1, //月份 
     "d+": d.getDate(), //日 
@@ -27,25 +27,25 @@ function dateYear () {// 获取当年的第一天
 function dateLast () {// 获取昨天
   var day = new Date()
   day.setTime(day.getTime()-24*60*60*1000)
-  return dateTime(day,'yyyy/MM/dd')
+  return dateTimed(day,'yyyy/MM/dd')
 }
 function dateMatter (time) {// 时间转换
   var timeStr = ''
-  var currentDay = dateTime(time,'yyyy/MM/dd') // 当前日期
+  var currentDay = dateTimed(time,'yyyy/MM/dd') // 当前日期
   var lingDay = new Date(new Date().toLocaleDateString()).getTime() // 获取当天0点
   var isTime = new Date(time) - lingDay
   var diff = isTime < 0 ? '昨天' : ''
   var isDate = new Date(time) - dateYear()
   if (isDate < 0) {
-    timeStr = dateTime(time)
+    timeStr = dateTimed(time)
   } else {
     if (currentDay === dateLast()) {
-      timeStr = diff + dateTime(time,'hh:mm')
+      timeStr = diff + dateTimed(time,'hh:mm')
     } else {
       if (isTime < 0) {
-        timeStr = dateTime(time,'MM月dd日 hh:mm')
+        timeStr = dateTimed(time,'MM月dd日 hh:mm')
       } else {
-        timeStr = dateTime(time,'hh:mm')
+        timeStr = dateTimed(time,'hh:mm')
       }
     }
   }