Merge branch 'master' of http://118.126.103.67:3000/vue/dianping
# Conflicts:
# unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/add_dishes/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
# unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map
# unpackage/dist/dev/mp-weixin/common/main.js
# unpackage/dist/dev/mp-weixin/common/vendor.js
# unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js
# unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
# unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
# unpackage/dist/dev/mp-weixin/pages/add_dishes/index.js
# unpackage/dist/dev/mp-weixin/pages/index/index.js
# unpackage/dist/dev/mp-weixin/pages/index/index.wxml
# unpackage/dist/dev/mp-weixin/pages/login/login.js
# unpackage/dist/dev/mp-weixin/pages/user/index.js
|