Merge branch 'twostage' of http://172.16.90.201:3000/parking/parking_h5 into twostage

App.vue

@@ -5,20 +5,20 @@
 			//判断客户端类别
 			if (/MicroMessenger/.test(window.navigator.userAgent)) {
 				uni.setStorage({
-					key:'userAgent',
+					key: 'userAgent',
-					data:'wxAgent'
+					data: 'wxAgent'
 				});
 				// console.log('handleAliPay 微信客户端');
 			} else if (/AlipayClient/.test(window.navigator.userAgent)) {
 				uni.setStorage({
-					key:'userAgent',
+					key: 'userAgent',
-					data:'aliAgent'
+					data: 'aliAgent'
 				});
 				// console.log('handleAliPay 支付宝客户端');
 			} else {
 				uni.setStorage({
-					key:'userAgent',
+					key: 'userAgent',
-					data:'otherAgent'
+					data: 'otherAgent'
 				});
 				// console.log('handleAliPay 其他浏览器');
 			};

main.js

@@ -2,10 +2,12 @@ import Vue from 'vue'
 import App from './App'
 
 Vue.config.productionTip = false
-import { config } from './common/config'
+import {
+	config
+} from './common/config'
 Vue.prototype.config = config;
 
-import './utils/filter' 
+import './utils/filter'
 
 App.mpType = 'app'
 
@@ -22,7 +24,7 @@ Vue.mixin(vuexStore);
 
 const app = new Vue({
 	store,
-    ...App
+	...App
 });
 
 // http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用