fixed footer content

This commit is contained in:
Edward Yang 2022-08-10 16:44:35 +08:00
parent b8d2ae6cfb
commit f621f41039
3 changed files with 8 additions and 6 deletions

View File

@ -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')));
}
}

View File

@ -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')
];

View File

@ -19,6 +19,7 @@
<div class="container">
<div class="footer-content">
<div class="row">
@dump($footer_content)
<div class="col-12 col-md-4">
<div class="footer-content-left">
<div class="logo"><a href="http://"><img src="{{ asset('image/logo.png') }}" class="img-fluid"></a></div>