detail页面开始
Merge branch 'master' of https://github.com/lantianlz/aoaoxc

Conflicts:
	www/templates/mobile/car_wash/detail.html