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

@@ -67,11 +67,12 @@ function show(html, cb) {
             document.documentElement.scrollLeft || document.body.scrollLeft,
             document.documentElement.scrollLeft || document.body.scrollLeft,
             document.documentElement.scrollTop || document.body.scrollTop
             document.documentElement.scrollTop || document.body.scrollTop
         ],
         ],
-        $html = $('html'); // it would make more sense to apply this to body, but IE7 won't have that
+        $html = $('html, body'); // it would make more sense to apply this to body, but IE7 won't have that
 
 
     $html.data('scroll-position', scrollPosition);
     $html.data('scroll-position', scrollPosition);
     $html.data('previous-overflow', $html.css('overflow'));
     $html.data('previous-overflow', $html.css('overflow'));
     $html.css('overflow', 'hidden');
     $html.css('overflow', 'hidden');
+    $html.css('height', '100%');
     window.scrollTo(scrollPosition[0], scrollPosition[1]);
     window.scrollTo(scrollPosition[0], scrollPosition[1]);
 
 
     if (html) {
     if (html) {
@@ -89,11 +90,12 @@ function show(html, cb) {
 
 
 //隐藏当前Panel
 //隐藏当前Panel
 function hide() {
 function hide() {
-    var $html = $('html'),
+    var $html = $('html, body'),
         scrollPosition = $html.data('scroll-position');
         scrollPosition = $html.data('scroll-position');
 
 
     // un-lock scroll position
     // un-lock scroll position
     $html.css('overflow', $html.data('previous-overflow'));
     $html.css('overflow', $html.data('previous-overflow'));
+    $html.css('height', 'auto');
     window.scrollTo(scrollPosition[0], scrollPosition[1]);
     window.scrollTo(scrollPosition[0], scrollPosition[1]);
     $('.chose-panel').hide();
     $('.chose-panel').hide();
 }
 }

@@ -19,7 +19,7 @@ var $selectAllBtn = $('.balance .checkbox'),
 ellipsis.init();
 ellipsis.init();
 
 
 lazyLoad({
 lazyLoad({
-    try_again_css: 'good-failure'
+    try_again_css: 'order-failure'
 });
 });
 
 
 setTimeout(function() {
 setTimeout(function() {

@@ -28,12 +28,16 @@
     }
     }
 
 
     .few-tag {
     .few-tag {
-        width: 148rem / $pxConvertRem;
+        width: 150rem / $pxConvertRem;
         position: absolute;
         position: absolute;
-        left: 92rem / $pxConvertRem;
         text-align: center;
         text-align: center;
-        top: 75%;
+        top: 72%;
         color: #fff;
         color: #fff;
+
+        span {
+            display: inline-block;
+            @include transform(scale(0.833));
+        }
     }
     }
 
 
     .gift-tag {
     .gift-tag {
@@ -71,8 +75,7 @@
 
 
     .thumb {
     .thumb {
         float: left;
         float: left;
-        width: 180rem / $pxConvertRem;
-        height: 200rem / $pxConvertRem;
+        width: 150rem / $pxConvertRem;
         background-size: 100%;
         background-size: 100%;
         background-repeat: no-repeat;
         background-repeat: no-repeat;
     }
     }
@@ -80,7 +83,7 @@
     .deps {
     .deps {
         position: relative;
         position: relative;
         width: 380rem / $pxConvertRem;
         width: 380rem / $pxConvertRem;
-        margin-left: 4.7rem;
+        margin-left: 180rem / $pxConvertRem;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
         padding: 0.5rem 0;
         padding: 0.5rem 0;
     }
     }

@@ -13,10 +13,10 @@
             <img class="thumb lazy" data-original="{{thumb}}">
             <img class="thumb lazy" data-original="{{thumb}}">
         </a>
         </a>
         {{#if isAdvanceBuy}}
         {{#if isAdvanceBuy}}
-            <p class="few-tag plus-tag">加价购</p>
+            <p class="few-tag plus-tag"><span>加价购</span></p>
         {{/if}}
         {{/if}}
         {{#if isGift}}
         {{#if isGift}}
-            <p class="few-tag gift-tag">赠品</p>
+            <p class="few-tag gift-tag"><span>赠品</span></p>
         {{/if}}
         {{/if}}
 
 
         <div class="deps show">
         <div class="deps show">