下单流程 增加地址选择

@@ -2,11 +2,12 @@
     width: 100%;
     width: 100%;
     background: #f0f0f0;
     background: #f0f0f0;
 
 
-    .page-wrap:first-child {
-        padding-bottom: pxToRem(10px);
-    }
+    // .page-wrap:first-child {
+    //     padding-bottom: pxToRem(10px);
+    // }
 
 
     .address-item {
     .address-item {
+        display: block;
         padding: pxToRem(20px) pxToRem(30px);
         padding: pxToRem(20px) pxToRem(30px);
         color: #b0b0b0;
         color: #b0b0b0;
         background: #fff;
         background: #fff;

 {{> layout/header}}
 {{> layout/header}}
 <div class="order-ensure-page yoho-page">
 <div class="order-ensure-page yoho-page">
     {{# orderEnsure}}
     {{# orderEnsure}}
-        <a class="address-wrap block">
+        <a class="address-wrap block" href="/shoppingCart/selectAddress">
             <p class="infos">
             <p class="infos">
                 收货地址
                 收货地址
                 <span class="per-info">{{name}} {{phoneNum}}</span>
                 <span class="per-info">{{name}} {{phoneNum}}</span>

+{{> layout/header}}
+<div class="my-address-page select-address-page yoho-page">
+    <div class="page-wrap">
+        {{# address}}
+        <a class="address-item" href="/shoppingCart/orderEnsure?address_id={{address_id}}">
+            <span class="name">{{consignee}}</span>
+            <span class="tel">{{mobile}}</span>
+            <p class="address-info">{{area}} {{address}}</p>
+        </a>
+        {{/ address}}
+    </div>
+</div>
+{{> layout/footer}}

@@ -2,6 +2,7 @@
 
 
 use Action\AbstractAction;
 use Action\AbstractAction;
 use Index\CartModel;
 use Index\CartModel;
+use Index\UserModel;
 use Plugin\Helpers;
 use Plugin\Helpers;
 
 
 /**
 /**
@@ -217,6 +218,22 @@ class ShoppingCartController extends AbstractAction
         $this->_view->display('order-ensure', $data);
         $this->_view->display('order-ensure', $data);
     }
     }
 
 
+    public function selectAddressAction() {
+        // 设置网站标题
+        $this->setTitle('选择地址');
+        $this->setNavHeader('选择地址', Helpers::url('/shoppingCart/orderEnsure'));
+
+        $uid = $this->_uid;
+        $address = UserModel::getAddressData($uid);
+
+        $this->_view->display('select-address', array(
+            'selectAddressPage' => true,
+            'pageFooter' => true,
+            'address' => $address
+        ));
+
+    }
+
     /**
     /**
      * 读取chose-panel内容
      * 读取chose-panel内容
      */
      */