From 7f31190de98690eb55aef21f0bd80a705f6b8b81 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 18 Aug 2023 17:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/OrderRepo.php       | 3 +++
 themes/default/account/order.blade.php | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php
index 0f8d4961..96a17d64 100644
--- a/beike/Repositories/OrderRepo.php
+++ b/beike/Repositories/OrderRepo.php
@@ -121,6 +121,9 @@ class OrderRepo
             $builder->where('status', $status);
         }
 
+        $builder->with(['orderShipments']);
+
+
         return $builder;
     }
 
diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php
index 7982e96e..68447308 100644
--- a/themes/default/account/order.blade.php
+++ b/themes/default/account/order.blade.php
@@ -34,8 +34,12 @@
                       <tr class="head-tr">
                         <td colspan="4">
                           <span class="order-created me-4">{{ $order->created_at }}</span>
-                          <span
-                            class="order-number">{{ __('shop/account.order.order_number') }}：{{ $order->number }}</span>
+                          <span class="order-number me-4">{{ __('shop/account.order.order_number') }}：{{ $order->number }}</span>
+                          {{--物流信息--}}
+                          @if ($order->orderShipments->count() > 0)
+                            <span class="order-created me-4">{{ __('order.express_company') }}：{{ $order->orderShipments[0]->express_company }}</span>
+                            <span class="order-number">{{ __('order.express_number') }}：{{ $order->orderShipments[0]->express_number }}</span>
+                          @endif
                         </td>
                       </tr>
                       @foreach ($order->orderProducts as $product)