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

@@ -6,7 +6,7 @@
             <span class="iconfont show-package">&#xe643;</span>
             <div class="package-list hide">
                 <div class="package-up-icon"></div>
-                {{#each packageList}}
+                {{#each ../packageList}}
                     <div class="package-item">
                         <p class="package-title bold">包裹{{math @index '+' 1}}:{{#if @first}}总仓发货{{^}}异地调拨{{/if}}</p>
                         <ul class="package-goods clearfix">

 <div class="returns-wrap user-order change">
+    <a href="/help?id=43" target="_blank">
+        <span class="btn white change-tips">换货须知</span>
+    </a>
     {{#returnsChange}}
     {{> common/subtitle}}
     <div class="order" data-code="{{orderCode}}">

@@ -23,7 +23,7 @@
                         </a>
                     {{/ brandIntro}}
 
-                    <span id="brand-fav" class="brand-fav{{#if brandFav}} cur{{/if}}" data-id={{brandId}}>
+                    <span id="brand-fav" class="brand-fav{{#if brandFav}} coll{{/if}}" data-id={{brandId}}>
                         <i class="iconfont">&#xe627;</i>
                     </span>
                 </p>

@@ -2,6 +2,9 @@ var cancelOrder = require('./order/cancel-order');
 var editOrder = require('./order/edit-order');
 var countDown = require('./order/countdown');
 
+var lazyLoad = require('yoho-jquery-lazyload');
+
+lazyLoad($('img.lazy'));
 
 function reload() {
     location.reload();

@@ -20,7 +20,7 @@
         height: 7px;
         background: url(/shopping/package-up.png);
         top: -7px;
-        left: 282px;
+        left: 392px;
 
         + .package-item .package-title {
             border-top: none;

@@ -13,6 +13,8 @@
     }
 
     &.change {
+        position: relative;
+
         .sub-column {
             margin-top: 30px;
 
@@ -21,6 +23,14 @@
             }
         }
 
+        .change-tips {
+            position: absolute;
+            top: 0;
+            right: 0;
+            border-color: #f1f1f1;
+            color: #1b1b1b;
+        }
+
         .btn {
             &.confirm {
                 width: 130px;