From f4930768ee0ee9a1f0f66940dd4aa3251ce537bb Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 24 Aug 2022 10:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=B8=8D=E5=8A=A0page=E3=80=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/pages/orders/form.blade.php   | 32 +++++++++++++++++++
 .../admin/views/pages/orders/index.blade.php  |  8 +----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 21bece52..18b45bf2 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -47,6 +47,38 @@
     </div>
   </div>
 
+  <div class="card mb-4">
+    <div class="card-header"><h6 class="card-title">地址信息</h6></div>
+    <div class="card-body">
+      <table class="table ">
+        <thead class="">
+          <tr>
+            <th>订单地址</th>
+            <th>账单地址</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>
+              <div>{{ $order->shipping_customer_name }} ({{ $order->shipping_telephone }})</div>
+              {{ $order->shipping_country }}
+              {{ $order->shipping_zone }}
+              {{ $order->shipping_city }}
+              {{ $order->shipping_address_1 }}
+            </td>
+            <td>
+              <div>{{ $order->payment_customer_name }} ({{ $order->payment_telephone }})</div>
+              {{ $order->payment_country }}
+              {{ $order->payment_zone }}
+              {{ $order->payment_city }}
+              {{ $order->payment_address_1 }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+
   @can('orders_update_status')
   <div class="card mb-4">
     <div class="card-header"><h6 class="card-title">订单状态</h6></div>
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index c971c0e3..fa6db6e9 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -105,14 +105,8 @@
             .map(key => key + '=' + this.filter[key])
             .join('&');
 
-          const page = bk.getQueryString('page');
-
-          if (page) {
-            query += '?page=' + page;
-          }
-
           if (filter) {
-            query += (page ? '&' : '?') + filter;
+            query += '?' + filter;
           }
 
           return query;