Merge branch 'master' of git.yoho.cn:fe/YOHOBUYWAP

@@ -604,7 +604,7 @@ class UserModel
         // 处理地址数据
         // 处理地址数据
         if (isset($address['data']) && !empty($address['data'])) {
         if (isset($address['data']) && !empty($address['data'])) {
             foreach ($address['data'] as $key => $val) {
             foreach ($address['data'] as $key => $val) {
-                $address['data'][$key]['address_id'] = Encryption::encrypt($val['address_id']);
+                $address['data'][$key]['address_id'] = urlencode(Encryption::encrypt($val['address_id']));
             }
             }
             UdpLog::info('地址数据校验','uid'.$uid.'返回:'.json_encode($address));
             UdpLog::info('地址数据校验','uid'.$uid.'返回:'.json_encode($address));
             $result = $address['data'];
             $result = $address['data'];

@@ -304,6 +304,7 @@ class IndexController extends AbstractAction
 
 
         // 返回地址
         // 返回地址
         $returnUrl = Helpers::url('/cart/index/index');
         $returnUrl = Helpers::url('/cart/index/index');
+//        $returnUrl = 'javascript:history.go(-1);';
         $cartType = $this->get('cartType', 'ordinary');
         $cartType = $this->get('cartType', 'ordinary');
         $cookieData = $this->getCookie('order-info', null);
         $cookieData = $this->getCookie('order-info', null);
         $orderInfo = array();
         $orderInfo = array();