Authored by whb

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

... ... @@ -469,7 +469,7 @@ class HomeController extends AbstractAction
$info = 'userId=' . $uid . '&name=' . $this->_uname . '&memo=&hashCode=' . md5( strtoupper( rawurlencode($uid . $this->_uname . $time . '1231') ) ) . '&timestamp=' . $time;
$serviceUrl .= rawurlencode($info);
}
$this->_view->display('online-service', array(
'onlineServicePage' => true,
'pageFooter' => true,
... ... @@ -937,7 +937,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,
... ...