From 99f87cc9e6957a33498fa0fb1fb2e787fa996d5e Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 19 Jul 2023 11:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=87=8D=E5=A4=8D=E5=8A=A0=E8=BD=BD=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?hook=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/SettingRepo.php             | 1 -
 beike/Shop/Providers/PluginServiceProvider.php | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/beike/Repositories/SettingRepo.php b/beike/Repositories/SettingRepo.php
index 574e5772..5d01c6e1 100644
--- a/beike/Repositories/SettingRepo.php
+++ b/beike/Repositories/SettingRepo.php
@@ -159,7 +159,6 @@ class SettingRepo
         self::clearCache();
     }
 
-
     /**
      * Clear all cache.
      */
diff --git a/beike/Shop/Providers/PluginServiceProvider.php b/beike/Shop/Providers/PluginServiceProvider.php
index de2ce177..89095124 100644
--- a/beike/Shop/Providers/PluginServiceProvider.php
+++ b/beike/Shop/Providers/PluginServiceProvider.php
@@ -54,7 +54,11 @@ class PluginServiceProvider extends ServiceProvider
         }
 
         $enabledPlugins = $manager->getEnabledPlugins();
+        $currentTheme   = system_setting('base.theme');
         foreach ($enabledPlugins as $plugin) {
+            if($plugin->type == 'theme' && $plugin->code != $currentTheme) {
+                continue;
+            }
             $pluginCode = $plugin->getDirname();
             $this->bootPlugin($plugin);
             $this->registerRoutes($pluginCode);