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

 {{# classicBrands}}
 {{# classicBrands}}
     <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
     <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
-        <a href="{{url}}">
+        <a href="{{url}}" target="_blank">
         {{# big}}
         {{# big}}
             <img class="big-img lazy-img" data-original="{{image src 565 340}}" alt="big-img">
             <img class="big-img lazy-img" data-original="{{image src 565 340}}" alt="big-img">
         {{/ big}}
         {{/ big}}

@@ -43,6 +43,7 @@ const btnMap = {
             classStr: 'btn white cancel-btn mr'
             classStr: 'btn white cancel-btn mr'
         },
         },
         {
         {
+            isEditBtn: true,
             name: '修改订单',
             name: '修改订单',
             classStr: 'btn white edit-btn'
             classStr: 'btn white edit-btn'
         }
         }
@@ -518,6 +519,12 @@ const getOrderDetail = (uid, code) => {
                 }
                 }
             });
             });
 
 
+            if (detail.canUpdateDeliveryAddress === 'N') {
+                _.remove(detail.btns, btn => {
+                    return btn.isEditBtn;
+                });
+            }
+
             if (parseInt(detail.paymentType, 10) === 2 &&
             if (parseInt(detail.paymentType, 10) === 2 &&
                 (statusMap[st].valueStr === '备货中' ||
                 (statusMap[st].valueStr === '备货中' ||
                  detail.statusStr === '备货中')) {
                  detail.statusStr === '备货中')) {

@@ -85,7 +85,7 @@ const callback = (req, res) => {
                     cost: data.pay,
                     cost: data.pay,
                     orderNum: data.orderCode,
                     orderNum: data.orderCode,
                     onlineCost: data.pay,
                     onlineCost: data.pay,
-                    orderHref: helpers.urlFormat('/me/order/detail', {code: data.orderCode}),
+                    orderHref: helpers.urlFormat('/me/order/detail', {orderCode: data.orderCode}),
                     walkHref: helpers.urlFormat('/')
                     walkHref: helpers.urlFormat('/')
                 }
                 }
             });
             });

@@ -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;

@@ -11,8 +11,15 @@
     position: relative;
     position: relative;
 
 
     h4 {
     h4 {
+        height: 18px;
+        line-height: 18px;
+        padding-right: 10px;
+        display: -webkit-box;
         font-size: 16px;
         font-size: 16px;
         font-weight: bold;
         font-weight: bold;
+        overflow: hidden;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
     }
     }
 
 
     p {
     p {

@@ -53,7 +53,7 @@
 
 
             img {
             img {
                 width: 1150px;
                 width: 1150px;
-                height: auto;
+                height: $sliderHeight;
             }
             }
         }
         }
     }
     }

@@ -79,10 +79,9 @@
                 border: 1px solid #404040;
                 border: 1px solid #404040;
                 border-left: none;
                 border-left: none;
 
 
-                * {
+                p,
+                h4 {
                     display: block;
                     display: block;
-                }
-                p {
                     display: -webkit-box;
                     display: -webkit-box;
                 }
                 }
             }
             }

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