优化

app/Admin/Controllers/BaseProductCategoryController.php

@@ -32,7 +32,9 @@ class BaseProductCategoryController extends AdminController
         return Grid::make(BaseProductCategory::with('baseProductParameter'), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id','ID')->bold()->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name')->display(function ($name) {
                 $level = $this->level; // 获取当前行的 level 字段值
                 $prefix = str_repeat('&nbsp; ', $level * 2). ' <i class="fa fa-angle-right"></i>&nbsp; '; // 生成 level * 3 个加号

app/Admin/Controllers/BaseProductController.php

@@ -42,20 +42,20 @@ class BaseProductController extends AdminController
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
 
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title');
             $grid->column('sku');
             $grid->column('base_product_category.name',admin_trans_label('category_name'));
-            $grid->column('issuance_date');
             $grid->column('images')->display(function ($images) {
                 $images = $images->toArray();
                 $dataImages = array_column($images, 'image_url');
                 // 限制最多显示2个缩略图
-                $dataImages = array_slice($dataImages, 0, 2);
+                $dataImages = array_slice($dataImages, 0, 1);
                 return CommonHelper::displayImage($dataImages,100);
             });
             $grid->column('order');
-            $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -69,7 +69,7 @@ class BaseProductController extends AdminController
                 $filter->equal('enabled')->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc')->orderBy('id','desc');
+            $grid->model()->orderBy("order",'desc')->orderBy('id','desc');
         });
     }
 
@@ -83,7 +83,6 @@ class BaseProductController extends AdminController
     protected function detail($id)
     {
         return Show::make($id, BaseProduct::with(['baseProductCategory','images']), function (Show $show) {
-            $show->field('id');
             $show->field('title');
             $show->field('sku');
             $show->field('base_product_category.name',admin_trans_label('category_name'));
@@ -110,13 +109,13 @@ class BaseProductController extends AdminController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $show->field('order');
-            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
             $show->field('seo_keywords');
             $show->field('seo_description');
+            $show->field('order');
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
         });
     }
 
@@ -159,19 +158,14 @@ class BaseProductController extends AdminController
                     return $reslut;
                 });
             $form->editor('content');
-            $form->switch('is_pinned')->default(0);
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');
             $form->switch('enabled')->default(1);
 
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-            })->options(admin_trans_array(config('dictionary.visibility')))->default(1)->value(1);
-            //隐藏字段
-            $form->ignore(['visibility']);
             //插入参数联动JS
             $this->addParametersJs();
             //新建时插入JS

app/Admin/Controllers/BaseProductParameterController.php

@@ -32,7 +32,9 @@ class BaseProductParameterController extends AdminController
         return Grid::make(new BaseProductParameter(), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id','ID')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name');
             $grid->column('order');
             $grid->column('enabled')->switch();

app/Admin/Controllers/BaseVideoCategoryController.php

@@ -39,7 +39,9 @@ class BaseVideoCategoryController extends AdminController
         return Grid::make(new BaseVideoCategory(), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name');
             //$grid->column('parent_id');
             $grid->column('order');

app/Admin/Controllers/BaseVideoController.php

@@ -40,7 +40,9 @@ class BaseVideoController extends AdminController
         return Grid::make(BaseVideo::with(['baseVideoCategory']), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title');
             $grid->column('base_video_category.name',admin_trans_label('category_name'));
             $grid->column('cover_image')->display(function ($image) {
@@ -49,7 +51,6 @@ class BaseVideoController extends AdminController
                 return CommonHelper::displayImage($dataImages,100);
             });
             $grid->column('order');
-            $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -63,7 +64,7 @@ class BaseVideoController extends AdminController
                 $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc')->orderBy('id','desc');
+            $grid->model()->orderBy("order",'desc')->orderBy('id','desc');
             //按钮
         });
     }
