修改依赖注入

app/Admin/Controllers/BaseProductController.php

@@ -152,6 +152,19 @@ class BaseProductController extends AdminController
             $form->switch('enabled')->default(1);
             //插入JS
             $this->addParametersJs();
+            //保存前回调
+            $form->saving(function ($form) {
+                //检查sku是否重复
+                $baseProduct = new BaseProduct();
+                if ($form->isCreating()) {
+                    $count = $baseProduct->model()->where('sku', $form->sku)->count();
+                } else {
+                    $count = $baseProduct->model()->where('sku', $form->sku)->where('id', '!=', $form->getKey())->count();
+                }
+                if ($count > 0) {
+                    return $form->response()->error('sku already exists');
+                }
+            });
         });
     }
 

app/Admin/Controllers/DistAdminUserController.php

@@ -38,7 +38,7 @@ class DistAdminUserController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('username');
             $grid->column('name','Company Name');
-            $grid->column('language')->using(config('app.languages'));
+            $grid->column('language')->using(config('dictionary.languages'));
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -82,7 +82,7 @@ class DistAdminUserController extends AdminController
                 $show->width(6)->field('info.linkedin','Linkedin');
                 $show->width(6)->field('info.tiktok','Tiktok');
                 $show->width(6)->field('info.second_level_domain','Second Level Domain');
-                $show->width(6)->field('language')->using(config('app.languages'));
+                $show->width(6)->field('language')->using(config('dictionary.languages'));
                 $show->width(6)->field('enabled')->using(config('dictionary.enabled'));
                 $show->width(6)->field('created_at');
                 $show->width(6)->field('updated_at');
@@ -108,7 +108,7 @@ class DistAdminUserController extends AdminController
             $form->text('name','Company Name')->required();
             $form->text('info.site_name','Site Name')->required();
             $form->text('info.second_level_domain','Second Level Domain')->required();
-            $form->select('language')->options(config('app.languages'))->required();
+            $form->select('language')->options(config('dictionary.languages'))->required();
             $form->switch('enabled')->default(1);
 
             $form->fieldset('Contact Information', function (Form $form) {
@@ -148,7 +148,7 @@ class DistAdminUserController extends AdminController
                     if (! $newId) {
                         return $form->response()->error('Failed to save data');
                     }
-                    DistAdminUser::addRoleUser($newId, config('app.dist_role_id'));//分销商角色ID 2
+                    DistAdminUser::addRoleUser($newId, config('dictionary.dist_role_id'));//分销商角色ID 2
                 }
             });
         });

app/Providers/AppServiceProvider.php

@@ -5,6 +5,7 @@ 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
 {
@@ -17,6 +18,12 @@ 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;
+        });
     }
 
     /**
@@ -41,5 +48,6 @@ class AppServiceProvider extends ServiceProvider
             });
         }
 
+
     }
 }

config/admin.php

@@ -11,7 +11,7 @@ return [
     | login page.
     |
     */
-    'name' => 'Dcat-plus Admin',
+    'name' => 'MTB Admin',
 
     /*
     |--------------------------------------------------------------------------
@@ -334,7 +334,7 @@ return [
     */
     'layout' => [
         // default, blue, blue-light, green
-        'color' => 'default',
+        'color' => 'blue',
 
         // sidebar-separate
         'body_class' => [],

config/app.php

@@ -213,17 +213,5 @@ return [
     ])->toArray(),
 
 
-    //配置语言包
-    'languages' => [
-        'en' => 'English',
-        'zh_CN' => 'Chinese',
-        'zh_TW' => 'Taiwan'
-    ],
-    //默认语言
-    'default_language' => 'en',
-
-    //分销商角色ID
-    'dist_role_id' => '2',
-
 
 ];

config/dictionary.php

@@ -7,6 +7,18 @@ use Illuminate\Support\Facades\Facade;
  */
 
 return [
+    //配置语言包
+    'languages' => [
+        'en' => 'English',
+        'zh_CN' => 'Chinese',
+        'zh_TW' => 'Taiwan'
+    ],
+    //默认语言
+    'default_language' => 'en',
+
+    //分销商角色ID
+    'dist_role_id' => '2',
+
     //是否启用
     'enabled' => [
         '0' => 'No',