Merge remote-tracking branch 'origin/master'

# Conflicts:
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/delivery-order-detail/delivery-order-detail.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/itinerary/itinerary.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/luggage-storage/luggage-storage.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/payment-success/payment-success.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/storage-point/storage-point.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/store-apply/store-apply.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/login/login.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/order-details/order-details.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/store-home/store-home.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/store-info/store-info.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/wallet/wallet.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/shop/pages/write-off-a/write-off-a.js.map
#	small-program/unpackage/dist/dev/mp-weixin/common/vendor.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/delivery-order-detail/delivery-order-detail.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/delivery-order-detail/delivery-order-detail.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/index/index.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/luggage-storage/luggage-storage.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/payment-success/payment-success.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point/storage-point.js
#	small-program/unpackage/dist/dev/mp-weixin/project.private.config.json
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/login/login.js
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/order-details/order-details.js
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/order-details/order-details.wxml
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/store-home/store-home.js
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js
#	small-program/unpackage/dist/dev/mp-weixin/shop/pages/write-off-a/write-off-a.wxml