wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit fc5a2f36eb9139d298d95b18c2c4d774749799b8 2 parents a01e7207 13a37fb1

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

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -469,7 +469,7 @@ class HomeController extends AbstractAction @@ -469,7 +469,7 @@ class HomeController extends AbstractAction
469 $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time; 469 $info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
470 $serviceUrl .= rawurlencode($info); 470 $serviceUrl .= rawurlencode($info);
471 } 471 }
472 - 472 +
473 $this->_view->display('online-service', array( 473 $this->_view->display('online-service', array(
474 'onlineServicePage' => true, 474 'onlineServicePage' => true,
475 'pageFooter' => true, 475 'pageFooter' => true,
@@ -937,7 +937,7 @@ class HomeController extends AbstractAction @@ -937,7 +937,7 @@ class HomeController extends AbstractAction
937 } 937 }
938 938
939 $this->setTitle('订单详情'); 939 $this->setTitle('订单详情');
940 - $this->setNavHeader('订单详情', true, false); 940 + $this->setNavHeader('订单详情', Helpers::url('/home/orders'), false);
941 941
942 $this->_view->display('order-detail', array( 942 $this->_view->display('order-detail', array(
943 'orderDetailPage' => true, 943 'orderDetailPage' => true,