Merge branch 'feature/new-product-detail' of http://git.yoho.cn/fe/yohobuy-node …

…into feature/new-product-detail

@@ -30,6 +30,7 @@ var $main = $('.main'),
     secKill = $main.data('seckill') === 'Y',
     secKill = $main.data('seckill') === 'Y',
     limitCode = $main.data('limitcode');
     limitCode = $main.data('limitcode');
 
 
+var maxStock = -1; // 记录当前选中的颜色-尺码的库存量，若为-1，代表未选择尺码
 var SLIDETIME = 200;
 var SLIDETIME = 200;
 
 
 var colTxt = {
 var colTxt = {
@@ -97,7 +98,7 @@ bindEvent.add(function() {
 
 
     var isTicket = $('input[name="isTicket"]').length > 0 && $('input[name="isTicket"]').val() === 'true';
     var isTicket = $('input[name="isTicket"]').length > 0 && $('input[name="isTicket"]').val() === 'true';
 
 
-    var maxStock = -1; // 记录当前选中的颜色-尺码的库存量，若为-1，代表未选择尺码
+
 
 
     var brandDomain = $('.home').attr('href');
     var brandDomain = $('.home').attr('href');
 
 
@@ -1474,11 +1475,13 @@ $('.bottom-tab').on('click', '.bottom-title', function() {
         // 店铺推荐
         // 店铺推荐
         $recommendComment.slideDown(SLIDETIME);
         $recommendComment.slideDown(SLIDETIME);
         $latestWalk.slideUp(SLIDETIME);
         $latestWalk.slideUp(SLIDETIME);
+        $('.change').css('display','inline-block');
     } else {
     } else {
         // 最近游览
         // 最近游览
         fetchLatestWalk();  // eslint-disable-line
         fetchLatestWalk();  // eslint-disable-line
         $recommendComment.slideUp(SLIDETIME);
         $recommendComment.slideUp(SLIDETIME);
         $latestWalk.slideDown(SLIDETIME);
         $latestWalk.slideDown(SLIDETIME);
+        $('.change').css('display','none');
     }
     }
 
 
 });
 });
@@ -1589,6 +1592,16 @@ $('.redcar').on('click', '.option', function() {
     $this.addClass('fixed');
     $this.addClass('fixed');
 });
 });
 
 
+$('.redcar').on('click', function(){
+  var $addToCart = $('#add-to-cart');
+  var sc = $(document);
+   if(maxStock === -1){
+      sc.scrollTop(0);
+   }else{
+     $addToCart.trigger('click');
+   }
+});
+
 $(function() {
 $(function() {
     $('.bottom-tab .change').click(function() {
     $('.bottom-tab .change').click(function() {
         $('.img-brand-switch .next').trigger('click');
         $('.img-brand-switch .next').trigger('click');

@@ -748,6 +748,7 @@
         padding-bottom: 30px;
         padding-bottom: 30px;
         border-left: 1px solid #eaeceb;
         border-left: 1px solid #eaeceb;
         border-right: 1px solid #eaeceb;
         border-right: 1px solid #eaeceb;
+        border-bottom: 1px solid #eaeceb;
         width: 980px;
         width: 980px;
         float: left;
         float: left;
 
 
@@ -842,7 +843,7 @@
      .fixednav{
      .fixednav{
 
 
        position: fixed;
        position: fixed;
-       top:-30px;
+       top:0px;
        margin-left: 982px;
        margin-left: 982px;
      }
      }
 
 
@@ -850,7 +851,6 @@
         background-color: #f5f5f5;
         background-color: #f5f5f5;
         float: left;
         float: left;
         height: 240px;
         height: 240px;
-        margin-top: 30px;
         width: 165px;
         width: 165px;
         border-right: 1px solid #eaeceb;
         border-right: 1px solid #eaeceb;
         height: 1000px;
         height: 1000px;
@@ -919,10 +919,17 @@
 
 
      }
      }
 
 
+     #goodsMessage{
+       margin-top: 0;
+       margin-left: 0;
+       margin-right: 0;
+     }
 
 
 
 
     .info-block {
     .info-block {
         margin-top: 30px;
         margin-top: 30px;
+        margin-left: 40px;
+        margin-right: 40px;
         color: #999;
         color: #999;
         border-top: 2px solid #eaeceb;
         border-top: 2px solid #eaeceb;
         font-size: 12px;
         font-size: 12px;
@@ -971,7 +978,7 @@
     }
     }
 
 
     .info-bootom {
     .info-bootom {
-      margin-top: 0px;
+      margin: 0px;
     }
     }
 
 
      #block-title-head {
      #block-title-head {
@@ -991,7 +998,7 @@
         .title {
         .title {
             display: inline-block;
             display: inline-block;
             padding-top: 15px;
             padding-top: 15px;
-            font-weight: bold;
+
             cursor: pointer;
             cursor: pointer;
             font-size: 16px;
             font-size: 16px;
             margin-left: auto;
             margin-left: auto;
@@ -1954,7 +1961,7 @@
 }
 }
      .commom-consults{
      .commom-consults{
 
 
-       margin: 10px 40px 10px 40px;
+       margin: 10px auto;
 
 
        .common-question{
        .common-question{
          width: 100%;
          width: 100%;
@@ -2099,7 +2106,7 @@
                    padding: 8px 26px;
                    padding: 8px 26px;
                    text-align: center;
                    text-align: center;
                    background-color: #444;
                    background-color: #444;
-                   font-weight: bold;
+                   font-weight: 100;
                }
                }
              }
              }
            }
            }