* dev: (64 commits)
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  1
  解决bug
  1
  ...

# 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/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/main.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/order/order.js
#	unpackage/dist/dev/mp-weixin/pagesA/login/login.js
#	unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js

* 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini:
  解决bug
  动画修改