From d9a3b1aac5d1f66a9f3c504de86e849fc669ce0d Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 19 Jan 2021 15:24:21 +0800
Subject: [PATCH] 赤峰分支

---
 src/components/orderPay.vue   | 38 +++++++++++++++++++-------------------
 src/components/parkRecord.vue | 21 ++-------------------
 src/main.js                   |  5 +++++
 src/utils/filters.js          | 24 ++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100644 src/utils/filters.js

diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 29162b8..df2543f 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -202,25 +202,25 @@ export default {
     },
   },
   filters: {
-    formateColor(val) {
-      switch (val) {
-        case '0':
-          return 'carBlue'
-          break;
-        case '1':
-          return 'carYellow'
-          break;
-        case '2':
-          return 'carGreen'
-          break;
-        case '3':
-          return 'carWhite'
-          break;
-        case '4':
-          return 'carBlack'
-          break;
-      }
-    }
+    // formateColor(val) {  // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+    //   switch (val) {
+    //     case 0:
+    //       return 'carBlue'
+    //       break;
+    //     case 1:
+    //       return 'carYellow'
+    //       break;
+    //     case 2:
+    //       return 'carWhite'
+    //       break;
+    //     case 3:
+    //       return ' carBlack'
+    //       break;
+    //     case 4:
+    //       return 'carGreen'
+    //       break;
+    //   }
+    // }
   }
 }
 </script>
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 34d79c6..fda0e78 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -154,6 +154,8 @@ export default {
   },
   created() {
     this.carNumber = this.$route.query.carNumber  // 获取车牌号
+    this.carColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+
     console.log(this.carNumber)
     this.parkRecordList(this.carNumber)
   },
@@ -329,26 +331,7 @@ export default {
     }
   },
   filters: {
-    formateColor(val) {
-      switch (val) {
-        case 0:
-          return 'carBlue'
-          break;
-        case 1:
-          return 'carYellow'
-          break;
-        case 2:
-          return 'carGreen'
-          break;
-        case 3:
-          return 'carWhite'
-          break;
-        case 4:
-          return 'carBlack'
-          break;
 
-      }
-    }
   }
 }
 </script>
diff --git a/src/main.js b/src/main.js
index a941ddf..ed9a24d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,11 @@ Vue.use(h5Popup)
 import utils from './utils/utils'
 Vue.prototype.$utils = utils
 
+import vueFilter from './utils/filters'  // 公共filter
+for (let key in vueFilter){
+  Vue.filter(key,vueFilter[key])
+}
+
 Vue.config.productionTip = false
 
 /* eslint-disable no-new */
diff --git a/src/utils/filters.js b/src/utils/filters.js
new file mode 100644
index 0000000..9b28c77
--- /dev/null
+++ b/src/utils/filters.js
@@ -0,0 +1,24 @@
+const vFilter = {
+  formateColor: function(val) {  // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+    switch (val) {
+      case '0':
+        return 'carBlue'
+        break;
+      case '1':
+        return 'carYellow'
+        break;
+      case '2':
+        return 'carWhite'
+        break;
+      case '3':
+        return ' carBlack'
+        break;
+      case '4':
+        return 'carGreen'
+        break;
+
+    }
+  }
+}
+
+export default vFilter
--
libgit2 0.21.4