Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -17,6 +17,19 @@ function showOrNot() {
     }
     }
 }
 }
 
 
+function reposReturnTop() {
+    var $top = $returnTop.parent();
+
+    if (!$top.hasClass('service-top')) {
+        $top = $returnTop;
+    }
+    if ($(window).width() < 1380) {
+        $top.addClass('for-min');
+    } else {
+        $top.removeClass('for-min');
+    }
+}
+
 $returnTop.click(function() {
 $returnTop.click(function() {
     $('html,body').animate({
     $('html,body').animate({
         scrollTop: 0
         scrollTop: 0
@@ -36,4 +49,10 @@ if ($returnTop.hasClass('hide')) {
     $('img').load(showOrNot);
     $('img').load(showOrNot);
 }
 }
 
 
+reposReturnTop();
+
+if ($returnTop.length) {
+    $(window).resize(reposReturnTop);
+}
+
 exports.returnTopShowOrNot = showOrNot;
 exports.returnTopShowOrNot = showOrNot;

@@ -42,8 +42,10 @@
             color: #fff;
             color: #fff;
         }
         }
 
 
-        &.min {
-            margin-left: 505px;
+        &.for-min {
+            right: 20px;
+            left: auto;
+            margin-left: auto;
         }
         }
     }
     }
 }
 }