结算写了个die
Merge branch 'master' of https://github.com/shanghaishule/weixinshop.git

Conflicts:
	SRC/weTall/app/Lib/Action/home/orderAction.class.php