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

@@ -76,10 +76,11 @@ class LoginData
         $param['openId'] = $openId;
         $param['source_type'] = $sourceType;
         $param['nickname'] = $nickname;
-        $param['client_secret'] = Sign::getSign($param);
         if (!empty($shoppingKey)) {
             $param['shopping_key'] = $shoppingKey;
         }
+        
+        $param['client_secret'] = Sign::getSign($param);
 
         return Yohobuy::get(Yohobuy::API_URL, $param);
     }

@@ -4,6 +4,12 @@
             border-bottom: 1px solid $borderC;
             padding: 0 pxToRem(28px);
             .user-name {
+                display: inline-block;
+                float: left;
+                max-width: 9rem;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
                 font-size: pxToRem(24px);
                 line-height: pxToRem(62px);
                 color: $mainFontC;

@@ -684,7 +684,7 @@ class CartModel
                 // 缩略图
                 foreach ($val['images_list'] as $image) {
                     $thumbImageList[] = array(
-                        'img' => Helpers::getImageUrl($image['image_url'], 80, 106)
+                        'img' => Helpers::getImageUrl($image['image_url'], 60, 60)
                     );
                 }
 

@@ -276,10 +276,10 @@ class IndexController extends AbstractAction
         $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
 
         // 购物车商品为空跳转到购物车页面
-        $cartType = $this->get('cartType', 'ordinary');
+        $cartType = $this->get('cartType', '');
         $cookieData = $this->getCookie('order-info', null);
         $orderInfo = array();
-        if (!empty($cookieData)) {
+        if (empty($cartType) && !empty($cookieData)) {
             $orderInfo = json_decode($cookieData, true);
             $cartType = $orderInfo['cartType'];
         }