wxd / MShopWeApp

2.  会员分享要提示是谁分享的，并弹出框点击跳转
3.  会员分享邀请要有积分奖励
4.  一件代发

2. 测肤的优化

# Conflicts:
#	app.js
#	packageA/pages/goodsInfo/goodsInfo.js
#	packageA/pages/goodsInfo/goodsInfo.wxml
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
#	packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
#	packageC/pages/presell/goodsInfo/goodsInfo.js
#	packageC/pages/presell/goodsInfo/goodsInfo.wxml
#	pages/goods/goodsInfo/goodsInfo.js
#	pages/goods/goodsInfo/goodsInfo.wxml
#	pages/user/index/index.js
#	pages/user/index/index.wxml
#	pages/user/index/index.wxss

2.自定义模板时候，首页分享空白页的OA单优化
3. 测肤的分享和生成海报的bug优化

2.自定义模板时候，首页分享空白页的OA单优化
3. 测肤的分享和生成海报的bug优化

This reverts commit 6fd8da0a4345867615d9252c9908ac4aa0617088.