diff --git a/app/Http/Middleware/ShareViewData.php b/app/Http/Middleware/ShareViewData.php index babc3f83..af77a8f5 100644 --- a/app/Http/Middleware/ShareViewData.php +++ b/app/Http/Middleware/ShareViewData.php @@ -27,11 +27,6 @@ class ShareViewData protected function loadShopShareViewData() { - View::share('design', request('design') == 1); - View::share('languages', LanguageRepo::enabled()); - View::share('shop_base_url', shop_route('home.index')); - View::share('categories', hook_filter('header.categories', CategoryRepo::getTwoLevelCategories())); - if (is_admin()) { $adminLanguages = $this->handleAdminLanguages(); $loggedAdminUser = current_user(); @@ -40,6 +35,12 @@ class ShareViewData View::share('admin_languages', $adminLanguages); View::share('admin_language', collect($adminLanguages)->where('code', $currentLanguage)->first()); } + } else { + View::share('design', request('design') == 1); + View::share('languages', LanguageRepo::enabled()); + View::share('shop_base_url', shop_route('home.index')); + View::share('categories', hook_filter('header.categories', CategoryRepo::getTwoLevelCategories())); + View::share('footer_content', hook_filter('footer.content', system_setting('base.footer_setting'))); } } diff --git a/beike/Admin/Http/Controllers/DesignFooterController.php b/beike/Admin/Http/Controllers/DesignFooterController.php index 887ee675..82d859f0 100644 --- a/beike/Admin/Http/Controllers/DesignFooterController.php +++ b/beike/Admin/Http/Controllers/DesignFooterController.php @@ -36,7 +36,7 @@ class DesignFooterController extends Controller $viewPath = "layout.footer"; $viewData = [ - 'content' => DesignService::handleModuleContent('footer', $content), + 'footer_content' => DesignService::handleModuleContent('footer', $content), 'design' => (bool)$request->get('design') ]; diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php index 17a614fb..f6812485 100644 --- a/themes/default/layout/footer.blade.php +++ b/themes/default/layout/footer.blade.php @@ -19,6 +19,7 @@