Merge remote-tracking branch 'origin/master'
# Conflicts:
# 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/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/components/uiq-tabbar/uiq-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/contract/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/set-up.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/paySuccess/paySuccess.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/register.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-icons/tm-icons.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-listitem/tm-listitem.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-maskFlow/tm-maskFlow.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-menu/tm-menu.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/tm-vuetify/components/tm-translate/tm-translate.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-count-down/u-count-down.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-transition/u-transition.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
# unpackage/dist/dev/mp-weixin/common/runtime.js
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/components/uiq-tabbar/uiq-tabbar.js
# unpackage/dist/dev/mp-weixin/pages/mine/index.js
# unpackage/dist/dev/mp-weixin/pages/mine/set-up.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/index.js
# unpackage/dist/dev/mp-weixin/pages/order-goods/order-details.js
# unpackage/dist/dev/mp-weixin/pages/payError/payError.js
# unpackage/dist/dev/mp-weixin/pages/paySuccess/paySuccess.js
# unpackage/dist/dev/mp-weixin/project.private.config.json
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--image/u--image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u--input/u--input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-image/u-image.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-input/u-input.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-line/u-line.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-icon/u-loading-icon.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-transition/u-transition.js
# unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.js
|
Aiden
xingyy