@@ -78,7 +79,6 @@ class BaseVideoController extends AdminController
     protected function detail($id)
     {
         return Show::make($id, BaseVideo::with(['baseVideoCategory']), function (Show $show) {
-            $show->field('id');
             $show->field('title');
             $show->field('base_video_category.name',admin_trans_field('category_name'));
             $show->field('cover_image')->as(function ($image) {
@@ -135,7 +135,6 @@ class BaseVideoController extends AdminController
                 ->dir(config("admin.upload.directory.image").'/video/'.date("Ymd"));//
             $form->url("video_url")->required();
             $form->editor('remark');
-            $form->switch('is_pinned')->default(0);
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');

app/Admin/Controllers/DistInquiryController.php

@@ -43,7 +43,9 @@ class DistInquiryController extends AdminController
             //指定视图，去掉删除按钮
             $grid->view('admin.grid.table');
             //字段
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('order_number');
             $grid->column('customer_name');
             $grid->column('company_name');

app/Admin/Repositories/DistAdminDistributor.php

@@ -103,7 +103,6 @@ class DistAdminDistributor extends EloquentRepository
             'created_at'=>Carbon::now(),
             'updated_at'=>Carbon::now(),
         ]);
-        $productRow->order = $productRow->id;
         $productRow->save();
         //生成默认tab
         $sitePagesTag = new SitePagesTag();

app/Distributor/Controllers/DistAppearanceController.php

@@ -36,7 +36,9 @@ class DistAppearanceController extends AdminDistController
         return Grid::make(new DistAppearance(), function (Grid $grid) use ($distInfo) {
             //指定视图，去掉删除按钮
             $grid->view('admin.grid.table');
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             // 标题
             $grid->column('title');
             // 封面图

app/Distributor/Controllers/DistInquiryController.php

@@ -39,7 +39,9 @@ class DistInquiryController extends AdminDistController
             //指定视图，去掉删除按钮
             $grid->view('admin.grid.table');
             //字段
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('order_number')->width('15%');
             $grid->column('customer_name');
             $grid->column('company_name');

app/Distributor/Controllers/DistProductCategoryController.php

@@ -42,35 +42,24 @@ class DistProductCategoryController extends AdminDistController
      */
     protected function grid()
     {
-      //  var_dump(Session::get('distributor'));
-
         return Grid::make(new DistProductCategory(), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            //$grid->model()->where('dist_user_id', 1);//这里限不了，改为仓库限制
-
-            $grid->column('id','ID')->bold();//->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name')->display(function ($name) {
                 $level = $this->level; // 获取当前行的 level 字段值
                 $prefix = str_repeat('&nbsp; ', $level * 2). ' <i class="fa fa-angle-right"></i>&nbsp; '; // 生成 level * 3 个加号
                 return $prefix . ' ' . html_entity_decode($name); // 拼接加号和名称
             });
-           // $grid->column('level');
             $grid->column('parent_id');
-            //$grid->column('distProductParameter.name',admin_trans_label('parameter_name'));
-            $grid->column('order');//->orderable();
-            $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at');//->sortable();
-//            $grid->filter(function (Grid\Filter $filter) {
-//                $filter->like('name');
-//            });
             $grid->disableViewButton();
             $grid->showQuickEditButton();
             $grid->enableDialogCreate();
             $grid->disableEditButton();
-
-            //$grid->quickSearch('name');
         });
     }
 
@@ -82,7 +71,6 @@ class DistProductCategoryController extends AdminDistController
     protected function form()
     {
         return Form::make(new DistProductCategory(), function (Form $form) {
-            //$form->display('id', 'ID');
             $form->select('parent_id', admin_trans_field('parent'))
                 ->options(DistProductCategory::selectMainOptions(function ($query) {
                     // 在这里定义查询条件
@@ -92,30 +80,21 @@ class DistProductCategoryController extends AdminDistController
                     return (int) $v;
                 });
             $form->text('name')->required();
+            //SEO
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.product_category').'/');
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');
             $form->switch('enabled')->default(1);
-            //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.product_category').'/');
-            })->options(admin_trans_array(config('dictionary.visibility')))
-                ->value(DistAdminUsersSetting::getValue('visibility'));
             //隐藏字段
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
-            $form->ignore(['visibility']);
             //新建时插入JS
             $form->creating(function (Form $form) {
                 CommonHelper::seoReplace('name','productCategory');
             });
-            //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
             // 在保存时写死dist_id
             $form->saving(function (Form $form) {
                 $form->dist_id =getDistributorId();

app/Distributor/Controllers/DistProductController.php

@@ -46,24 +46,25 @@ class DistProductController extends AdminDistController
      */
     protected function grid()
     {
-        return Grid::make(DistProduct::with(['distProductCategory','images']), function (Grid $grid) {
+
+        return Grid::make(DistProduct::with(['distProductCategory','images']), function (Grid $grid)  {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
             $grid->model()->where('dist_id', getDistributorId());
-            $grid->column('id','ID')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title');
             $grid->column('sku');
             $grid->column('dist_product_category.name',admin_trans_label('category_name'));
-            $grid->column('issuance_date');
             $grid->column('images')->display(function ($images) {
                 $images = $images->toArray();
                 $dataImages = array_column($images, 'image_url');
                 // 限制最多显示2个缩略图
-                $dataImages = array_slice($dataImages, 0, 2);
+                $dataImages = array_slice($dataImages, 0, 1);
                 return CommonHelper::displayImage($dataImages,100);
             });
             $grid->column('order');
-            $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -77,7 +78,7 @@ class DistProductController extends AdminDistController
                 $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array( config('dictionary.enabled')))->width(2);;
             });
             //排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc')->orderBy('id', 'desc');
+            $grid->model()->orderBy("order",'desc')->orderBy('id', 'desc');
             // 传入数组
             $grid->tools([
                 new DistProductImport(),
@@ -102,7 +103,6 @@ class DistProductController extends AdminDistController
             if ($show->model()->dist_id !== getDistributorId()) {
                 abort(404);
             }
-            $show->field('id');
             $show->field('title');
             $show->field('sku');
             $show->field('dist_product_category.name',admin_trans_label('category_name'));
@@ -131,8 +131,6 @@ class DistProductController extends AdminDistController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $show->field('order');
-            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
@@ -141,6 +139,8 @@ class DistProductController extends AdminDistController
             $show->field('slug',admin_trans_label('url_and_handle'))->as(function ($value) {
                 return getSiteDomain().config('dictionary.site_url.products').'/'.$value;
             });
+            $show->field('order');
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
         });
     }
 
@@ -183,29 +183,20 @@ class DistProductController extends AdminDistController
                     return $reslut;
                 });
             $form->editor('content');
-            $form->switch('is_pinned')->default(0);
+            //SEO
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.products').'/');
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');
             $form->switch('enabled')->default(1);
-            //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.products').'/');
-            })->options(admin_trans_array(config('dictionary.visibility')))
-                ->value(DistAdminUsersSetting::getValue('visibility'));
             //隐藏字段
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
-            $form->ignore(['visibility']);
             //插入JS
             $this->addParametersJs();
             //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
             // 在保存时进行验证
             $form->saving(function (Form $form) {
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id

app/Distributor/Controllers/DistVideoCategoryController.php

@@ -36,7 +36,9 @@ class DistVideoCategoryController extends AdminDistController
         return Grid::make(new DistVideoCategory(), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name');
             //$grid->column('parent_id');
             $grid->column('order');
@@ -65,30 +67,21 @@ class DistVideoCategoryController extends AdminDistController
         return Form::make(new DistVideoCategory(), function (Form $form) {
             //$form->display('id');
             $form->text('name')->required();
+            //SEO
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.video_category').'/');
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');
             $form->switch('enabled')->default(1);
-            //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.video_category').'/');
-            })->options(admin_trans_array(config('dictionary.visibility')))
-                ->value(DistAdminUsersSetting::getValue('visibility'));
             //隐藏
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
-            $form->ignore(['visibility']);
             //新建时插入JS
             $form->creating(function (Form $form) {
                 CommonHelper::seoReplace('name','videoCategory');
             });
-            //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
             //保存前
             $form->saving(function (Form $form) {
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id

app/Distributor/Controllers/DistVideoController.php

@@ -42,7 +42,9 @@ class DistVideoController extends AdminDistController
         return Grid::make(DistVideo::with(['distVideoCategory']), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title');
             $grid->column('dist_video_category.name',admin_trans_label('category_name'));
             $grid->column('cover_image')->display(function ($image) {
@@ -51,7 +53,6 @@ class DistVideoController extends AdminDistController
                 return CommonHelper::displayImage($dataImages,150);
             });
             $grid->column('order');
-            $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -67,7 +68,7 @@ class DistVideoController extends AdminDistController
 
             });
             //权限与排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
+            $grid->model()->orderBy("order",'desc');
             $grid->model()->where('dist_id', getDistributorId());
         });
     }
@@ -83,7 +84,7 @@ class DistVideoController extends AdminDistController
     {
         return Show::make($id, DistVideo::with(['distVideoCategory']), function (Show $show) {
 
-            $show->field('id');
+           // $show->field('id');
             $show->field('title');
             $show->field('dist_video_category.name',admin_trans_label('category_name'));
             $show->field('cover_image')->as(function ($image) {
@@ -112,8 +113,6 @@ class DistVideoController extends AdminDistController
                 return $html;
             })->unescape();
             $show->field('remark')->unescape();
-            $show->field('order');
-            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
             // SEO
@@ -123,6 +122,8 @@ class DistVideoController extends AdminDistController
             $show->field('slug',admin_trans_label('url_and_handle'))->as(function ($value) {
                 return getSiteDomain().config('dictionary.site_url.pages').'/'.$value;
             });
+            $show->field('order');
+            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
         });
     }
 
@@ -147,31 +148,22 @@ class DistVideoController extends AdminDistController
                 ->dir(config("distributor.upload.directory.image").'/video/'.date("Ymd"));//
             $form->url("video_url", admin_trans_label('video_url'))->required();
             $form->editor('remark');
-            $form->switch('is_pinned')->default(0);
+            //SEO
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.video').'/');
             $form->number('order')
                 ->default(0)
                 ->rules('numeric');
             $form->switch('enabled')->default(1);
-            //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.video').'/');
-            })->options(admin_trans_array(config('dictionary.visibility')))
-                ->value(DistAdminUsersSetting::getValue('visibility'));
             //隐藏
             $form->hidden('dist_id'); // 隐藏dist_id字段,用于保存
-            $form->ignore(['visibility']);
+
             //新建时插入JS
             $form->creating(function (Form $form) {
                 CommonHelper::seoReplace();
             });
-            //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
             $form->saving(function (Form $form) {
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id
 

app/Distributor/Controllers/ImportProductController.php

@@ -60,7 +60,9 @@ class ImportProductController extends AdminDistController
     protected function grid()
     {
         return Grid::make(BaseProduct::with(['baseProductCategory','images']), function (Grid $grid) {
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title');
             $grid->column('sku');
             $grid->column('base_product_category.name',admin_trans_label('category_name'));
@@ -105,7 +107,7 @@ class ImportProductController extends AdminDistController
     protected function detail($id)
     {
         return Show::make($id, BaseProduct::with(['baseProductCategory','images']), function (Show $show) {
-            $show->field('id');
+           // $show->field('id');
             $show->field('title');
             $show->field('sku');
             $show->field('base_product_category.name',admin_trans_label('category_name'));

app/Distributor/Controllers/SiteBannerController.php

@@ -35,8 +35,11 @@ class SiteBannerController extends AdminDistController
     protected function grid()
     {
         return Grid::make(new SiteBanner(), function (Grid $grid) {
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title')->width('25%');
+            $grid->column('subtitle')->width('25%');
             $grid->column('image_url',admin_trans_label('images'))->display(function ($image) {
                 // 开始生成 HTML
                 $dataImages = [$image];
@@ -45,9 +48,6 @@ class SiteBannerController extends AdminDistController
             $grid->column('position');
             $grid->column('order');
             $grid->column('show')->switch();
-            //$grid->column('created_at');
-           // $grid->column('updated_at')->sortable();
-
             $grid->disableViewButton();
             $grid->showQuickEditButton();
             $grid->enableDialogCreate();
@@ -64,7 +64,8 @@ class SiteBannerController extends AdminDistController
     protected function form()
     {
         return Form::make(new SiteBanner(), function (Form $form) {
-            $form->textarea('title')->required();
+            $form->text('title')->required();
+            $form->text('subtitle');
             $form->image("image_url", admin_trans_label('images'))
                 ->autoUpload()
                 ->uniqueName()

app/Distributor/Controllers/SitePagesController.php

@@ -64,7 +64,9 @@ class SitePagesController extends AdminDistController
             $pageType = getTempValue('location');
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('title')->width('20%');
             $grid->column('pagesTag',admin_trans_label('tags'))->pluck('name')->label();
             $grid->column('cover_image')->display(function ($image) {
@@ -109,7 +111,7 @@ class SitePagesController extends AdminDistController
             //页面类型
             $pageType = getTempValue('location');
             $pagesTag  = $show->model()->pagesTag->toArray();
-            $show->field('id');
+            //$show->field('id');
             $show->field('title');
             $show->field('pagesTag',admin_trans_label('tags'))->as(function ($value) use ($pagesTag) {
                 return array_column($pagesTag,'name');
@@ -126,7 +128,6 @@ class SitePagesController extends AdminDistController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $show->field('status')->using(admin_trans_array(config('dictionary.pages_status')));
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('seo_title');
@@ -135,6 +136,7 @@ class SitePagesController extends AdminDistController
             $show->field('slug',admin_trans_label('url_and_handle'))->as(function ($value) {
                 return getSiteDomain().config('dictionary.site_url.pages').'/'.$value;
             });
+            $show->field('status')->using(admin_trans_array(config('dictionary.pages_status')));
         });
     }
 
@@ -170,28 +172,21 @@ class SitePagesController extends AdminDistController
                 ->maxSize(config('distributor.upload.oss_image.max_size'))
                 ->dir(config("distributor.upload.directory.image").'/pages/'.date("Ymd"));
             $form->editor('content')->required();
-            $form->switch('status',admin_trans_label('publish'))->default(1);
             //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.pages').'/');
-            })->options(admin_trans_array(config('dictionary.visibility')))
-              ->value(DistAdminUsersSetting::getValue('visibility'));
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(4, 2)->prepend(getSiteDomain().config('dictionary.site_url.pages').'/');
+            $form->switch('status',admin_trans_label('publish'))->default(1);
             //隐藏字段
             $form->hidden('dist_id',);
             $form->hidden('page_type');
-            $form->ignore(['visibility']);
+
             //新建时插入JS
             $form->creating(function (Form $form) {
                 CommonHelper::seoReplace();
             });
-            //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
+
             //保存前
             $form->saving(function (Form $form) use ($pageType) {
                 //强制写死dist_id

app/Distributor/Controllers/SitePagesTagController.php

@@ -40,7 +40,9 @@ class SitePagesTagController extends AdminDistController
         return Grid::make(new SitePagesTag(), function (Grid $grid) {
             //默认分页条数
             $grid->paginate(config('admin.per_page'));
-            $grid->column('id')->sortable();
+            $grid->column('id')->display(function () {
+                return $this->_index+1;
+            });
             $grid->column('name')->width('20%');
             $grid->column('seo_title')->width('20%');
             $grid->column('seo_keywords');
@@ -71,26 +73,17 @@ class SitePagesTagController extends AdminDistController
         return Form::make(new SitePagesTag(), function (Form $form) {
             $form->text('name')->required();
             //SEO
-            $form->radio('visibility')->when(1,function (Form $form) {
-                $form->text('seo_title');
-                $form->text('seo_keywords');
-                $form->textarea('seo_description');
-                $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.tags').'/');
-            })->options(config('dictionary.visibility'))
-              ->value(DistAdminUsersSetting::getValue('visibility'));
+            $form->text('seo_title');
+            $form->text('seo_keywords');
+            $form->text('seo_description');
+            $form->text('slug',admin_trans_label('url_and_handle'))->width(9, 2)->prepend(getSiteDomain().config('dictionary.site_url.tags').'/');
 
             //$form->text('slug');
             $form->hidden('dist_id',);
-            $form->ignore(['visibility']);
             //新建时插入JS
             $form->creating(function (Form $form) {
                 CommonHelper::seoReplace('name','pagesTag');
             });
-            //提交前
-            $form->submitted(function (Form $form) {
-                //保存可见性配置
-                DistAdminUsersSetting::setValue('visibility', $form->input('visibility'));
-            });
             //保存前
             $form->saving(function (Form $form) {
                 //强制写死dist_id

app/Models/DistAdminDistributor.php

@@ -11,6 +11,12 @@ class DistAdminDistributor extends Model
 	use HasDateTimeFormatter;
     protected $table = 'dist_admin_distributor';
 
+    //把null转为''
+    public function setNameAttribute($value)
+    {
+        $this->attributes['name'] = $value ?? '';
+    }
+
     /*
      * 用户一对多关联
      */

lang/zh_CN/global.php

@@ -90,6 +90,7 @@ return [
         'position'              => '位置',
         'banner_url'            => '跳转链接',
         'template_file'         => '模板文件',
+        'subtitle'              => '副标题',
     ],
     'labels' => [
         'list'         => '列表',