From d766dfbe36d167e78a639ee62e85b31139930cc6 Mon Sep 17 00:00:00 2001
From: So <11893485+livesok@user.noreply.gitee.com>
Date: Fri, 4 Nov 2022 22:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E7=8B=AC=E7=AB=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5attr=E4=BD=9C=E4=B8=BA=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正安装完成时写入配置文件的域名

修正安装完成时写入配置文件的域名

购物车商品模型增加独立字段attr作为规格
---
 .gitignore                                     | 1 +
 beike/Installer/Helpers/EnvironmentManager.php | 7 +------
 beike/Shop/Http/Resources/CartDetail.php       | 7 +------
 themes/default/cart/cart.blade.php             | 1 +
 themes/default/cart/mini.blade.php             | 3 ++-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79326f2f..8f4f8744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ yarn-error.log
 mix-manifest.json
 package-lock.json
 dist
+/public/cache
diff --git a/beike/Installer/Helpers/EnvironmentManager.php b/beike/Installer/Helpers/EnvironmentManager.php
index 469fedf2..ce79080b 100644
--- a/beike/Installer/Helpers/EnvironmentManager.php
+++ b/beike/Installer/Helpers/EnvironmentManager.php
@@ -95,12 +95,7 @@ class EnvironmentManager
         $results = trans('installer::installer_messages.environment.success');
 
         $scheme = is_secure() ? 'https' : 'http';
-        $appUrl = $scheme . "://";
-        if ($_SERVER["SERVER_PORT"] != "80") {
-            $appUrl .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"];
-        } else {
-            $appUrl .= $_SERVER["SERVER_NAME"];
-        }
+        $appUrl = $scheme . "://" . $_SERVER["HTTP_HOST"];
 
         $envFileData =
             'APP_NAME=\'' . ($request->app_name ?: 'BeikeShop') . "'\n" .
diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php
index 51e61a0a..839ed654 100644
--- a/beike/Shop/Http/Resources/CartDetail.php
+++ b/beike/Shop/Http/Resources/CartDetail.php
@@ -26,12 +26,6 @@ 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,
@@ -48,6 +42,7 @@ class CartDetail extends JsonResource
             'tax_class_id' => $product->tax_class_id,
             'subtotal' => $subTotal,
             'subtotal_format' => currency_format($subTotal),
+            'variant_labels' => trim($sku->getVariantLabel()),
         ];
     }
 }
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index f6b48b80..b7590c65 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -49,6 +49,7 @@
                 </td>
                 <td>
                   <div class="name mb-1 fw-bold" v-text="product.name"></div>
+                  <div class="attr text-muted">@{{ product.variant_labels }}</div>
                   <div class="price text-muted">@{{ product.price_format }}</div>
                 </td>
                 <td>
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php
index 314c4386..e04a6422 100644
--- a/themes/default/cart/mini.blade.php
+++ b/themes/default/cart/mini.blade.php
@@ -16,7 +16,8 @@
           <div class="product-info d-flex align-items-center">
             <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">
-              <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>
+              <a href="{{ shop_route('products.show', $cart['product_id']) }}" class="name fs-sm fw-bold mb-2 text-dark" title="{{ $cart['name'] }}">{{ $cart['name'] }}</a>
+              <div class="attr text-muted">{{ $cart['variant_labels'] }}</div>
               <div class="product-bottom d-flex justify-content-between align-items-center">
                 <div class="price d-flex align-items-center">
                   {{ $cart['price_format'] }} x