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

@@ -117,6 +117,7 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
                 $('.num-tag').html(numInCart + buyNumber);
                 $('.num-tag').html(numInCart + buyNumber);
                 $('.num-tag').removeClass('hide');
                 $('.num-tag').removeClass('hide');
                 confirming = false;
                 confirming = false;
+                tip.show('选择成功');
                 remove();
                 remove();
             }
             }
         }).fail(function() {
         }).fail(function() {
@@ -147,14 +148,21 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
     }
     }
 
 
     if ($chosed.length === 0) {
     if ($chosed.length === 0) {
-        $this.closest('ul>li').each(function() {
+        $colorList.each(function() {
             $(this).removeClass('zero-stock');
             $(this).removeClass('zero-stock');
             if (0 === $(this).data('num') - 0) {
             if (0 === $(this).data('num') - 0) {
                 $(this).addClass('zero-stock');
                 $(this).addClass('zero-stock');
             }
             }
         });
         });
 
 
-        $siblingBlock.find('ul>li').each(function() {
+        $sizeList.each(function() {
+            colorIndex = $(this).data('colorid');
+            if (colorIndex === firstColorId) {
+                $(this).removeClass('hide');
+            }
+        });
+
+        $sizeList.not('.hide').each(function() {
             $(this).removeClass('zero-stock');
             $(this).removeClass('zero-stock');
             if (0 === $(this).data('num') - 0) {
             if (0 === $(this).data('num') - 0) {
                 $(this).addClass('zero-stock');
                 $(this).addClass('zero-stock');
@@ -178,7 +186,7 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
         $siblingBlock.find('.block').removeClass('zero-stock');
         $siblingBlock.find('.block').removeClass('zero-stock');
         for (i = 0; i < numArray.length; i++) {
         for (i = 0; i < numArray.length; i++) {
             if (0 === numArray[i] - 0) {
             if (0 === numArray[i] - 0) {
-                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
+                $siblingBlock.find('.block').not('.hide').eq(i).addClass('zero-stock');
             }
             }
         }
         }
     } else if ($chosed.length === 1 && !$this.hasClass('chosed')) {
     } else if ($chosed.length === 1 && !$this.hasClass('chosed')) {
@@ -199,7 +207,7 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
                 $siblingBlock.find('.block').eq(i).addClass('zero-stock');
                 $siblingBlock.find('.block').eq(i).addClass('zero-stock');
             }
             }
         }
         }
-        numArray = $siblingBlock.find('.chosed').data('numstr').split('/');
+        numArray = ($siblingBlock.find('.chosed').data('numstr') + '').split('/');
         $that.find('.num .left-num').html('剩余' + numArray[index] + '件');
         $that.find('.num .left-num').html('剩余' + numArray[index] + '件');
         if (2 === $chosed.closest('.zero-stock').length) {
         if (2 === $chosed.closest('.zero-stock').length) {
             $('#chose-btn-sure').css('background-color', '#c0c0c0');
             $('#chose-btn-sure').css('background-color', '#c0c0c0');