From 605371ca63aeb25f129ae9c3f7908099030c369f Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 20 Sep 2022 17:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/pages/products/index.blade.php      |  2 +-
 resources/beike/shop/default/css/cart.scss          |  5 -----
 resources/beike/shop/default/css/header.scss        | 13 ++++++++++++-
 themes/default/account/account.blade.php            |  2 +-
 themes/default/account/order.blade.php              |  2 +-
 themes/default/account/order_info.blade.php         |  2 +-
 themes/default/account/wishlist.blade.php           |  2 +-
 themes/default/cart/cart.blade.php                  |  4 ++--
 themes/default/cart/mini.blade.php                  |  4 ++--
 9 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index 268ae54c..7071d07a 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -118,7 +118,7 @@
                 <td><input type="checkbox" :value="item.id" v-model="selected" /></td>
                 <td>@{{ item.id }}</td>
                 <td>
-                  <div class="wh-60"><img :src="item.images[0] || 'image/placeholder.png'" class="img-fluid"></div>
+                  <div class="wh-60 border d-flex justify-content-between align-items-center"><img :src="item.images[0] || 'image/placeholder.png'" class="img-fluid"></div>
                 </td>
                 <td>
                   <a :href="item.url" target="_blank" :title="item.name" class="text-dark">@{{ stringLengthInte(item.name, 90) }}</a>
diff --git a/resources/beike/shop/default/css/cart.scss b/resources/beike/shop/default/css/cart.scss
index b9ee67f8..882b73cf 100644
--- a/resources/beike/shop/default/css/cart.scss
+++ b/resources/beike/shop/default/css/cart.scss
@@ -40,11 +40,6 @@ body.page-cart {
         input {
           flex: 0 0 1;
         }
-
-        img {
-          max-width: 80px;
-          margin-left: 14px;
-        }
       }
     }
   }
diff --git a/resources/beike/shop/default/css/header.scss b/resources/beike/shop/default/css/header.scss
index 4964c99e..27266917 100644
--- a/resources/beike/shop/default/css/header.scss
+++ b/resources/beike/shop/default/css/header.scss
@@ -261,7 +261,10 @@ header {
       border-top: 1px solid #eee;
 
       .left {
-        width: 90px;
+        width: 80px;
+        flex: 0 0 80px;
+        height: 80px;
+        border: 1px solid #eee;
         margin-right: 10px;
 
         img {
@@ -270,6 +273,14 @@ header {
       }
 
       .right {
+        .name {
+          overflow: hidden;
+          text-overflow:ellipsis;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+        }
+
         .offcanvas-products-delete {
           cursor: pointer;
           color: #999;
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 4b47625c..d2ccf307 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -67,7 +67,7 @@
                       @foreach ($latest_orders as $order)
                       <tr class="align-middle">
                         <td style="width: 62px">
-                          <div class="img border wh-60">
+                          <div class="img border wh-60 d-flex justify-content-between align-items-center">
                             <img src="{{ $order->orderProducts[0]->image ?? '' }}" class="img-fluid">
                           </div>
                         </td>
diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php
index b8abe4a1..22ccbcd1 100644
--- a/themes/default/account/order.blade.php
+++ b/themes/default/account/order.blade.php
@@ -43,7 +43,7 @@
                         <tr class="{{ $loop->first ? 'first-tr' : '' }}">
                           <td>
                             <div class="product-info">
-                              <div class="img"><img src="{{ $product->image }}" class="img-fluid"></div>
+                              <div class="img border d-flex justify-content-between align-items-center"><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>
diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index 0ffc3588..73b0fa71 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -59,7 +59,7 @@
             @foreach ($order->orderProducts as $product)
               <div class="product-list">
                 <div class="d-flex">
-                  <div class="left"><img src="{{ $product->image }}" class="img-fluid"></div>
+                  <div class="left border d-flex justify-content-between align-items-center"><img src="{{ $product->image }}" class="img-fluid"></div>
                   <div class="right">
                     <div class="name">
                     <a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
diff --git a/themes/default/account/wishlist.blade.php b/themes/default/account/wishlist.blade.php
index e2052c1b..de8c7207 100644
--- a/themes/default/account/wishlist.blade.php
+++ b/themes/default/account/wishlist.blade.php
@@ -29,7 +29,7 @@
                   @foreach ($wishlist as $item)
                     <tr data-id="{{ $item['id'] }}">
                       <td>
-                        <div class="wh-70"><img src="{{ $item['image'] }}" class="img-fluid"></div>
+                        <div class="wh-70 border d-flex justify-content-between align-items-center"><img src="{{ $item['image'] }}" class="img-fluid"></div>
                       </td>
                       <td>{{ $item['product_name'] }}</td>
                       <td>{{ $item['price'] }}</td>
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index 4b64bdff..daa7b582 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -36,7 +36,7 @@
                 <th>{{ __('shop/carts.index') }}</th>
                 <th width="170">{{ __('shop/carts.commodity') }}</th>
                 <th width="170">{{ __('shop/carts.subtotal') }}</th>
-                <th class="text-end">{{ __('common.action') }}</th>
+                <th width="100" class="text-end">{{ __('common.action') }}</th>
               </tr>
             </thead>
             <tbody>
@@ -44,7 +44,7 @@
                 <td>
                   <div class="d-flex align-items-center p-image">
                     <input class="form-check-input" type="checkbox" @change="checkedCartTr(index)" v-model="product.selected">
-                    <img :src="product.image" class="img-fluid">
+                    <div class="border d-flex align-items-center justify-content-between wh-80 ms-3"><img :src="product.image" class="img-fluid"></div>
                   </div>
                 </td>
                 <td>
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php
index b2332a62..ed200c6b 100644
--- a/themes/default/cart/mini.blade.php
+++ b/themes/default/cart/mini.blade.php
@@ -7,9 +7,9 @@
     <div class="offcanvas-right-products">
       @foreach ($carts as $cart)
         <div class="product-list d-flex align-items-center">
-          <div class="left"><img src="{{ $cart['image'] }}" calss="img-fluid"></div>
+          <div class="left"><a href="{{ shop_route('products.show', $cart['product_id']) }}" class="d-flex justify-content-between align-items-center h-100"><img src="{{ $cart['image'] }}" class="img-fluid"></a></div>
           <div class="right flex-grow-1">
-            <div class="name fs-sm fw-bold mb-2">{{ $cart['name'] }}</div>
+            <a href="{{ shop_route('products.show', $cart['product_id']) }}" class="name fs-sm fw-bold mb-3 text-dark" title="{{ $cart['name'] }}">{{ $cart['name'] }}</a>
             <div class="product-bottom d-flex justify-content-between align-items-center">
               <div class="price">{{ $cart['price_format'] }} <span class="text-muted">x {{ $cart['quantity'] }}<span>
               </div>