Merge branch 'master' into 'gray'

Master



See merge request !363

@@ -71,6 +71,7 @@ const getGiftCards = (req, res, next) => {
 // 订单金额计算
 const compute = (req, res, next) => {
     let params = req.body;
+
     // 6.7.5 web端下架预售购物车功能
     // let cartType = req.query.type === '2' ? 'advance' : 'ordinary';
     let cartType = 'ordinary';
@@ -122,6 +123,7 @@ const submitCheck = (req, res, next) => {
 // 提交订单
 const submit = (req, res, next) => {
     let params = req.body;
+
     // 6.7.5 web端下架预售购物车功能
     // let cartType = req.query.type === '2' ? 'advance' : 'ordinary';
     let cartType = 'ordinary';

@@ -583,6 +583,7 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
 
     // 6.7.5 web端下架预售购物车功能
     result.advanceCart = {};
+
     // let advCartData = _.get(cartData, 'advance_cart_data');
     // result.advanceCart = {
     //     // 未参加活动的商品