Merge branch 'feature/balanceSwitch' into gray

@@ -977,13 +977,13 @@ class HomeController extends AbstractAction
 
         // 如果新版开启，则跳到新版支付页
         /*if ($this->getCacheBy('zookeeper:/wap/pay/newPay') === 'true') {
-            header('Location: ' . Helpers::url('/home/orders/paynew',
+            $this->go(
+                Helpers::url('/home/orders/paynew',
                 array(
                     'order_code' => $orderCode,
-                    'refer' => $this->server('HTTP_REFERER', SITE_MAIN)
-                )), true, 302
+                    'referrer' => $this->server('HTTP_REFERER', SITE_MAIN)
+                ))
             );
-            exit();
         }*/
 
         /* 判断订单信息是否存在 */

@@ -51,12 +51,12 @@ class IndexController extends AbstractAction
 
         // 如果新版开启，则跳到新版购物车
         if ($this->getCacheBy('zookeeper:/wap/pay/newCart') === 'true') {
-            header('Location: ' . Helpers::url('/cart/index/new',
+            $this->go(
+                Helpers::url('/cart/index/new',
                 array(
-                    'refer' => $this->server('HTTP_REFERER', SITE_MAIN)
-                )), true, 302
+                    'referrer' => $this->server('HTTP_REFERER', SITE_MAIN)
+                ))
             );
-            exit();
         }
 
         $this->setTitle('购物车');