Authored by ccbikai

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

@@ -389,3 +389,4 @@ $basicBtnC:#eb0313; @@ -389,3 +389,4 @@ $basicBtnC:#eb0313;
389 } 389 }
390 @import "comments-consults"; 390 @import "comments-consults";
391 @import "product-description"; 391 @import "product-description";
  392 +
1 .good-detail-page{ 1 .good-detail-page{
2 .goods-desc { 2 .goods-desc {
3 .service { 3 .service {
4 - width: pxToRem(489px); 4 + width: pxToRem(494px);
5 height: pxToRem(28px); 5 height: pxToRem(28px);
6 margin-top: pxToRem(22px); 6 margin-top: pxToRem(22px);
  7 + margin-left: pxToRem(40px);
  8 + background: image-url('product/service.png') no-repeat;
  9 + background-size: cover;
7 } 10 }
8 .detail{ 11 .detail{
9 background-color: $tableCellC; 12 background-color: $tableCellC;
1 {{#goodsDescription}} 1 {{#goodsDescription}}
2 <div class="goods-desc page-block"> 2 <div class="goods-desc page-block">
3 - <img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt=""> 3 + <div class="service"></div>
4 <h1 class="title"> 4 <h1 class="title">
5 {{title}} 5 {{title}}
6 <span class="en-title">{{enTitle}}</span> 6 <span class="en-title">{{enTitle}}</span>
@@ -323,7 +323,7 @@ class HomeController extends AbstractAction @@ -323,7 +323,7 @@ class HomeController extends AbstractAction
323 323
324 $this->_view->display('online-service', array( 324 $this->_view->display('online-service', array(
325 'onlineServicePage' => true, 325 'onlineServicePage' => true,
326 - // 'pageFooter' => true, 326 + 'pageFooter' => true,
327 'service' => $service 327 'service' => $service
328 )); 328 ));
329 } 329 }