Authored by 毕凯

Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart

@@ -590,7 +590,10 @@ class CartModel @@ -590,7 +590,10 @@ class CartModel
590 $data['name'] = $productData['product_name']; 590 $data['name'] = $productData['product_name'];
591 $data['price'] = $productData['market_price']; 591 $data['price'] = $productData['market_price'];
592 $data['salePrice'] = $productData['sales_price']; 592 $data['salePrice'] = $productData['sales_price'];
593 - $data['storage'] = $productData['storage_sum']; 593 +
  594 + if (isset($productData['storage_sum'])) {
  595 + $data['storage'] = $productData['storage_sum'];
  596 + }
594 if ($num !== null) { 597 if ($num !== null) {
595 $data['num'] = $num; 598 $data['num'] = $num;
596 } 599 }