修改微信登录方式
完善订单管理
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/admins/_smenu_node.htm
	themes/default/_nav.htm.php