From d6eee750ec956196da3a4b4cfdb96b8ebdaeaf9a Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 19 Aug 2022 18:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/View/Components/Alert.php                   | 4 ++--
 beike/Shop/View/Components/Alert.php                    | 4 ++--
 resources/beike/admin/views/components/alert.blade.php  | 2 +-
 resources/beike/admin/views/pages/pages/index.blade.php | 2 +-
 themes/default/cart/cart.blade.php                      | 3 +--
 themes/default/components/alert.blade.php               | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/beike/Admin/View/Components/Alert.php b/beike/Admin/View/Components/Alert.php
index 4564d292..6752e63f 100644
--- a/beike/Admin/View/Components/Alert.php
+++ b/beike/Admin/View/Components/Alert.php
@@ -9,9 +9,9 @@ class Alert extends Component
     public string $type;
     public string $msg;
 
-    public function __construct(string $type, string $msg)
+    public function __construct(?string $type = 'success', string $msg)
     {
-        $this->type = $type;
+        $this->type = $type ?? 'success';
         $this->msg = $msg;
     }
 
diff --git a/beike/Shop/View/Components/Alert.php b/beike/Shop/View/Components/Alert.php
index be6c2454..e9f178ed 100644
--- a/beike/Shop/View/Components/Alert.php
+++ b/beike/Shop/View/Components/Alert.php
@@ -9,9 +9,9 @@ class Alert extends Component
     public string $type;
     public string $msg;
 
-    public function __construct(string $type, string $msg)
+    public function __construct(?string $type = 'success', string $msg)
     {
-        $this->type = $type;
+        $this->type = $type ?? 'success';
         $this->msg = $msg;
     }
 
diff --git a/resources/beike/admin/views/components/alert.blade.php b/resources/beike/admin/views/components/alert.blade.php
index 9ab92d72..0fe2eae1 100644
--- a/resources/beike/admin/views/components/alert.blade.php
+++ b/resources/beike/admin/views/components/alert.blade.php
@@ -1,4 +1,4 @@
-<div class="alert alert-success alert-dismissible">
+<div class="alert alert-{{ $type }} alert-dismissible">
   <i class="bi bi-check-circle-fill"></i>
   {{ $msg }}
   <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
diff --git a/resources/beike/admin/views/pages/pages/index.blade.php b/resources/beike/admin/views/pages/pages/index.blade.php
index 739c0ee2..aaa5e2b7 100644
--- a/resources/beike/admin/views/pages/pages/index.blade.php
+++ b/resources/beike/admin/views/pages/pages/index.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 
   @if ($errors->has('error'))
-    <x-admin-alert type="Danger" msg="{{ $errors->has('error') }}" class="mt-4" />
+    <x-admin-alert type="danger" msg="{{ $errors->has('error') }}" class="mt-4" />
   @endif
 
   <div class="card">
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index 23131450..5a9cb7a3 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -17,9 +17,8 @@
       <div class="col-12 col-md-9">@include('shared.steps', ['steps' => 1])</div>
     </div>
 
-      {{-- @dump($errors) --}}
     @if ($errors->has('error'))
-      <x-admin-alert type="Danger" msg="{{ $errors->has('error') }}" class="mt-4" />
+      <x-shop-alert type="danger" msg="{{ $errors->has('error') }}" class="mt-4" />
     @endif
 
     <div class="row mt-5" v-if="products.length">
diff --git a/themes/default/components/alert.blade.php b/themes/default/components/alert.blade.php
index 9ab92d72..0fe2eae1 100644
--- a/themes/default/components/alert.blade.php
+++ b/themes/default/components/alert.blade.php
@@ -1,4 +1,4 @@
-<div class="alert alert-success alert-dismissible">
+<div class="alert alert-{{ $type }} alert-dismissible">
   <i class="bi bi-check-circle-fill"></i>
   {{ $msg }}
   <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>