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);