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

@@ -96,9 +96,10 @@ function resetColorZeroStock($siblingBlock) {
 
 
     if (!hasChooseSize) {
     if (!hasChooseSize) {
         $siblingBlock.find('ul>li').each(function() {
         $siblingBlock.find('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
             if (0 === $(this).data('num')) {
             if (0 === $(this).data('num')) {
                 $(this).addClass('zero-stock');
                 $(this).addClass('zero-stock');
+            } else {
+                $(this).removeClass('zero-stock');
             }
             }
         });
         });
 
 
@@ -107,6 +108,8 @@ function resetColorZeroStock($siblingBlock) {
         for (i = 0; i < numArray.length; i++) {
         for (i = 0; i < numArray.length; i++) {
             if ('0' === numArray[i]) {
             if ('0' === numArray[i]) {
                 $siblingBlock.find('.block').eq(i).addClass('zero-stock');
                 $siblingBlock.find('.block').eq(i).addClass('zero-stock');
+            } else {
+                $siblingBlock.find('.block').eq(i).removeClass('zero-stock');
             }
             }
         }
         }
     }
     }