啊，别人已经完工了
Merge branch 'lihui' of github.com:iartisan/wechat into lihui

Conflicts:
	app/controllers/SendmsgController.php
页面还差填写地址和成功预定和订单页有一点点误差
Merge branch 'lihui' of github.com:iartisan/wechat into lihui
Merge branch 'seven' into lihui