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

@@ -105,13 +105,6 @@ if ($('.cart-nav').length > 0) {
             return;
             return;
         }
         }
 
 
-        if (switchChose === false) {
-            $cartContentShow.find('.shopping-cart-good .name').each(function() {
-                this.mlellipsis(2);
-            });
-            switchChose = true;
-        }
-
         if (cartType === 'ordinary') {
         if (cartType === 'ordinary') {
             cartType = 'advance';
             cartType = 'advance';
             $('#cartType').val('advance');
             $('#cartType').val('advance');
@@ -128,6 +121,13 @@ if ($('.cart-nav').length > 0) {
 
 
         $cartContentShow = $cartContent.not('.hide');
         $cartContentShow = $cartContent.not('.hide');
 
 
+        if (switchChose === false) {
+            $cartContentShow.find('.shopping-cart-good .name').each(function() {
+                this.mlellipsis(2);
+            });
+            switchChose = true;
+        }
+
         //trigger lazyload
         //trigger lazyload
         $(window).trigger('scroll');
         $(window).trigger('scroll');
     });
     });

@@ -78,6 +78,7 @@
     }
     }
 
 
     .not-avaliable {
     .not-avaliable {
-        -webkit-filter: grayscale(100%);
+        // -webkit-filter: grayscale(100%);
+        @include filter(grayscale(100%));
     }
     }
 }
 }

@@ -9,6 +9,10 @@ $basicBtnC:#eb0313;
     overflow: hidden;
     overflow: hidden;
     background-color: #f0f0f0;
     background-color: #f0f0f0;
 
 
+    .yoho-tip {
+        z-index: 4;
+    }
+
     .page-block {
     .page-block {
         background-color: #fff;
         background-color: #fff;
         box-sizing: border-box;
         box-sizing: border-box;