Authored by 郝肖肖

Merge branch 'feature/balanceSwitch' into gray

@@ -977,13 +977,13 @@ class HomeController extends AbstractAction @@ -977,13 +977,13 @@ class HomeController extends AbstractAction
977 977
978 // 如果新版开启,则跳到新版支付页 978 // 如果新版开启,则跳到新版支付页
979 /*if ($this->getCacheBy('zookeeper:/wap/pay/newPay') === 'true') { 979 /*if ($this->getCacheBy('zookeeper:/wap/pay/newPay') === 'true') {
980 - header('Location: ' . Helpers::url('/home/orders/paynew', 980 + $this->go(
  981 + Helpers::url('/home/orders/paynew',
981 array( 982 array(
982 'order_code' => $orderCode, 983 'order_code' => $orderCode,
983 - 'refer' => $this->server('HTTP_REFERER', SITE_MAIN)  
984 - )), true, 302 984 + 'referrer' => $this->server('HTTP_REFERER', SITE_MAIN)
  985 + ))
985 ); 986 );
986 - exit();  
987 }*/ 987 }*/
988 988
989 /* 判断订单信息是否存在 */ 989 /* 判断订单信息是否存在 */
@@ -51,12 +51,12 @@ class IndexController extends AbstractAction @@ -51,12 +51,12 @@ class IndexController extends AbstractAction
51 51
52 // 如果新版开启,则跳到新版购物车 52 // 如果新版开启,则跳到新版购物车
53 if ($this->getCacheBy('zookeeper:/wap/pay/newCart') === 'true') { 53 if ($this->getCacheBy('zookeeper:/wap/pay/newCart') === 'true') {
54 - header('Location: ' . Helpers::url('/cart/index/new', 54 + $this->go(
  55 + Helpers::url('/cart/index/new',
55 array( 56 array(
56 - 'refer' => $this->server('HTTP_REFERER', SITE_MAIN)  
57 - )), true, 302 57 + 'referrer' => $this->server('HTTP_REFERER', SITE_MAIN)
  58 + ))
58 ); 59 );
59 - exit();  
60 } 60 }
61 61
62 $this->setTitle('购物车'); 62 $this->setTitle('购物车');