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

@@ -9,6 +9,8 @@ var $userAvatar = $('.user-avatar'),
 var myImage = new Image();
 var myImage = new Image();
 
 
 require('../product/recommend-for-you.js');
 require('../product/recommend-for-you.js');
+require('../product/suspend-cart.js');
+
 myImage.src = $userAvatar.attr('src');
 myImage.src = $userAvatar.attr('src');
 myImage.onerror = function() {
 myImage.onerror = function() {
     $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png');
     $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png');

@@ -28,7 +28,12 @@
         }
         }
 
 
         .username {
         .username {
+            float: left;
             padding: 0 pxToRem(16px);
             padding: 0 pxToRem(16px);
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            max-width: pxToRem(290px);
         }
         }
 
 
         .vip-icon {
         .vip-icon {

@@ -389,3 +389,4 @@ $basicBtnC:#eb0313;
 }
 }
 @import "comments-consults";
 @import "comments-consults";
 @import "product-description";
 @import "product-description";
+

 .good-detail-page{
 .good-detail-page{
         .goods-desc {
         .goods-desc {
         .service {
         .service {
-            width: pxToRem(489px);
+            width: pxToRem(494px);
             height: pxToRem(28px);
             height: pxToRem(28px);
             margin-top: pxToRem(22px);
             margin-top: pxToRem(22px);
+            margin-left: pxToRem(40px);
+            background: image-url('product/service.png') no-repeat;
+            background-size: cover;
         }
         }
         .detail{
         .detail{
             background-color: $tableCellC;
             background-color: $tableCellC;

@@ -102,5 +102,8 @@
         </div>
         </div>
 
 
         {{> product/recommend-for-you}}
         {{> product/recommend-for-you}}
+        {{> product/suspend-cart}}
     </div>
     </div>
+
+{{> layout/download_app}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -210,6 +210,7 @@
 {{#if myIndexPage}}
 {{#if myIndexPage}}
 <script>
 <script>
     seajs.use('js/me/index');
     seajs.use('js/me/index');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if orderPage}}
 {{#if orderPage}}

 {{#goodsDescription}}
 {{#goodsDescription}}
 <div class="goods-desc  page-block">
 <div class="goods-desc  page-block">
-    <img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt="">
+    <div class="service"></div>
     <h1 class="title">
     <h1 class="title">
         {{title}}
         {{title}}
         <span class="en-title">{{enTitle}}</span>
         <span class="en-title">{{enTitle}}</span>

@@ -51,6 +51,7 @@ class HomeController extends AbstractAction
 
 
         $data = array(
         $data = array(
             'myIndexPage' => true,
             'myIndexPage' => true,
+            'showDownloadApp' => true,
             'pageFooter' => true
             'pageFooter' => true
         );
         );
         $uid = $this->getUid();
         $uid = $this->getUid();
@@ -323,7 +324,7 @@ class HomeController extends AbstractAction
 
 
         $this->_view->display('online-service', array(
         $this->_view->display('online-service', array(
             'onlineServicePage' => true,
             'onlineServicePage' => true,
-            // 'pageFooter' => true,
+             'pageFooter' => true,
             'service' => $service
             'service' => $service
         ));
         ));
     }
     }