wxd / MShopWeApp

# 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优化

# Conflicts:
#	app.js