Browse Source

feat:修改2个后台默认布局

igb 5 months ago
parent
commit
e5dade8a25
3 changed files with 22 additions and 8 deletions
  1. 10 0
      app/Admin/bootstrap.php
  2. 11 1
      app/Distributor/bootstrap.php
  3. 1 7
      app/Providers/AppServiceProvider.php

+ 10 - 0
app/Admin/bootstrap.php

@@ -5,6 +5,8 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid\Filter;
 use Dcat\Admin\Show;
+use Dcat\Admin\Layout\Content;
+use Illuminate\Support\ServiceProvider;
 
 /**
  * Dcat-admin - admin builder based on Laravel.
@@ -25,6 +27,14 @@ use Dcat\Admin\Show;
  *
  */
 
+// 设置后台布局
+$newContent = new Content();
+$newContent->view('admin.layouts.content');
+app()->singleton(Content::class, function () use ($newContent) {
+    return $newContent;
+});
+
+
 // 覆盖默认配置
 config(['admin' => user_admin_config()]);
 config(['app.locale' => config('admin.lang') ?: config('app.locale')]);

+ 11 - 1
app/Distributor/bootstrap.php

@@ -5,7 +5,8 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid\Filter;
 use Dcat\Admin\Show;
-
+use Dcat\Admin\Layout\Content;
+use Illuminate\Support\ServiceProvider;
 /**
  * Dcat-admin - admin builder based on Laravel.
  * @author jqh <https://github.com/jqhph>
@@ -25,12 +26,21 @@ use Dcat\Admin\Show;
  *
  */
 
+// 设置后台布局
+$newContent = new Content();
+$newContent->view('distributor.layouts.content');
+app()->singleton(Content::class, function () use ($newContent) {
+    return $newContent;
+});
+
 // 获取当前登录用户
 $user = Admin::guard()->check() ? Admin::user() : null;
 
 // 设置应用程序的本地化
 config(['app.locale' => $user && $user->language ? $user->language : config('app.locale')]);
 
+
+
 //// 覆盖默认配置
 //config(['admin' => user_admin_config()]);
 //config(['app.locale' => config('admin.lang') ?: config('app.locale')]);

+ 1 - 7
app/Providers/AppServiceProvider.php

@@ -5,7 +5,6 @@ namespace App\Providers;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
-use Dcat\Admin\Layout\Content;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -18,12 +17,7 @@ class AppServiceProvider extends ServiceProvider
     {
         //添加自定义辅助函数
         require_once __DIR__.'/../helpers.php';
-        //自定义内容
-        $newContent = new Content();
-        $newContent->view('admin.layouts.content');
-        $this->app->singleton(Content::class, function () use ($newContent) {
-            return $newContent;
-        });
+
     }
 
     /**