Merge remote-tracking branch 'origin/master'

# Conflicts:
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/components/auth-login/auth-login.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/storage-point-detail/storage-point-detail.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/storage-point/storage-point.js.map
#	small-program/unpackage/dist/dev/mp-weixin/components/auth-login/auth-login.js
#	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/mine/mine.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point-detail/storage-point-detail.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point-detail/storage-point-detail.json
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point-detail/storage-point-detail.wxml
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point/storage-point.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/storage-point/storage-point.wxml