Merge remote-tracking branch 'origin/master'

common/config.js

@@ -1,5 +1,5 @@
-const host = 'http://wx.hw.hongweisoft.com/parking';//本地
-// const host = 'http://parking.pdzhtc.com';//正式
+const host = 'https://wx.hw.hongweisoft.com/parking';//本地
+// const host = 'https://parking.pdzhtc.com';//正式
 // const host = 'http://172.16.90.64:7000';
 const config = {
 	wxAppid:'wxbe90cc7c5233dd84',// wxAppid