加入购物车的活动规则判断
Merge branch 'master' of https://github.com/phiree/testttt
前台流程整合完毕 待测试
Merge branch 'master' of https://github.com/phiree/testttt