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

@@ -150,8 +150,22 @@ function changeSizeChosed(newSizeIndex) {
                 return $curSizeBlock.data('num');
             }
         }
+
+        //老的选中尺码在新选中的颜色对应尺码中不存在,需要下述1,2,3,4
+        // 1.重置尺码选择的标志变量.
         $curSizeBlock = null;
-        return 0;
+        hasChooseSize = false;
+
+        // 2.当前颜色行隐藏
+        $colorRowList.eq(curColorIndex).addClass('hide');
+
+        // 3.目标颜色行第一行显示
+        $colorRowList.eq(0).removeClass('hide');
+
+        // 4.老的选中颜色去掉勾选,新的选中颜色加上勾选
+        //changeColorChosed(0);
+
+        return -1;
     }
     return 0;
 }
@@ -221,6 +235,14 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         $sizeRowList.eq(index + 1).removeClass('hide');
 
         curSizeIndex = index + 1;
+
+        // 特殊处理
+        //if (-1 === curGoodNum) {
+        //
+        //    //index = $this.data('index') - 1;
+        //
+        //}
+
         $curColorBlock = $this;
 
         // 修改颜色时修改商品图片

@@ -35,13 +35,18 @@ module.exports = function(specificGender) {
     } else if (lifestyleType) {
 
         //有货币页面加载男生首页的数据
-        url = specificGender ? '/product/recom/maylike?gender=1,3' : '/product/recom/maylikelife';
+        url = specificGender === 'lifestyle' ? '/product/recom/maylike?gender=1,3' : '/product/recom/maylikelife';
     } else {
         gender = (specificGender === 'boys' || $('.mobile-wrap').hasClass('boys-wrap')) ?
                  '1,3' : '2,3',
         url = '/product/recom/maylike?gender=' + gender;
     }
 
+    //以防cookie异常,强制加载男首
+    if (specificGender === 'boys') {
+        url = '/product/recom/maylike?gender=1,3';
+    }
+
     $curNav = $navList.children('.focus');
 
     if (lifestyleType) {

@@ -5,7 +5,7 @@
  */
 
 function getGender() {
-    return window.cookie('_Channel');
+    return window.cookie('_Channel') || 'boys';
 }
 
 require('../home/maybe-like')(getGender());