From b01ae254e247f4f0a87b7ecba0c3f27549897e13 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 1 Jul 2022 18:50:26 +0800
Subject: [PATCH] wip

---
 beike/Shop/Services/CheckoutService.php         |  2 +-
 .../admin/views/pages/customers/index.blade.php | 17 ++---------------
 themes/default/checkout.blade.php               |  8 +++++---
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php
index 31b298d2..331ae151 100644
--- a/beike/Shop/Services/CheckoutService.php
+++ b/beike/Shop/Services/CheckoutService.php
@@ -38,7 +38,7 @@ class CheckoutService
 
         $data = [
             'current' => [
-                'shipping_address_id' => 2,
+                'shipping_address_id' => 7,
                 'payment_address_id' => 3,
                 'shipping_method' => 'flat_shipping',
                 'payment_method' => 'bk_stripe',
diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php
index 7c547f76..f90fbdf5 100644
--- a/resources/beike/admin/views/pages/customers/index.blade.php
+++ b/resources/beike/admin/views/pages/customers/index.blade.php
@@ -42,22 +42,9 @@
         </tbody>
       </table>
 
-      <nav aria-label="...">
-        <ul class="pagination">
-          <li class="page-item disabled">
-            <a class="page-link">Previous</a>
-          </li>
-          <li class="page-item"><a class="page-link" href="#">1</a></li>
-          <li class="page-item active" aria-current="page">
-            <a class="page-link" href="#">2</a>
-          </li>
-          <li class="page-item"><a class="page-link" href="#">3</a></li>
-          <li class="page-item">
-            <a class="page-link" href="#">Next</a>
-          </li>
-        </ul>
-      </nav>
+      {{ $customers->links('admin::vendor/pagination/bootstrap-4') }}
     </div>
+
     <el-dialog title="创建顾客" :visible.sync="dialogCustomers.show" width="600px"
       @close="closeCustomersDialog('form')" :close-on-click-modal="false">
       <el-form ref="form" :rules="rules" :model="dialogCustomers.form" label-width="100px">
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index 8632641b..252956ae 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -36,7 +36,7 @@
                   <div class="zipcode">@{{ address.zipcode }}</div>
                   <div class="address-info">@{{ address.country_id }} @{{ address.zone_id }}</div>
                   <div class="address-bottom">
-                    <span class="badge bg-success">已选择</span>
+                    <span class="badge bg-success" v-if="form.shipping_address_id == address.id">已选择</span>
                     <a class="" @click="editAddress(index)">编辑</a>
                   </div>
                 </div>
@@ -175,8 +175,10 @@
 
       data: {
         form: {
-          shipping_address_id: 7,
-          payment_methods: 7,
+          shipping_address_id: @json($current['shipping_address_id']),
+          payment_address_id: @json($current['payment_address_id']),
+          payment_method: @json($current['payment_method']),
+          shipping_method: @json($current['shipping_method']),
         },
 
         source: {