Merge remote-tracking branch 'origin/master'

# Conflicts:
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/components/sunui-mverify/sunui-mverify.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/components/t-index-address/components/t-index-address/t-index-address.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--textarea/u--textarea.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-calendar/header.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-calendar/month.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-calendar/u-calendar.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-rate/u-rate.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-textarea/u-textarea.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/balance-details/balance-details.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/catering-certification/catering-certification.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/certification-results/certification-results.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/certification-successful/certification-successful.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/demand-hall/demand-hall.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/employment-certification/employment-certification.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/freight-certification/freight-certification.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/freight-order/freight-order.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/freight/freight.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-details/order-details.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-food/order-food.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/packaging-worker/packaging-worker.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/rich-text-page/rich-text-page.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/seleCity/seleCity.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/set-up/set-up.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/sorting/sorting.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/success/success.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/using-workers/using-workers.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/withdrawal-successful/withdrawal-successful.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/withdrawal/withdrawal.js.map
#	small-program/unpackage/dist/dev/mp-weixin/common/vendor.js
#	small-program/unpackage/dist/dev/mp-weixin/components/sunui-mverify/sunui-mverify.js
#	small-program/unpackage/dist/dev/mp-weixin/components/t-index-address/components/t-index-address/t-index-address.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--textarea/u--textarea.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-calendar/header.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-calendar/month.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-calendar/u-calendar.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.json
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-rate/u-rate.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-textarea/u-textarea.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/balance-details/balance-details.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/catering-certification/catering-certification.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/certification-results/certification-results.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/certification-successful/certification-successful.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/demand-hall/demand-hall.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/employment-certification/employment-certification.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight-certification/freight-certification.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight-order/freight-order.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.json
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss
#	small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
#	small-program/unpackage/dist/dev/mp-weixin/pages/login/login.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss
#	small-program/unpackage/dist/dev/mp-weixin/pages/order-details/order-details.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/order-food/order-food.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/packaging-worker/packaging-worker.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/seleCity/seleCity.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/set-up/set-up.wxss
#	small-program/unpackage/dist/dev/mp-weixin/pages/sorting/sorting.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/success/success.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/withdrawal-successful/withdrawal-successful.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/withdrawal/withdrawal.js
#	small-program/unpackage/dist/dev/mp-weixin/project.private.config.json