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

@@ -88,7 +88,7 @@
     }
 
     .cost {
-        margin-bottom: 100rem / $pxConvertRem; /*排除被固定底部遮挡的影响*/
+        // margin-bottom: 100rem / $pxConvertRem; /*排除被固定底部遮挡的影响*/
 
         li {
             font-size: 28rem / $pxConvertRem;
@@ -104,10 +104,11 @@
     }
 
     .opt {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
+        // 测试反馈 底部不需要固定
+        // position: fixed;
+        // bottom: 0;
+        // left: 0;
+        // right: 0;
         text-align: right;
         border-top: 1px solid #e0e0e0;
     }
@@ -130,4 +131,4 @@
         background: #d0021b;
         margin-left: 10rem / $pxConvertRem;
     }
-}
\ No newline at end of file
+}

@@ -29,7 +29,7 @@
                     <a class="logistics sub" href="{{logisticsUrl}}">
                         <span class="iconfont">&#xe630;</span>
                         <p class="beside-icon sub-content">
-                            <span class="sub-title">物流信息</span>                        
+                            <span class="sub-title">物流信息</span>
                             <span>物流公司：{{logisticsCompany}}</span>
                             <span>快递单号：{{logisticsNum}}</span>
                         </p>
@@ -88,7 +88,7 @@
                     {{/if}}
                 {{/if}}
 
-                {{#if unreceived}}
+                {{#if logisticsUrl}}
                     <a href="{{logisticsUrl}}">
                         <span class="btn btn-check-logistics">查看物流</span>
                     </a>
@@ -97,4 +97,4 @@
         </div>
     {{/ orderDetail}}
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

@@ -846,7 +846,7 @@ class HomeController extends AbstractAction
         if (empty($orderDetail)) {
             $this->error();
         }
-        
+
         $this->setTitle('订单详情');
         $this->setNavHeader('订单详情');