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

@@ -7,7 +7,7 @@
     left: 0;
     left: 0;
     right: 100rem / $pxConvertRem;
     right: 100rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
-    z-index: 1;
+    z-index: 4;
     overflow: hidden;
     overflow: hidden;
     @include transition(all .3s);
     @include transition(all .3s);
 
 

@@ -324,6 +324,12 @@ class CartModel
 
 
         $pay = CartData::cartPay($uid, $cartType);
         $pay = CartData::cartPay($uid, $cartType);
 
 
+        // 商品为空返回
+        if (!$pay || (isset($pay['data']['goods_list']) && empty($pay['data']['goods_list']))) {
+            $result['cartUrl'] = Helpers::url('/cart/index/index');
+            return $result;
+        }
+
         if ($pay && isset($pay['code']) && $pay['code'] === 200) {
         if ($pay && isset($pay['code']) && $pay['code'] === 200) {
             $payReturn = $pay['data'];
             $payReturn = $pay['data'];
             $address = array();
             $address = array();

@@ -283,22 +283,17 @@ class IndexController extends AbstractAction
             $orderInfo = json_decode($cookieData, true);
             $orderInfo = json_decode($cookieData, true);
             $cartType = $orderInfo['cartType'];
             $cartType = $orderInfo['cartType'];
         }
         }
-        $cartKey = 'commonCart';
-        if ($cartType === 'advance') {
-            $cartKey = 'preSellCart';
-        }
 
 
-        $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
-        $cartGoods = CartModel::getCartData($uid, $shoppingKey);
-        if (isset($cartGoods['isEmptyCart']) || empty($cartGoods[$cartKey])) {
-            $this->go(Helpers::url('/cart/index/index'));
+        $order = CartModel::cartPay($uid, $cartType, $orderInfo);
+        if (isset($order['cartUrl'])) {
+            $this->go($order['cartUrl']);
         }
         }
 
 
         $data = array(
         $data = array(
             'orderEnsurePage' => true,
             'orderEnsurePage' => true,
             'isOrdinaryCart' => ($cartType !== 'advance'),
             'isOrdinaryCart' => ($cartType !== 'advance'),
-            'orderEnsure' => CartModel::cartPay($uid, $cartType, $orderInfo)
+            'orderEnsure' => $order
         );
         );
 
 
         $this->_view->display('order-ensure', $data);
         $this->_view->display('order-ensure', $data);