Authored by biao

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

... ... @@ -306,13 +306,10 @@ class IndexController extends AbstractAction
if (isset($order['cartUrl'])) { // 普通或者预售商品为空时
$this->go($order['cartUrl']);
}
if (isset($order['error'])) { // 限购商品支付接口返回为空或错误时
if ($this->isAjax()) {
$this->echoJson($order);
return;
} else {
$this->error();
}
if ($this->isAjax()) { // 限购商品支付接口返回为空或错误时(异步请求)
$this->echoJson($order);
return;
}
$data = array(
... ...