Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -464,7 +464,9 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
         let hasPrices = result.ordinaryCart.priceGifts && result.ordinaryCart.priceGifts.length;
         let hasPromo = result.ordinaryCart.promotionInfos && result.ordinaryCart.promotionInfos.length;
 
-        result.ordinaryCart.hasGlobalBlock = hasGifts || hasPrices || hasPromo;
+        if (result.ordinaryCart) {
+            result.ordinaryCart.hasGlobalBlock = hasGifts || hasPrices || hasPromo;
+        }
 
         result.stat = {
             orderAmount: _.get(advStat, 'orderAmount', 0) + _.get(ordStat, 'orderAmount', 0),
@@ -479,7 +481,7 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
         if (cartDelList) {
             try {
                 result.deleteShop = JSON.parse(cartDelList);
-            } catch(err) {
+            } catch (err) {
                 logger.error(err);
             }
         }
@@ -907,7 +909,7 @@ const getTogetherProduct = (page) => {
         });
 
         // 当数据量不足6个时，判定为没有下一页
-        if (page == 1) {
+        if (page === 1) {
             result.data.hasPrev = false;
         }