From fcee9191ad36acd29fde6b48b9a3f7b517a8a2d9 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Mon, 16 Jan 2023 11:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E5=B0=BE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=20=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E5=9B=BE=E7=89=87=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/beike/shop/default/css/footer.scss | 2 +-
 themes/default/layout/footer.blade.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/beike/shop/default/css/footer.scss b/resources/beike/shop/default/css/footer.scss
index a30a416d..f1d49346 100644
--- a/resources/beike/shop/default/css/footer.scss
+++ b/resources/beike/shop/default/css/footer.scss
@@ -83,7 +83,7 @@ footer {
     color: #666;
 
     @media (min-width:768px) {
-      height: 60px;
+      min-height: 60px;
     }
 
     @media (max-width:768px) {
diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php
index 828eacce..eafb71f0 100644
--- a/themes/default/layout/footer.blade.php
+++ b/themes/default/layout/footer.blade.php
@@ -74,7 +74,7 @@
         <div class="col">
           {!! $footer_content['bottom']['copyright'][$locale] ?? '' !!}
         </div>
-        @if (isset($footer_content['bottom']['image']))
+        @if (isset($footer_content['bottom']['image']) && $footer_content['bottom']['image'])
           <div class="col-auto right-img">
             <img src="{{ image_origin($footer_content['bottom']['image']) }}" class="img-fluid">
           </div>