Merge branch 'develop/wap' into beta/wap

@@ -283,8 +283,8 @@ class IndexController extends AbstractAction
         // 审判跳转登录页
         // 审判跳转登录页
         $this->auditJumpLogin();
         $this->auditJumpLogin();
 
 
-        $this->setTitle('确认订单');
-        $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
+        // 返回地址
+        $returnUrl = Helpers::url('/cart/index/index');
 
 
         $cartType = $this->get('cartType', '');
         $cartType = $this->get('cartType', '');
         $cookieData = $this->getCookie('order-info', null);
         $cookieData = $this->getCookie('order-info', null);
@@ -299,6 +299,9 @@ class IndexController extends AbstractAction
         $sku = $this->get('sku', '');
         $sku = $this->get('sku', '');
         $skn = $this->get('skn', '');
         $skn = $this->get('skn', '');
         $buyNumber = $this->get('buy_number', 1);
         $buyNumber = $this->get('buy_number', 1);
+        if ($limitProductCode) {
+            $returnUrl = $this->server('HTTP_REFERER', $returnUrl);
+        }
 
 
         // 购物车商品为空跳转到购物车页面
         // 购物车商品为空跳转到购物车页面
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
@@ -320,6 +323,9 @@ class IndexController extends AbstractAction
             'orderEnsure' => $order
             'orderEnsure' => $order
         );
         );
 
 
+        $this->setTitle('确认订单');
+        $this->setNavHeader('确认订单', $returnUrl, false); // 不显示右上角home按钮
+
         $this->_view->display('order-ensure', $data);
         $this->_view->display('order-ensure', $data);
     }
     }