Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mini-program/pages/login/login.vue
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/components/login/login.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-number-box/u-number-box.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/node/node.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-parse/u-parse.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-scroll-list/u-scroll-list.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-search/u-search.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swipe-action-item/u-swipe-action-item.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-swiper/u-swiper.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/address/address.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/agreement-description/agreement-description.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/article-details/article-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/change-binding/change-binding.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/community/community.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/confirm-order/confirm-order.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon-details/coupon-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon-rewards/coupon-rewards.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/coupon/coupon.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/details/details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/distributor/distributor.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/mall.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my-collection/my-collection.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my-points/my-points.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/new-address/new-address.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-details/order-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/payment-successful/payment-successful.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/sales-details/sales-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/select-city/select-city.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/settings/settings.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/share/share.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping-cart/shopping-cart.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/special-zone/special-zone.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/add-bank-card/add-bank-card.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/my-membership/my-membership.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/my-qualifications/my-qualifications.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/order-details/order-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/order/order.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/product-management/product-management.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/virtual-account/virtual-account.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/withdraw-select/withdraw-select.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/withdraw-success/withdraw-success.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/withdraw/withdraw.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/withdrawal-details/withdrawal-details.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/write-off-a/write-off-a.js.map
#	mini-program/unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/write-off/write-off.js.map