- 
Conflicts: packageB/pages/zuhegou/list/list.wxml pages/goods/goodsInfo/goodsInfo.js 
- 
# Conflicts: # pages/goods/goodsInfo/goodsInfo.js # pages/goods/goodsInfo/goodsInfo.wxss 
- 
秒杀规则优化 See merge request !839 
Conflicts: packageB/pages/zuhegou/list/list.wxml pages/goods/goodsInfo/goodsInfo.js
# Conflicts: # pages/goods/goodsInfo/goodsInfo.js # pages/goods/goodsInfo/goodsInfo.wxss
秒杀规则优化 See merge request !839