Authored by biao

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

No preview for this file type
... ... @@ -25,7 +25,7 @@ $('.address-item').on('touchend', function() {
orderInfo('addressId', addressId);
orderInfo('address', address);
}).on('touchend', '.edit', function() {
}).on('touchstart', '.edit', function() {
window.location.href = $(this).data('href');
return false;
}).on('touchstart', '.del', function() {
... ...
... ... @@ -875,7 +875,7 @@ class HomeController extends AbstractAction
$jsApiParameters = $tools->GetJsApiParameters($order);
$this->echoJson(array('code' => 200, 'data' => array('jsApiParameters' => json_decode($jsApiParameters) )) );
} while (false);
}
... ... @@ -913,7 +913,7 @@ class HomeController extends AbstractAction
}
$this->setTitle('订单详情');
$this->setNavHeader('订单详情', true, false);
$this->setNavHeader('订单详情', Helpers::url('/home/orders'), false);
$this->_view->display('order-detail', array(
'orderDetailPage' => true,
... ...