搭配分享页面的四个小图片 变小
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git
积分使用说明页面
个人中心
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git

Conflicts:
	SRC/weTall/app/Tpl/home/default/user/index.html
个人中心
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git

Conflicts:
	SRC/weTall/static/weixin/css/shop.css
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git
test