From 52f40302fdbefdda105d27d7cb47d0ad5374bbfc Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 1 Sep 2022 16:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/design/builder/menu.blade.php |  2 +-
 .../shop/default/css/account/account.scss     |  6 ++
 .../beike/shop/default/css/order-success.scss |  2 +-
 .../default/css/page-account-address.scss     |  4 +
 .../shop/default/css/page-account-order.scss  |  4 +
 .../beike/shop/default/css/page-checkout.scss |  9 ++-
 themes/default/account/order.blade.php        | 80 ++++++++++---------
 7 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/resources/beike/admin/views/pages/design/builder/menu.blade.php b/resources/beike/admin/views/pages/design/builder/menu.blade.php
index 3fe7c389..001af109 100644
--- a/resources/beike/admin/views/pages/design/builder/menu.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/menu.blade.php
@@ -26,7 +26,7 @@
               @click="currentMenuIndex = index" v-for="menu, index in form.menus" :key="index">
               <div class="d-flex justify-content-between align-items-center">
                 <div class="d-flex align-items-center flex-grow-1">
-                  <el-tooltip class="icon-rank cursor-scroll" effect="dark" content="{{ __('admin/builder.text_drag_sort') }}" placement="left">
+                  <el-tooltip class="icon-rank cursor-scroll" effect="dark" content="{{ __('admin/builder.text_drag_sort') }}" placement="top">
                     <i class="el-icon-rank"></i>
                   </el-tooltip>
                   <div class="name mx-2">
diff --git a/resources/beike/shop/default/css/account/account.scss b/resources/beike/shop/default/css/account/account.scss
index c5324836..4595b819 100644
--- a/resources/beike/shop/default/css/account/account.scss
+++ b/resources/beike/shop/default/css/account/account.scss
@@ -37,3 +37,9 @@ body.page-account {
     }
   }
 }
+
+.account-sides-info {
+  @media (max-width:768px) {
+    margin-bottom: 14px;
+  }
+}
\ No newline at end of file
diff --git a/resources/beike/shop/default/css/order-success.scss b/resources/beike/shop/default/css/order-success.scss
index 800c75e6..8baa3350 100644
--- a/resources/beike/shop/default/css/order-success.scss
+++ b/resources/beike/shop/default/css/order-success.scss
@@ -8,7 +8,7 @@ body.page-order-success, body.page-payment {
         padding-left: 7rem;
 
         @media (max-width:768px) {
-          padding: 3rem;
+          padding: 1rem;
         }
       }
 
diff --git a/resources/beike/shop/default/css/page-account-address.scss b/resources/beike/shop/default/css/page-account-address.scss
index 9fd9fb0a..ee17782b 100644
--- a/resources/beike/shop/default/css/page-account-address.scss
+++ b/resources/beike/shop/default/css/page-account-address.scss
@@ -14,6 +14,10 @@ body.page-account-address, body.page-checkout {
       height: 130px;
       cursor: pointer;
 
+      @media (max-width: 768px) {
+        padding: 10px 10px 10px 14px;
+      }
+
       &:hover {
         border-color: #222;
       }
diff --git a/resources/beike/shop/default/css/page-account-order.scss b/resources/beike/shop/default/css/page-account-order.scss
index d6ca9edb..5d72c64f 100644
--- a/resources/beike/shop/default/css/page-account-order.scss
+++ b/resources/beike/shop/default/css/page-account-order.scss
@@ -41,6 +41,10 @@ body.page-account-order-list {
         .img {
           flex: 0 0 60px;
           margin-right: 10px;
+
+          @media (max-width:768px) {
+            display: none;
+          }
         }
       }
     }
diff --git a/resources/beike/shop/default/css/page-checkout.scss b/resources/beike/shop/default/css/page-checkout.scss
index eee97b00..70a5fa36 100644
--- a/resources/beike/shop/default/css/page-checkout.scss
+++ b/resources/beike/shop/default/css/page-checkout.scss
@@ -43,7 +43,14 @@ body.page-checkout {
   .addresses-wrap {
     .item {
       &.address-right {
-        padding: 0 2.6rem;
+        @media (min-width: 768px) {
+          padding: 0 2.6rem;
+        }
+
+        @media (max-width: 768px) {
+          padding: 0;
+        }
+
         display: flex;
         flex-direction: column;
         align-items: center;
diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php
index f8e708dd..d2ef1915 100644
--- a/themes/default/account/order.blade.php
+++ b/themes/default/account/order.blade.php
@@ -19,47 +19,49 @@
             <h5 class="card-title">{{ __('shop/account.order.index') }}</h5>
           </div>
           <div class="card-body">
-            <table class="table ">
-              <thead>
-                <tr>
-                  <th>{{ __('shop/account.order.order_details') }}</th>
-                  <th width="160px">{{ __('shop/account.order.amount') }}</th>
-                  <th width="100px">{{ __('shop/account.order.state') }}</th>
-                  <th width="100px" class="text-end">{{ __('common.action') }}</th>
-                </tr>
-              </thead>
-              @foreach ($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">{{ __('shop/account.order.order_number') }}：{{ $order->number }}</span>
-                    </td>
+            <div class="table-responsive">
+              <table class="table ">
+                <thead>
+                  <tr>
+                    <th>{{ __('shop/account.order.order_details') }}</th>
+                    <th width="160px">{{ __('shop/account.order.amount') }}</th>
+                    <th width="100px">{{ __('shop/account.order.state') }}</th>
+                    <th width="100px" class="text-end">{{ __('common.action') }}</th>
                   </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">
-                          <a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
-                          <div class="quantity mt-1 text-secondary">x {{ $product->quantity }}</div>
-                        </div>
-                      </div>
-                    </td>
-                    @if ($loop->first)
-                      <td rowspan="{{ $loop->count }}">{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
-                      <td rowspan="{{ $loop->count }}">{{ __("common.order.{$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">{{ __('shop/account.order.check') }}</a>
+                </thead>
+                @foreach ($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">{{ __('shop/account.order.order_number') }}：{{ $order->number }}</span>
                       </td>
-                    @endif
-                  </tr>
-                  @endforeach
-                </tbody>
-              @endforeach
-            </table>
+                    </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">
+                            <a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
+                            <div class="quantity mt-1 text-secondary">x {{ $product->quantity }}</div>
+                          </div>
+                        </div>
+                      </td>
+                      @if ($loop->first)
+                        <td rowspan="{{ $loop->count }}">{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
+                        <td rowspan="{{ $loop->count }}">{{ __("common.order.{$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">{{ __('shop/account.order.check') }}</a>
+                        </td>
+                      @endif
+                    </tr>
+                    @endforeach
+                  </tbody>
+                @endforeach
+              </table>
+            </div>
           </div>
         </div>
       </div>