Merge branch 'develop'

@@ -5,6 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
+    ellipsis = require('mlellipsis'),
     Hammer = require('yoho.hammer');
     Hammer = require('yoho.hammer');
 
 
 var chosePanel = require('./chose-panel'),
 var chosePanel = require('./chose-panel'),
@@ -15,21 +16,33 @@ var $cartContent = $('.cart-content'),
     cartType = $('#cartType').val(),
     cartType = $('#cartType').val(),
     hasShowCartPresellTip = false;
     hasShowCartPresellTip = false;
 
 
-var $cartContentShow = $cartContent.not('.hide');
-
 var navHammer,
 var navHammer,
     advanceBuyHammer,
     advanceBuyHammer,
     freebieHammer,
     freebieHammer,
     switchChose = false;
     switchChose = false;
 
 
 require('../product/recommend-for-you');
 require('../product/recommend-for-you');
+require('./good');
+
+ellipsis.init();
+
+function cartContentShow() {
+    return $cartContent.not('.hide');
+}
+
+function mlellipsisHiddenNames() {
+    cartContentShow().find('.shopping-cart-good .name').each(function() {
+        this.mlellipsis(2);
+    });
+    switchChose = true;
+}
 
 
 function hasChecked() {
 function hasChecked() {
-    return $cartContentShow.find('.icon-cb-checked').length > 0 ? true : false;
+    return cartContentShow().find('.cart-goods .icon-cb-checked').length > 0 ? true : false;
 }
 }
 
 
 function shouldSelectGift() {
 function shouldSelectGift() {
-    var $freebie = $cartContentShow.find('.freebie');
+    var $freebie = cartContentShow().find('.freebie');
 
 
     if ($freebie.length <= 0) {
     if ($freebie.length <= 0) {
         return false;
         return false;
@@ -70,16 +83,12 @@ function showChooseGifDialog() {
             rightBtnText: '去选择'
             rightBtnText: '去选择'
         }
         }
     }, function() {
     }, function() {
-        window.location.href = $cartContentShow.find('.freebie > a').attr('href');
+        window.location.href = cartContentShow().find('.freebie > a').attr('href');
     }, function() {
     }, function() {
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
     });
     });
 }
 }
 
 
-require('./good');
-
-//lazyLoad($('img.lazy'));
-
 if (typeof window.cookie === 'function' && 'y' === window.cookie('_hasShowCartPresellTip')) {
 if (typeof window.cookie === 'function' && 'y' === window.cookie('_hasShowCartPresellTip')) {
     $('#presell-tip').removeClass('show').addClass('hide');
     $('#presell-tip').removeClass('show').addClass('hide');
     hasShowCartPresellTip = true;
     hasShowCartPresellTip = true;
@@ -91,9 +100,9 @@ if ('advance' === cartType) {
     $cartContent.toggleClass('hide');
     $cartContent.toggleClass('hide');
     $('#common-cart-nav').removeClass('active');
     $('#common-cart-nav').removeClass('active');
     $('#presell-cart-nav').addClass('active');
     $('#presell-cart-nav').addClass('active');
-    $('.shopping-cart-good .name').each(function() {
-        this.mlellipsis(2);
-    });
+
+    mlellipsisHiddenNames();
+    $(window).trigger('scroll');
 }
 }
 
 
 if ($('.cart-nav').length > 0) {
 if ($('.cart-nav').length > 0) {
@@ -119,13 +128,8 @@ if ($('.cart-nav').length > 0) {
         //切换普通商品和预售商品购物车显示
         //切换普通商品和预售商品购物车显示
         $cartContent.toggleClass('hide');
         $cartContent.toggleClass('hide');
 
 
-        $cartContentShow = $cartContent.not('.hide');
-
         if (switchChose === false) {
         if (switchChose === false) {
-            $cartContentShow.find('.shopping-cart-good .name').each(function() {
-                this.mlellipsis(2);
-            });
-            switchChose = true;
+            mlellipsisHiddenNames();
         }
         }
 
 
         //trigger lazyload
         //trigger lazyload

@@ -20,6 +20,7 @@
     .cart-nav {
     .cart-nav {
         color: #c6c6c6;
         color: #c6c6c6;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
+        background: #fff;
 
 
         li {
         li {
             float: left;
             float: left;