选择地址 返回

@@ -2,7 +2,7 @@
 <div class="my-address-page select-address-page yoho-page">
     <div class="page-wrap clearfix">
         {{# address}}
-        <div class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" data-href="/cart/index/orderEnsure">
+        <div class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" data-href="{{../moreUrl}}">
             <span class="name">{{consignee}}</span>
             <span class="tel">{{mobile}}</span>
             <p class="address-info">{{area}} {{address}}</p>

@@ -568,10 +568,15 @@ class IndexController extends AbstractAction
         $uid = $this->getUid(true);
         $address = UserModel::getAddressData($uid);
 
+        $moreUrl = $this->server('HTTP_REFERER', '/cart/index/orderEnsure');//取跳过来的url
+        $moreUrl = strrpos($moreUrl, $this->server('REQUEST_URI', '')) !== false ||
+            strrpos($moreUrl, '/home/addressAct') !== false ? '/cart/index/orderEnsure' : $moreUrl;
+
         $this->_view->display('select-address', array(
             'selectAddressPage' => true,
             'pageFooter' => true,
-            'address' => $address
+            'address' => $address,
+            'moreUrl' => $moreUrl
         ));
     }