From 0dbf34348c42f8800259472c8a30c132894ed0d1 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 15 Aug 2022 12:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=20=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/build/beike/shop/default/js/app.js |   3 +-
 resources/beike/shop/default/js/common.js |   3 +-
 themes/default/account/account.blade.php  | 101 ++++++++++++++--------
 themes/default/layout/master.blade.php    |   4 +
 4 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js
index 6a097c50..599dbf23 100644
--- a/public/build/beike/shop/default/js/app.js
+++ b/public/build/beike/shop/default/js/app.js
@@ -2165,8 +2165,9 @@ __webpack_require__.r(__webpack_exports__);
       }).then(function (res) {
         layer.msg(res.message);
         $btn.attr('data-in-wishlist', res.data.id);
-      })["finally"](function (e) {
         $btn.html(btnHtml).prop('disabled', false).find('i.bi').prop('class', 'bi bi-heart-fill');
+      })["catch"](function (e) {
+        $btn.html(btnHtml).prop('disabled', false);
       });
     }
   },
diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js
index d85d019f..6203a95c 100644
--- a/resources/beike/shop/default/js/common.js
+++ b/resources/beike/shop/default/js/common.js
@@ -78,8 +78,9 @@ export default {
       $http.post('account/wishlist', {product_id: id}, {hload: true}).then((res) => {
         layer.msg(res.message)
         $btn.attr('data-in-wishlist', res.data.id);
-      }).finally((e) => {
         $btn.html(btnHtml).prop('disabled', false).find('i.bi').prop('class', 'bi bi-heart-fill')
+      }).catch((e) => {
+        $btn.html(btnHtml).prop('disabled', false)
       })
     }
   },
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 00f07d2c..fb065c3e 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -13,12 +13,14 @@
 
     <div class="row">
 
-      <x-shop-sidebar/>
+      <x-shop-sidebar />
 
       <div class="col-12 col-md-9">
         @if (\Session::has('success'))
           <div class="alert alert-success">
-            <ul><li>{!! \Session::get('success') !!}</li></ul>
+            <ul>
+              <li>{!! \Session::get('success') !!}</li>
+            </ul>
           </div>
         @endif
         <div class="card mb-4 account-card">
@@ -54,44 +56,69 @@
                   class="text-muted">售后</span></a>
             </div>
             <div class="order-wrap">
-              <div class="no-order d-flex flex-column align-items-center">
-                <div class="icon mb-2"><i class="iconfont">&#xe60b;</i></div>
-                <div class="text mb-3 text-muted">您还没有订单！<a href="">去下单</a></div>
-              </div>
-            </div>
+              @if (!$latest_orders)
+                <div class="no-order d-flex flex-column align-items-center">
+                  <div class="icon mb-2"><i class="iconfont">&#xe60b;</i></div>
+                  <div class="text mb-3 text-muted">您还没有订单！<a href="">去下单</a></div>
+                </div>
+              @else
+                {{-- <p class="text-muted">近期订单</p> --}}
+                <ul class="list-unstyled orders-list">
+                  <table class="table table-hover">
+                    <tbody>
+                      @foreach ($latest_orders as $order)
+                      <tr class="align-middle">
+                        <td>
+                          <div class="img me-3 border wh-60">
+                            @foreach ($order->orderProducts as $product)
+                            <img src="{{ $product->image }}" class="img-fluid">
+                            @endforeach
+                          </div>
+                        </td>
+                        <td>
+                          <div class="mb-2">订单号：{{ $order->number }} <span class="vr lh-1 mx-2 bg-secondary"></span> 共 {{ count($order->orderProducts) }} 件商品</div>
+                          <div class="text-muted">下单时间：{{ $order->created_at }}</div>
+                        </td>
+                        <td>
+                          <span class="ms-4 d-inline-block">状态：{{ $order->status }}</span>
+                        </td>
+                        <td>
+                          <span class="ms-3 d-inline-block">金额：{{ $order->total }}</span>
+                        </td>
 
-              @foreach ($latest_orders as $order)
-                  <tbody>
-                  <tr class="sep-row"><td colspan="4"></td></tr>
-                  <tr class="head-tr">
-                      <td colspan="4">
-                          <span class="order-created me-4">{{ $order->created_at }}</span>
-                          <span class="order-number">订单号：{{ $order->number }}</span>
-                      </td>
-                  </tr>
-                  @foreach ($order->orderProducts as $product)
-                      <tr class="{{ $loop->first ? 'first-tr' : '' }}">
-                          <td>
-                              <div class="product-info">
-                                  <div class="img"><img src="{{ $product->image }}" class="img-fluid"></div>
-                                  <div class="name">
-                                      <span>{{ $product->name }}</span>
-                                  </div>
-                                  <div class="quantity">{{ $product->quantity }}</div>
-                              </div>
-                          </td>
-                          @if ($loop->first)
-                              <td rowspan="{{ $loop->count }}">{{ $order->total }}</td>
-                              <td rowspan="{{ $loop->count }}">{{ $order->status }}</td>
-                              <td rowspan="{{ $loop->count }}" class="text-end">
-                                  <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}" class="btn btn-outline-secondary btn-sm">查看</a>
-                              </td>
-                          @endif
+                        <td>
+                          <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}"
+                            class="btn btn-outline-secondary btn-sm">查看详情</a>
+                        </td>
                       </tr>
-                  @endforeach
-                  </tbody>
-              @endforeach
+                      @endforeach
+                    </tbody>
+                  </table>
+                  {{-- @foreach ($latest_orders as $order)
+                    <div class="d-flex justify-content-between align-items-center mb-3">
+                      <div class="d-flex align-items-center">
+                        <div class="img me-3 border wh-70">
+                          @foreach ($order->orderProducts as $product)
+                          <img src="{{ $product->image }}" class="img-fluid">
+                          @endforeach
+                        </div>
+                        <div>
+                          <div class="order-number mb-2">
+                            <span class="wp-200 d-inline-block">订单号：{{ $order->number }}</span>
+                            <span class="wp-200 ms-4 d-inline-block">状态：{{ $order->status }}</span>
+                            <span class=" ms-3 d-inline-block">金额：{{ $order->total }}</span>
+                          </div>
+                          <div class="order-created text-muted">下单时间：{{ $order->created_at }}</div>
+                        </div>
+                      </div>
 
+                      <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}"
+                        class="btn btn-outline-secondary btn-sm">查看详情</a>
+                    </div>
+                  @endforeach --}}
+                </ul>
+              @endif
+            </div>
           </div>
         </div>
       </div>
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index c013ab49..157945a1 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -25,6 +25,10 @@
 
   @include('layout.footer')
 
+  <script>
+    const isLogin = @json(current_customer());
+  </script>
+
   @stack('add-scripts')
 </body>
 </html>