order detail

app/index/controller/User.php

@@ -2,6 +2,7 @@
 
 namespace app\index\controller;
 
+use app\index\model\OrderAddress;
 use app\index\model\user\PointsLog as PointsLogModel;
 use app\index\model\Goods as GoodsModel;
 use app\index\model\Order as OrderModel;
@@ -58,7 +59,9 @@ class User extends Controller
             return view('passport/logIn');
         }
         $model = OrderModel::getUserOrderDetail($orderId);
-        return view('orderDetails', ['order' => $model]);
+        $orderAddress = OrderAddress::get(['order_id' => $orderId]);
+
+        return view('orderDetails', ['order' => $model, 'orderAddress' => $orderAddress]);
     }
 
     /**
@@ -73,7 +76,7 @@ class User extends Controller
         }
         $model = new PointsLogModel;
         $list = $model->getList();
-        $user =  \app\index\service\User::getCurrentLoginUser();
+        $user = \app\index\service\User::getCurrentLoginUser();
         return view('integral', ['user' => $user]);
     }
 

app/index/service/order/Checkout.php

@@ -853,6 +853,7 @@ class Checkout extends BaseService
             'store_id' => $this->storeId,
             'name' => $address['name'],
             'last_name' => $address['last_name'],
+            'zip_code' => $address['zip_code'],
             'phone' => $address['phone'],
             'province_id' => $address['province_id'],
             'city_id' => $address['city_id'],

app/index/view/user/orderDetails.html

@@ -293,7 +293,7 @@
                             <div class="cusInfoBox openBox">
                                 <div class="cusItem">
                                     <p class="cusKey">Name</p>
-                                    <p class="cusValue">{$order['address']['name']}</p>
+                                    <p class="cusValue">{$order['address']['name']} {$order['address']['last_name']}</p>
                                 </div>
                                 <!--                                    <div class="cusItem">
                                                                         <p class="cusKey">电子邮件地址</p>
@@ -316,11 +316,11 @@
                             <div class="addressInfo openBox">
                                 <div class="addInfoItem">
                                     <p class="aiKey">First Name</p>
-                                    <p class="aiValue">Morrie</p>
+                                    <p class="aiValue">{$orderAddress['name']}</p>
                                 </div>
                                 <div class="addInfoItem">
                                     <p class="aiKey">Last Name</p>
-                                    <p class="aiValue">Green</p>
+                                    <p class="aiValue">{$orderAddress['last_name']}</p>
                                 </div>
                                 <!--                                    <div class="addInfoItem">-->
                                 <!--                                        <p class="aiKey">公司</p>-->
@@ -328,19 +328,19 @@
                                 <!--                                    </div>-->
                                 <div class="addInfoItem">
                                     <p class="aiKey">Phone Number</p>
-                                    <p class="aiValue">0571-123456789</p>
+                                    <p class="aiValue">{$orderAddress['phone']}</p>
                                 </div>
                                 <div class="addInfoItem">
-                                    <p class="aiKey">Address</p>
-                                    <p class="aiValue">XXXXXXXXXX</p>
+                                    <p class="aiKey">Street</p>
+                                    <p class="aiValue">{$orderAddress['detail']}</p>
                                 </div>
+<!--                                <div class="addInfoItem">-->
+<!--                                    <p class="aiKey">公寓，别至</p>-->
+<!--                                    <p class="aiValue">XXXXXXXXXX</p>-->
+<!--                                </div>-->
                                 <div class="addInfoItem">
-                                    <p class="aiKey">公寓，别至</p>
-                                    <p class="aiValue">XXXXXXXXXX</p>
-                                </div>
-                                <div class="addInfoItem">
-                                    <p class="aiKey">市</p>
-                                    <p class="aiValue">XXXXXXXXXX</p>
+                                    <p class="aiKey">State</p>
+                                    <p class="aiValue">{$orderAddress['region']['region']}</p>
                                 </div>
                                 <div class="addInfoItem">
                                     <p class="aiKey">Country</p>
@@ -352,7 +352,7 @@
                                 <!--                                    </div>-->
                                 <div class="addInfoItem">
                                     <p class="aiKey">Zip Code</p>
-                                    <p class="aiValue">56789</p>
+                                    <p class="aiValue">{$orderAddress['zip_code']}</p>
                                 </div>
                             </div>
                         </div>