Browse Source

过滤更改

xuqiaoying 3 years ago
parent
commit
aa88bef933
3 changed files with 9 additions and 67 deletions
  1. 4 1
      common/methodTool.js
  2. 4 1
      filters/index.js
  3. 1 65
      main.js

+ 4 - 1
common/methodTool.js

@@ -97,7 +97,6 @@ export default {
 	},
 	// 时间戳转换日期
 	formDate(time, formate = 'yyyy-mm-dd hh:mm:ss') {
-		console.log('fsdfgd==============')
 		var padDate = function (va) {
 			va = va < 10 ? '0' + va : va
 			return va
@@ -138,6 +137,10 @@ export default {
 					res = year + '年' + month + '月'
 					break
 				}
+				case 'hh:mm': {
+					res = hour + ':' + minutes
+					break
+				}
 				case 'yyyy-mm-dd hh:mm': {
 					res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes
 					break

+ 4 - 1
filters/index.js

@@ -8,7 +8,6 @@ const formDate = (time, formate = 'yyyy-mm-dd hh:mm:ss') => {
         return va
     }
     if (time) {
-        console.log('fsdfgd==============')
         var value = new Date(time * 1000); //时间戳为10位需*1000,时间戳为13位的话不需乘1000
         // var value = new Date(parseFloat(time))
         var year = value.getFullYear()
@@ -43,6 +42,10 @@ const formDate = (time, formate = 'yyyy-mm-dd hh:mm:ss') => {
                 res = year + '年' + month + '月'
                 break
             }
+            case 'hh:mm': {
+                res = hour + ':' + minutes
+                break
+            }
             case 'yyyy-mm-dd hh:mm': {
                 res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes
                 break

+ 1 - 65
main.js

@@ -25,71 +25,7 @@ import uView from "uview-ui";
 Vue.use(uView);
 
 // 全局过滤器
-// Object.keys(filters).forEach((filterName) => {
-//     console.log('filterName', filterName, Vue)
-//     Vue.filter(filterName, filters[filterName])
-// })
-Vue.filter('formate', function(time, formate = 'yyyy-mm-dd hh:mm:ss') {
-    var padDate = function (va) {
-        va = va < 10 ? '0' + va : va
-        return va
-    }
-    if (time) {
-        var value = new Date(time * 1000); //时间戳为10位需*1000,时间戳为13位的话不需乘1000
-        // var value = new Date(parseFloat(time))
-        var year = value.getFullYear()
-        var month = padDate(value.getMonth() + 1)
-        var day = padDate(value.getDate())
-        var hour = padDate(value.getHours())
-        var minutes = padDate(value.getMinutes())
-        var seconds = padDate(value.getSeconds())
-        let res = ''
-        switch (formate) {
-            case 'mm-dd': {
-                res =  month + '-' + day
-                break
-            }
-            case 'yyyy-mm-dd': {
-                res = year + '-' + month + '-' + day
-                break
-            }
-            case 'yyyy-mm': {
-                res = year + '-' + month
-                break
-            }
-            case 'mm月dd日': {
-                res = month + '月' + day + '日'
-                break
-            }
-            case 'yyyy年mm月dd日': {
-                res = year + '年' + month + '月' + day + '日'
-                break
-            }
-            case 'yyyy年mm月': {
-                res = year + '年' + month + '月'
-                break
-            }
-            case 'hh:mm': {
-                res = hour + ':' + minutes
-                break
-            }
-            case 'yyyy-mm-dd hh:mm': {
-                res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes
-                break
-            }
-            case 'yyyy.mm.dd':
-                res = year + '.' + month + '.' + day
-                break
-            case 'yyyy-mm-dd hh:mm:ss':
-            default: {
-                res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
-                break
-            }
-        }
-        return res
-    }
-    return '--'
-});
+Vue.filter('formate', filters['formDate'])
 
 Vue.config.productionTip = false