fe / YOHOBUYWAP · Commits

Go to a project

Authored by biao
Commit 7c358e5618cfff9adb7f9836e27a4c66c1d48951 2 parents 427152a2 4576784a

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

Inline Side-by-side
Showing 3 changed files with 2 additions and 2 deletions
No preview for this file type
@@ -25,7 +25,7 @@ $('.address-item').on('touchend', function() { @@ -25,7 +25,7 @@ $('.address-item').on('touchend', function() {
25 25
26 orderInfo('addressId', addressId); 26 orderInfo('addressId', addressId);
27 orderInfo('address', address); 27 orderInfo('address', address);
28 -}).on('touchend', '.edit', function() { 28 +}).on('touchstart', '.edit', function() {
29 window.location.href = $(this).data('href'); 29 window.location.href = $(this).data('href');
30 return false; 30 return false;
31 }).on('touchstart', '.del', function() { 31 }).on('touchstart', '.del', function() {
@@ -913,7 +913,7 @@ class HomeController extends AbstractAction @@ -913,7 +913,7 @@ class HomeController extends AbstractAction
913 } 913 }
914 914
915 $this->setTitle('订单详情'); 915 $this->setTitle('订单详情');
916 - $this->setNavHeader('订单详情', true, false); 916 + $this->setNavHeader('订单详情', Helpers::url('/home/orders'), false);
917 917
918 $this->_view->display('order-detail', array( 918 $this->_view->display('order-detail', array(
919 'orderDetailPage' => true, 919 'orderDetailPage' => true,