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 @@