测试修BUG

app/Admin/Controllers/DistAdminDistributorController.php

@@ -49,7 +49,7 @@ class DistAdminDistributorController extends AdminController
 
             $grid->column('id')->sortable();
             $grid->column('client_code',admin_trans_label('client_code'))->width('15%');
-            $grid->column('distr_email',admin_trans_label('email'));
+            $grid->column('dist_email',admin_trans_label('email'));
             $grid->column('dist_contact_number',admin_trans_label('contact_number'));
             $grid->column('secondary_domain');
             $grid->column('country',);
@@ -89,8 +89,8 @@ class DistAdminDistributorController extends AdminController
     protected function detail($id)
     {
         return Show::make($id, DistAdminDistributor::with(['appearance']), function (Show $show) {
-            $show->field('dist_code',admin_trans_label('client_code'));
-            $show->field('distr_email',admin_trans_label('email'));
+            $show->field('client_code',admin_trans_label('client_code'));
+            $show->field('dist_email',admin_trans_label('email'));
             $show->field('dist_contact_number',admin_trans_label('contact_number'));
             $show->field('secondary_domain');
             $show->field('country');
@@ -112,8 +112,8 @@ class DistAdminDistributorController extends AdminController
     protected function form()
     {
         return Form::make(new DistAdminDistributor(), function (Form $form) {
-            $form->text('dist_code',admin_trans_label('client_code'))->width(9,3)->required();
-            $form->text('distr_email',admin_trans_label('email'))->width(9,3);
+            $form->text('client_code',admin_trans_label('client_code'))->width(9,3)->required();
+            $form->text('dist_email',admin_trans_label('email'))->width(9,3);
             $form->text('dist_contact_number',admin_trans_label('contact_number'))->width(9,3);
             $form->text('secondary_domain')->width(9,3)
                 ->required()
@@ -121,27 +121,14 @@ class DistAdminDistributorController extends AdminController
             $form->text('country')->width(9,3)->required();
             $form->text('address')->width(9,3);
             $form->switch('enabled')->width(9,3)->default(1);
-            //保存前回调
-            $form->saving(function (Form $form) {
-                if (!$form->isCreating()) {
-                    //如果appearance_id有变化，则更新模版与变量
-                    if ($form->model()->appearance_id != $form->input('appearance_id')) {
-                        $id = $form->model()->id;
-                        //更新模版与变量
-                        DistAppearance::switchTheme($form->input('appearance_id'), $id);
-                    }
-                }
-            });
+
             //保存后回调
             $form->saved(function (Form $form, $result) {
                 if ($form->isCreating()) {
                     //创建后创建默认分类
                     $newId = $form->getKey();
-                    $appearanceId = $form->input('appearance_id');
                     //初始化分销商
-                    DistAdminDistributor::initDist($appearanceId,$newId);
-                    //更新模版与变量
-                    DistAppearance::switchTheme($appearanceId, $newId);
+                    DistAdminDistributor::initDist($newId);
                 }
             });
         });

app/Admin/Controllers/DistSiteController.php

@@ -162,6 +162,30 @@ class DistSiteController extends AdminController
                 $form->textarea('statistics_js')->width(9,3);
             });
 
+            //保存前回调
+            $form->saving(function (Form $form) {
+                if (!$form->isCreating()) {
+                    //如果appearance_id有变化，则更新模版与变量
+                    if ($form->model()->appearance_id != $form->input('appearance_id')) {
+                        $id = $form->model()->id;
+                        //更新模版与变量
+                        DistAppearance::switchTheme($form->input('appearance_id'), $id);
+                    }
+                }
+            });
+
+            //
+            //保存后回调
+            $form->saved(function (Form $form, $result) {
+                if ($form->isCreating()) {
+                    //创建后创建默认分类
+                    $newId = $form->getKey();
+                    $appearanceId = $form->input('appearance_id');
+                    //更新模版与变量
+                    DistAppearance::switchTheme($appearanceId, $newId);
+                }
+            });
+
             $form->disableDeleteButton();
         });
     }

app/Admin/Renderable/DistDistributorTable.php

@@ -19,10 +19,11 @@ class DistDistributorTable extends LazyRenderable
             $grid->column('country');
             $grid->disableActions();
             $grid->paginate(10);
-            $grid->filter(function (Grid\Filter $filter) {
-                $filter->like('client_code')->width(4);
-            });
-            $grid->model()->where('enabled', 1);
+//            $grid->filter(function (Grid\Filter $filter) {
+//                $filter->like('client_code')->width(4);
+//            });
+            $grid->quickSearch('client_code');
+            $grid->model()->where('enabled', 1)->orderBy('id', 'desc');
         });
     }
 }

app/Admin/Repositories/DistAdminDistributor.php

@@ -10,6 +10,7 @@ use App\Models\SitePages;
 use App\Models\SitePagesTagRelationship;
 use Carbon\Carbon;
 use Dcat\Admin\Repositories\EloquentRepository;
+use App\Models\SiteBanner;
 
 class DistAdminDistributor extends EloquentRepository
 {
@@ -51,7 +52,7 @@ class DistAdminDistributor extends EloquentRepository
     /*
      * 始始化分销商
      */
-    public static function initDist($appearanceId,$distId)
+    public static function initDist($distId)
     {
         //初始化数据，现在用默认，以后有可能不同主题不同
         self::default($distId);

app/Models/DistProductCategory.php

@@ -34,7 +34,7 @@ class DistProductCategory extends Model implements Sortable
     ];
 
     protected $fillable = [
-        'name', 'parent_id', 'order','enabled','dist_id','slug', // 假设已有的可填充字段
+        'name', 'parent_id', 'order','enabled','dist_id','slug','created_at', 'updated_at',// 假设已有的可填充字段
     ];
 
 

app/Models/SiteBanner.php

@@ -10,5 +10,17 @@ class SiteBanner extends Model
 {
 	use HasDateTimeFormatter;
     protected $table = 'site_banner';
-    
+
+    protected $fillable = [
+        'image_url',
+        'order',
+        'banner_url',
+        'title',
+        'show',
+        'position',
+        'created_at',
+        'updated_at',
+        'dist_id',
+    ];
+
 }