From fe0f922de00a9556f5b82c98a89ac3bf873ee218 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Thu, 5 Jan 2023 18:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=93=81=E7=89=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/default/cart/cart.blade.php | 4 ++--
 themes/default/product.blade.php   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index 8a29e87c..24fd7b7e 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -78,9 +78,9 @@
         </div>
       </div>
       <div class="col-12 col-md-3 right-column">
-        <div class="card shadow-sm">
+        <div class="card shadow-sm fixed-top-line">
           <div class="card-body p-lg-4">
-            <div class="card total-wrap fixed-top-line">
+            <div class="card total-wrap">
               <div class="p-lg-0"><h5 class="mb-3">{{ __('shop/carts.product_total') }}</h5></div>
               <div class="card-body p-lg-0">
                 <ul class="list-group list-group-flush">
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php
index 918a6e6d..463c5d94 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -11,7 +11,6 @@
 
 @section('content')
   <div class="container" id="product-app" v-cloak>
-
     <x-shop-breadcrumb type="product" :value="$product['id']" />
 
     <div class="row mb-5 mt-3 mt-md-0" id="product-top">
@@ -64,6 +63,12 @@
                 <template v-else>{{ __('shop/products.out_stock') }}</template>
               </div>
             </div>
+            @if ($product['brand_id'])
+            <div class="d-flex">
+              <span class="title text-muted">{{ __('product.brand') }}:</span>
+              <a href="{{ shop_route('brands.show', $product['brand_id']) }}">{{ $product['brand_name'] }}</a>
+            </div>
+            @endif
             <div class="d-flex"><span class="title text-muted">SKU:</span>@{{ product.sku }}</div>
             <div class="d-flex" v-if="product.model"><span class="title text-muted">{{ __('shop/products.model') }}:</span> @{{ product.model }}</div>
           </div>