diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 1785cf2a..8db9286d 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -2,18 +2,18 @@ namespace Beike\Admin\Providers; -use Beike\Console\Commands\MakeRootAdminUser; use Beike\Models\AdminUser; -use Beike\Models\Setting; +use Illuminate\Support\Str; +use Illuminate\Support\Facades\View; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\ServiceProvider; use Beike\Admin\View\Components\Filter; use Beike\Admin\View\Components\Header; use Beike\Admin\View\Components\Sidebar; use Beike\Admin\View\Components\Form\Input; +use Beike\Console\Commands\MakeRootAdminUser; use Beike\Admin\View\Components\Form\InputLocale; use Beike\Admin\View\Components\Form\SwitchRadio; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Str; class AdminServiceProvider extends ServiceProvider { @@ -34,6 +34,10 @@ class AdminServiceProvider extends ServiceProvider $this->mergeConfigFrom(__DIR__ . '/../../Config/beike.php', 'beike'); $this->loadViewsFrom(resource_path('/beike/admin/views'), 'admin'); + $this->app->booted(function () { + $this->loadShareViewData(); + }); + $this->loadViewComponentsAs('admin', [ 'header' => Header::class, 'sidebar' => Sidebar::class, @@ -107,4 +111,12 @@ class AdminServiceProvider extends ServiceProvider } } + + /** + * 后台公共数据 + */ + protected function loadShareViewData() + { + View::share('admin_base_url', admin_route('home.index')); + } } diff --git a/resources/beike/admin/views/layouts/master.blade.php b/resources/beike/admin/views/layouts/master.blade.php index 29a4528e..fc62a3ef 100644 --- a/resources/beike/admin/views/layouts/master.blade.php +++ b/resources/beike/admin/views/layouts/master.blade.php @@ -1,42 +1,43 @@ - - - - - - -{{-- - - --}} - {{-- --}} + + + + + + + + {{-- + + --}} + {{-- --}} - - - - - - beike admin - @stack('header') - {{-- --}} + + + + + + beike admin + @stack('header') + {{-- --}} - + - + -
+

@yield('title')

-
- @yield('content') -
+
+ @yield('content') +
-
- @stack('footer') +
+@stack('footer') diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index 9b152c7f..eb5c1de6 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -7,6 +7,7 @@ content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> + 首页编辑器