Merge branch 'develop' of 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 {

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

@@ -125,11 +125,11 @@
         {{#if numInCart}}
         {{#if numInCart}}
         <span class="num-tag">{{numInCart}}</span>
         <span class="num-tag">{{numInCart}}</span>
         {{/if}}
         {{/if}}
-        <a href="" class="num-incart iconfont">&#xe62c;</a>
+        <a href="/shoppingCart" class="num-incart iconfont">&#xe62c;</a>
         {{#if goodsInstore}}
         {{#if goodsInstore}}
-        <a href="" class="addto-cart ">加入购物车</a>
+        <a href="/shoppingCart" class="addto-cart ">加入购物车</a>
         {{else}}
         {{else}}
-        <a href="" class="sold-out">已售罄</a>
+        <a href="javascript:;" class="sold-out">已售罄</a>
         {{/if}}
         {{/if}}
 
 
         <a href="#" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a>  
         <a href="#" id="likeBtn" class="favorite iconfont {{#isCollect}}liked{{/isCollect}}">&#xe605;</a>  

@@ -216,6 +216,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}}

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