diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index 8ede2fc1..efa57edf 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Beike\Shop\View\Components\Breadcrumb;
 use Beike\Shop\View\Components\AccountSidebar;
+use Beike\Shop\View\Components\NoData;
 
 class ShopServiceProvider extends ServiceProvider
 {
@@ -85,6 +86,7 @@ class ShopServiceProvider extends ServiceProvider
     {
         $this->loadViewComponentsAs('shop', [
             'sidebar' => AccountSidebar::class,
+            'no-data' => NoData::class,
             'alert' => Alert::class,
             'breadcrumb' => Breadcrumb::class
         ]);
diff --git a/beike/Shop/View/Components/NoData.php b/beike/Shop/View/Components/NoData.php
new file mode 100644
index 00000000..36e94e99
--- /dev/null
+++ b/beike/Shop/View/Components/NoData.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Beike\Shop\View\Components;
+
+use Illuminate\View\Component;
+use Illuminate\Contracts\View\View;
+
+class NoData extends Component
+{
+    public string $text;
+
+    public function __construct(?string $text = '')
+    {
+        $this->text = $text ?: trans('common.no_data');
+    }
+
+    public function render()
+    {
+        return view('components.no-data');
+    }
+}
diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php
index af0e48be..45883052 100644
--- a/themes/default/category.blade.php
+++ b/themes/default/category.blade.php
@@ -2,15 +2,19 @@
 @section('body-class', 'page-categories')
 
 @section('content')
-<div class="container">
+  <div class="container">
 
     <x-shop-breadcrumb type="category" :value="$category" />
 
     <div class="row">
-      @foreach ($products as $product)
-      <div class="col-6 col-md-3">@include('shared.product')</div>
-      @endforeach
+      @if (count($products))
+        @foreach ($products as $product)
+          <div class="col-6 col-md-3">@include('shared.product')</div>
+        @endforeach
+      @else
+        <x-shop-no-data />
+      @endif
     </div>
-</div>
+  </div>
 
 @endsection
diff --git a/themes/default/components/no-data.blade.php b/themes/default/components/no-data.blade.php
new file mode 100644
index 00000000..44ecd46f
--- /dev/null
+++ b/themes/default/components/no-data.blade.php
@@ -0,0 +1,4 @@
+<div class="d-flex flex-column align-center align-items-center mb-4">
+  <img src="{{ asset('image/no-data.svg') }}" class="img-fluid wp-400">
+  <div class="text-secondary fs-4">{{ $text }}</div>
+</div>
\ No newline at end of file
diff --git a/themes/default/search.blade.php b/themes/default/search.blade.php
index 70ec2a36..392b1435 100644
--- a/themes/default/search.blade.php
+++ b/themes/default/search.blade.php
@@ -7,9 +7,13 @@
     <x-shop-breadcrumb type="static" value="products.search" />
 
     <div class="row">
-      @foreach ($items as $product)
-        <div class="col-6 col-md-3">@include('shared.product')</div>
-      @endforeach
+      @if (count($products))
+        @foreach ($products as $product)
+          <div class="col-6 col-md-3">@include('shared.product')</div>
+        @endforeach
+      @else
+        <x-shop-no-data />
+      @endif
     </div>
 
     {{ $products->links('shared/pagination/bootstrap-4') }}