Merge branch 'Microservices' into tronMicroservices

# Conflicts:
#	src/pages/parkingFee/parkingFee.vue
#	src/pages/parkingFee/parkingReceipt/parkingApplication.vue
#	src/pages/parkingFee/parkingReceipt/parkingChooseHeader.vue
#	src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

src/main.js

@@ -17,6 +17,7 @@ import {
   CountDown,
   Switch,
   Skeleton,
+  Dialog,
 } from 'vant';
 import router from './routes/index.js'; // 注册页面路由
 import wx from '@/utils/js_sdk/weixin'; // 接入微信JSDK
@@ -49,7 +50,8 @@ Vue.use(Icon)
   .use(Popup)
   .use(CountDown)
   .use(Skeleton)
-  .use(Switch);
+  .use(Switch)
+  .use(Dialog);
 
 Vue.config.ignoredElements = ['wx-open-launch-weapp'];