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

@@ -30,6 +30,7 @@ var _hmt = _hmt || [];
         (function() {
         (function() {
             var hm = document.createElement("script");
             var hm = document.createElement("script");
             hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";
             hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";
+            hm.async = 1;
             var s = document.getElementsByTagName("script")[0];
             var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);
             s.parentNode.insertBefore(hm, s);
         })();
         })();

@@ -89,7 +89,7 @@ class CartModel
             }
             }
 
 
             // 普通购物车空，则显示预售购物车
             // 普通购物车空，则显示预售购物车
-            if ($ordinaryCount === '0' && $ordinaryCount) {
+            if ($ordinaryCount === '0' && $ordinarySoldOut) {
                 $result['cartNav'] = false;
                 $result['cartNav'] = false;
                 $result['cartType'] = 'advance';
                 $result['cartType'] = 'advance';
             }
             }