数字和rpx不要有空格

# Conflicts:
#	main.js
#	pages/binding/binding.vue
#	pages/binding/index.vue
#	pagesB/pages/move-car/addCar.vue
#	pagesB/pages/move-car/loveCar.vue
#	pagesB/pages/move-car/myCall.vue
#	pagesB/pages/move-car/myMoveCar.vue
#	pagesB/pages/move-car/myRecord.vue
#	pagesC/pages/shop/index.vue
#	pagesC/pages/shop/pay.vue
#	pagesD/pages/personal/carTime.vue
#	pagesD/pages/personal/editAddress.vue
#	pagesD/pages/personal/myOrder.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/active-form.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-carnumber/codecook-carnumber.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-keyboard/codecook-keyboard.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-gap/u-gap.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-modal/u-modal.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-picker/u-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-search/u-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-switch/u-switch.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/wxcomponents/custom-tarbar/custom-tarbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getCarCode.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getPrice.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/userInfo.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/popup.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/select.js
#	unpackage/dist/dev/mp-weixin/common/codecook-carnumber/codecook-carnumber.js
#	unpackage/dist/dev/mp-weixin/common/codecook-keyboard/codecook-keyboard.js
#	unpackage/dist/dev/mp-weixin/common/codecook-keyboard/codecook-keyboard.wxss
#	unpackage/dist/dev/mp-weixin/common/main.js
#	unpackage/dist/dev/mp-weixin/common/runtime.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--form/u--form.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--input/u--input.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-badge/u-badge.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-form/u-form.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-icon/u-icon.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-input/u-input.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-line/u-line.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-modal/u-modal.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-search/u-search.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-transition/u-transition.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.js
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/loveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/loveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myCall.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myCall.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myMoveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myRecord.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myRecord.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.wxml
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/addAddress.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/carTime.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/carTime.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/editAddress.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/editAddress.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.js