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

@@ -29,6 +29,7 @@ var $chosePanel = $('#chose-panel'),
     cbFn,
     $allChoseItems,
     queryString,
+    $soonSoldOut = $('.soonSoldOut-tag'),
     $yohoPage = $('.yoho-page');
 
 //初始化购物车面板显示
@@ -210,7 +211,12 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
 
             //如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式
             if (curGoodNum > 0) {
+                if ($soonSoldOut.length > 0) {
+                    $allChoseItems.find('.num .left-num').html('即将售罄');
+                } else {
                     $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件');
+                }
+
                 $leftNum.val(curGoodNum);
             } else {
                 $allChoseItems.find('.num .left-num').html('');
@@ -263,7 +269,11 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
 
         // 如果当前有尺码被选中，且数量等于0, 否则显示剩余件数
         if (curGoodNum > 0 && hasChooseColor) {
+            if ($soonSoldOut.length > 0) {
+                $allChoseItems.find('.num .left-num').html('即将售罄');
+            } else {
                 $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件');
+            }
             $('#left-num').val(curGoodNum);
         } else {
             $allChoseItems.find('.num .left-num').html('');

-<div class="slide-container">
+<div class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">
     <div class="slide-wrapper"> 
         <ul>
             {{# list}}
-            <li>
+            <li style="backgroundColor:{{bgColor}}">
                 <a href="{{href}}" target= "_blank">
                     <img class="lazy" data-original="{{img}}" alt="">
                 </a>
@@ -38,3 +38,4 @@
     </div>
     {{/if}}
 </div>
+<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
\ No newline at end of file

@@ -6,12 +6,29 @@
     // overflow: hidden;
     /*大banner*/
 	.slide-container {
-        position: relative;
+        position: absolute;
+        left: 0;
+        right: 0;
+        height: 387px;
+
+        &.slide-thumb-container {
+            height: 440px;
+        }
+
 		img {
 			display: block;
 		}
 	}
 
+    .slide-container-placeholder {
+        height: 387px;
+        width: 100%;
+
+        &.slide-thumb-container-placeholder {
+            height: 440px;
+        }
+    }
+    
     /*大banner大图*/
 	.slide-wrapper { 
 		position: relative;
@@ -37,6 +54,13 @@
 			width: 100%;
 			height: 100%;
 
+            a {
+                display: block;
+                height: 100%;
+                width: 990px;
+                margin: 0 auto;
+            }
+
 			&:first-child {
 				display: block;
 			}
@@ -50,7 +74,7 @@
     
     /*大图上的左右切换按钮*/
     .slide-switch {
-        display: none;
+        display: block;
         /* @include opacity(0);
         @include transition-property(opacity);
         @include transition-duration(.2s);
@@ -68,11 +92,13 @@
             @include opacity(0.55);
 
             &.prev {
-                left: 0;
+                left: 50%;
+                margin-left: -495px;
             }
 
             &.next {
-                right: 0;
+                right: 50%;
+                margin-right: -495px;
             }
 
             &:hover{
@@ -88,7 +114,8 @@
     
     /*大banner缩略图*/
     .thumb-pagination {
-        margin: 7px 0 0;
+        width: 990px;
+        margin: 7px auto 0;
 
         li {
             position: relative;
@@ -223,6 +250,17 @@
                 height: 100%;
             }
 
+            .slide-switch {
+                a.prev {
+                    left: 0;
+                    margin-left: 0;
+                }
+                a.next {
+                    right: 0;
+                    margin-right: 0;
+                }
+            }
+
             img {
                 max-width: 100%;
                 max-height: 100%;

@@ -3,12 +3,50 @@
 .home-page {
     width: 1150px;
     
+    .slide-container{
+        height: 450px;
+
+        &.slide-thumb-container {
+            height: 510px;
+        }
+    }
+    
+
     .slide-wrapper {
         height: 450px;
+
+        li {
+            a {
+                width: 1150px;
+            }
+        }
+    }
+
+    .slide-container-placeholder {
+        height: 450px;
+
+        &.slide-thumb-container-placeholder {
+            height: 510px;
+        }
+    }
+
+
+    
+    .slide-switch {
+        a {
+            &.prev {
+                margin-left: -575px;
+            }
+
+            &.next {
+                margin-right: -575px;
+            }
+        }
     }
     
     .thumb-pagination {
-        margin: 6px 0 0;
+        width: 1148px;
+        margin: 6px auto 0;
         padding: 0 0 0 2px;
 
         li {