From 315c31b5bd6acb27e72a3999583c8276159670c6 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Wed, 2 Nov 2022 11:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AE=A2=E5=8D=95=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E5=89=8D=E5=8F=B0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BASKU=20=E8=A7=84=E6=A0=BC=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Models/ProductSku.php                      | 16 ++++++++++++++++
 beike/Shop/Http/Resources/CartDetail.php         |  6 ++++++
 .../beike/admin/css/bootstrap/bootstrap.scss     |  1 +
 resources/beike/admin/css/element-ui.scss        |  5 +++++
 .../admin/views/pages/orders/index.blade.php     | 11 ++++++-----
 .../admin/views/pages/products/index.blade.php   |  4 ++--
 .../shop/default/css/bootstrap/bootstrap.scss    |  1 +
 themes/default/cart/cart.blade.php               |  2 +-
 8 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/beike/Models/ProductSku.php b/beike/Models/ProductSku.php
index 7b57447d..abb65979 100644
--- a/beike/Models/ProductSku.php
+++ b/beike/Models/ProductSku.php
@@ -27,4 +27,20 @@ class ProductSku extends Base
         $images = $this->images ?? [];
         return $images[0] ?? '';
     }
+
+    public function getVariantLabel(): string
+    {
+        $product = $this->product;
+        $localeCode = locale();
+        $variantLabel = '';
+        foreach ($product->variables as $index => $variable) {
+            $valueIndex = $this->variants[$index];
+            $variantName = $variable['name'][$localeCode] ?? '';
+            $variantValue = $variable['values'][$valueIndex]['name'][$localeCode] ?? '';
+            if ($variantName && $variantValue) {
+                $variantLabel .= $variantName . ': ' . $variantValue . '; ';
+            }
+        }
+        return $variantLabel;
+    }
 }
diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php
index 2bcd8625..51e61a0a 100644
--- a/beike/Shop/Http/Resources/CartDetail.php
+++ b/beike/Shop/Http/Resources/CartDetail.php
@@ -26,6 +26,12 @@ class CartDetail extends JsonResource
         $subTotal = $price * $this->quantity;
         $image = $sku->image ?: $product->image;
 
+
+        $variantLabel = $sku->getVariantLabel();
+        if ($variantLabel) {
+            $productName .= ' - ' . trim($variantLabel);
+        }
+
         return [
             'cart_id' => $this->id,
             'product_id' => $this->product_id,
diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss
index a2afde50..9c41693d 100644
--- a/resources/beike/admin/css/bootstrap/bootstrap.scss
+++ b/resources/beike/admin/css/bootstrap/bootstrap.scss
@@ -20,6 +20,7 @@ $btn-border-radius: 0;
 $btn-border-radius-sm: 0;
 $btn-border-radius-lg: 0;
 $input-btn-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1);
+$form-select-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1);
 
 // $btn-border-width: 0;
 $font-size-base: 0.82rem;
diff --git a/resources/beike/admin/css/element-ui.scss b/resources/beike/admin/css/element-ui.scss
index c4f5f14f..6f6b1486 100644
--- a/resources/beike/admin/css/element-ui.scss
+++ b/resources/beike/admin/css/element-ui.scss
@@ -48,4 +48,9 @@
       }
     }
   }
+}
+
+.bs-el-input-inner-sm {
+  height: 32px;
+  margin-top: 3px;
 }
\ No newline at end of file
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index 12bb213c..ad4f4ff1 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -14,6 +14,7 @@
           <div>
             <el-form-item label="{{ __('order.number') }}">
               <el-input @keyup.enter.native="search" v-model="filter.number" size="small" placeholder="{{ __('order.number') }}"></el-input>
+              {{-- <input @keyup.enter="search" type="text" v-model="filter.number" class="form-control" placeholder="{{ __('order.number') }}"> --}}
             </el-form-item>
             <el-form-item label="{{ __('order.customer_name') }}">
               <el-input @keyup.enter.native="search" v-model="filter.customer_name" size="small" placeholder="{{ __('order.customer_name') }}">
@@ -22,12 +23,12 @@
             <el-form-item label="{{ __('order.email') }}">
               <el-input @keyup.enter.native="search" v-model="filter.email" size="small" placeholder="{{ __('order.email') }}"></el-input>
             </el-form-item>
-            <el-form-item label="{{ __('common.status') }}">
-              {{-- <el-input @keyup.enter.native="search" v-model="filter.email" size="small" placeholder="{{ __('order.email') }}"></el-input> --}}
-              <select v-model="filter.status" class="form-control wp-100">
+            <el-form-item label="{{ __('common.status') }}" class="el-input--small">
+              <select v-model="filter.status" class="form-select wp-100 bg-white bs-el-input-inner-sm">
                 <option value="">{{ __('common.all') }}</option>
-                <option value="1">{{ __('product.active') }}</option>
-                <option value="0">{{ __('product.inactive') }}</option>
+                @foreach ($statuses as $item)
+                  <option value="{{ $item['status'] }}">{{ $item['name'] }}</option>
+                @endforeach
               </select>
             </el-form-item>
           </div>
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index 7071d07a..af51b55b 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -32,7 +32,7 @@
 
             <div class="col-xxl-20 col-xl-3 col-lg-4 col-md-4 d-flex align-items-center mb-3">
               <label class="filter-title">{{ __('product.category') }}</label>
-              <select v-model="filter.category_id" class="form-control">
+              <select v-model="filter.category_id" class="form-select">
                 <option value="">{{ __('common.all') }}</option>
                 @foreach ($categories as $_category)
                   <option :value="{{ $_category->id }}">{{ $_category->name }}</option>
@@ -42,7 +42,7 @@
 
             <div class="col-xxl-20 col-xl-3 col-lg-4 col-md-4 d-flex align-items-center mb-3">
               <label class="filter-title">{{ __('common.status') }}</label>
-              <select v-model="filter.active" class="form-control">
+              <select v-model="filter.active" class="form-select">
                 <option value="">{{ __('common.all') }}</option>
                 <option value="1">{{ __('product.active') }}</option>
                 <option value="0">{{ __('product.inactive') }}</option>
diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
index c5014030..713ede40 100644
--- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss
+++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
@@ -38,6 +38,7 @@ $border-radius:               0;
 $input-btn-padding-y:         .46rem;
 $input-btn-font-size:         0.85rem;
 $input-btn-focus-box-shadow:  0  0 11px 0 rgba($color: $primary, $alpha: .1);
+$form-select-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1);
 
 // $input-btn-padding-x:         .75rem !default;
 $btn-focus-width: 0;
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index f824b966..e9934c98 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -33,7 +33,7 @@
                     {{ __('shop/carts.select_all') }}
                   </label>
                 </th>
-                <th>{{ __('shop/carts.index') }}</th>
+                <th width="40%">{{ __('shop/carts.index') }}</th>
                 <th width="170">{{ __('shop/carts.commodity') }}</th>
                 <th width="170">{{ __('shop/carts.subtotal') }}</th>
                 <th width="100" class="text-end">{{ __('common.action') }}</th>