严立 / mini-shimao

# Conflicts:
#	app.js
#	pages/mine/home/home.js
#	pages/mine/home/home.wxml
#	pages/play/service-detail/service-detail.wxml
#	pages/play/service-detail/service-detail.wxss

Signed-off-by: 严立 <yanl@xmmakeit.com>