Merge branch 'release/4.8'

@@ -649,8 +649,8 @@ function addcart(data, cookieList) {
                     path: '/'
                     path: '/'
                 });
                 });
             }
             }
-        } else if (d.code === 500) {
-            new Alert(d.message).show();
+        } else {
+            new Alert(d.message === '' ? '加入购物车失败哦~~' : d.message).show();
         }
         }
     });
     });
 }
 }

@@ -322,6 +322,8 @@ $addToCart.click(function() {
             $('#balance').slideDown(SLIDETIME);
             $('#balance').slideDown(SLIDETIME);
 
 
             $('#cart-num').text(data.data.goods_count); //更新数目
             $('#cart-num').text(data.data.goods_count); //更新数目
+        } else {
+            new Alert(data.message === '' ? '加入购物车失败哦~~' : data.message).show();
         }
         }
     });
     });
 });
 });

@@ -508,7 +508,7 @@ class CartModel
                     $build['img'] = Helpers::getImageUrl($value['default_images'], 100, 100);
                     $build['img'] = Helpers::getImageUrl($value['default_images'], 100, 100);
                     $build['alt'] = $value['product_name'];
                     $build['alt'] = $value['product_name'];
                     $build['price'] = strstr(strval($value['sales_price']), '.') ? $value['sales_price'] : $value['sales_price'] . '.00';
                     $build['price'] = strstr(strval($value['sales_price']), '.') ? $value['sales_price'] : $value['sales_price'] . '.00';
-                    if ($value['sales_price'] !== ['market_price']) {
+                    if ($value['sales_price'] !== $value['market_price']) {
                         $build['marketPrice'] = strstr(strval($value['market_price']), '.') ? $value['market_price'] : $value['market_price'] . '.00';
                         $build['marketPrice'] = strstr(strval($value['market_price']), '.') ? $value['market_price'] : $value['market_price'] . '.00';
                     }
                     }