diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
index 713ede40..049972c3 100644
--- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss
+++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss
@@ -12,7 +12,7 @@ $primary: #fd560f;
 $success: #71c20b;
 
 $font-size-base: 0.8rem;
-$font-family-base: 'poppins', sans-serif;
+$font-family-base: 'Poppins', sans-serif;
 $border-radius: 0;
 $form-check-input-width: 1.2em;
 $form-check-input-border-radius: 0;
diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss
index 194178f9..70926b4b 100644
--- a/resources/beike/shop/default/css/global.scss
+++ b/resources/beike/shop/default/css/global.scss
@@ -16,17 +16,35 @@ body[class^="page-account-"] {
   background-color: #F7F8FA;
 }
 
-@font-face {font-family: 'poppins';
-  src: url('/fonts/poppins/Poppins-Regular.ttf');
+@font-face {font-family: 'Poppins';
+  src: url('/fonts/poppins/Poppins-Regular.ttf') format("truetype");
+  font-style: normal;
+  font-weight: 500;
+  font-weight: normal;
+  font-display: swap;
 }
 
-@font-face {font-family: 'poppins';
-  src: url('/fonts/poppins/Poppins-Bold.ttf');
-  font-weight: bold;
+
+@font-face {font-family: 'Poppins';
+  src: url('/fonts/poppins/Poppins-Medium.ttf') format("truetype");
+  font-style: normal;
+  font-display: swap;
+  font-weight: 700;
 }
 
-@font-face {font-family: 'Poppins-Medium';
-  src: url('/fonts/poppins/Poppins-Medium.ttf');
+@font-face {font-family: 'Poppins';
+  src: url('/fonts/poppins/Poppins-Bold.ttf') format("truetype");
+  font-style: normal;
+  font-display: swap;
+  font-weight: 800;
+}
+
+.fw-800 {
+  font-weight: 800 !important;
+}
+
+h1,h2,h3, h4, h5, h6, b, strong {
+  font-weight: 800 !important;
 }
 
 @for $i from 1 through 6 {
@@ -284,11 +302,6 @@ body[class^="page-account-"] {
   }
 }
 
-
-table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header {
-  font-family: 'Poppins-Medium', sans-serif;
-}
-
 .text-size-min {
   font-size: 12px;
 }
diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js
index 7a03cc99..77d711b5 100644
--- a/resources/beike/shop/default/js/common.js
+++ b/resources/beike/shop/default/js/common.js
@@ -52,7 +52,7 @@ export default {
   },
 
   addWishlist(id, event) {
-    if (!config.isLogin && !config.guestCheckout) {
+    if (!config.isLogin) {
       this.openLogin()
       return;
     }
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index 3268e780..1dc20c28 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -35,7 +35,7 @@
   <script>
     const config = {
       isLogin: !!{{ current_customer()->id ?? 'null' }},
-      guestCheckout: !!{{ system_setting('base.guest_checkout', '1') }}
+      guestCheckout: !!{{ system_setting('base.guest_checkout', 1) }}
     }
   </script>