Merge branch 'hotfix/crt-adrs-url-encd' into release/5.1

@@ -480,6 +480,7 @@ class HomeController extends AbstractAction
             $this->setTitle('编辑地址');
             $this->setTitle('编辑地址');
             $this->setNavHeader('编辑地址', true, false);
             $this->setNavHeader('编辑地址', true, false);
 
 
+            $id = urlencode($id);
             $data['id'] = $id;
             $data['id'] = $id;
             // 获取特定地址的数据
             // 获取特定地址的数据
             $data['address'] = UserModel::getAddressDataById($uid, $id);
             $data['address'] = UserModel::getAddressDataById($uid, $id);
@@ -508,6 +509,7 @@ class HomeController extends AbstractAction
             $email = $this->post('email', '');
             $email = $this->post('email', '');
             $id = $this->post('id', null);
             $id = $this->post('id', null);
             if ($id) {
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
                 $id = Encryption::decrypt($id);
             }
             }
             $mobile = $this->post('mobile', '');
             $mobile = $this->post('mobile', '');
@@ -535,6 +537,7 @@ class HomeController extends AbstractAction
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $id = $this->post('id', '');
             $id = $this->post('id', '');
             if ($id) {
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
                 $id = Encryption::decrypt($id);
             }
             }
             $result = UserModel::setDefaultAddress($uid, $id);
             $result = UserModel::setDefaultAddress($uid, $id);
@@ -559,6 +562,7 @@ class HomeController extends AbstractAction
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $id = $this->post('id', '');
             $id = $this->post('id', '');
             if ($id) {
             if ($id) {
+                $id = urldecode($id);
                 $id = Encryption::decrypt($id);
                 $id = Encryption::decrypt($id);
             }
             }
             $result = UserModel::deleteAddress($uid, $id);
             $result = UserModel::deleteAddress($uid, $id);

@@ -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'];

@@ -303,7 +303,8 @@ class IndexController extends AbstractAction
         $this->auditJumpLogin();
         $this->auditJumpLogin();
 
 
         // 返回地址
         // 返回地址
-        $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();