商品图片大图后支持缩放
Merge branch 'master' of https://github.com/joy32812/beauty
判断文章是否收藏过
文章收藏的添加和取消
Merge pull request #60 from majie1993/master

文章收藏+商品大图缩放
收获地址的Picker
Merge pull request #61 from majie1993/master

收获地址的Picker
add alipay.
fix conflict.