moshaorui před 4 měsíci
rodič
revize
c99f160c79

+ 15 - 16
app/Admin/Controllers/DistAdminDistributorController.php

@@ -47,14 +47,13 @@ class DistAdminDistributorController extends AdminController
             $grid->paginate(config('admin.per_page'));
             //指定视图,去掉删除按钮
             $grid->view('admin.grid.table');
-
             $grid->column('id')->sortable();
             $grid->column('client_code',admin_trans_label('client_code'))->width('15%');
             $grid->column('dist_email',admin_trans_label('email'));
-            $grid->column('dist_contact_number',admin_trans_label('contact_number'));
-            $grid->column('domain_type')->using(admin_trans_array(config('dictionary.domain_type')));
-            $grid->column('secondary_domain');
-            $grid->column('custom_domain');
+//            $grid->column('dist_contact_number',admin_trans_label('contact_number'));
+//            $grid->column('domain_type')->using(admin_trans_array(config('dictionary.domain_type')));
+//            $grid->column('secondary_domain');
+//            $grid->column('custom_domain');
             $grid->column('country',);
             $grid->column('enabled')->switch();
             $grid->column('created_at')->sortable();
@@ -97,9 +96,9 @@ class DistAdminDistributorController extends AdminController
             $show->field('dist_contact_number',admin_trans_label('contact_number'));
             $show->field('country');
             $show->field('address');
-            $show->field('domain_type')->using([0=>admin_trans_field('secondary_domain'),1=>admin_trans_field('custom_domain')]);
-            $show->field('secondary_domain');
-            $show->field('custom_domain');
+//            $show->field('domain_type')->using([0=>admin_trans_field('secondary_domain'),1=>admin_trans_field('custom_domain')]);
+//            $show->field('secondary_domain');
+//            $show->field('custom_domain');
             $show->field('created_at');
             $show->field('updated_at');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
@@ -124,14 +123,14 @@ class DistAdminDistributorController extends AdminController
                 ->options(BaseIso3166::selectOptions())
                 ->width(9,3)->required();
             $form->text('address')->width(9,3);
-            $form->radio('domain_type')->width(9,3)
-                ->options([0=>admin_trans_field('secondary_domain'),1=>admin_trans_field('custom_domain')])
-                ->default(0)
-                ->required();
-            $form->text('secondary_domain')->width(9,3)
-                ->required()
-                ->help('Please enter the domain name, such as demo.'.env('TOP_DOMAIN'));
-            $form->text('custom_domain')->width(9,3)->help('Please enter the domain name, such as www.example.com');
+//            $form->radio('domain_type')->width(9,3)
+//                ->options([0=>admin_trans_field('secondary_domain'),1=>admin_trans_field('custom_domain')])
+//                ->default(0)
+//                ->required();
+//            $form->text('secondary_domain')->width(9,3)
+//                ->required()
+//                ->help('Please enter the domain name, such as demo.'.env('TOP_DOMAIN'));
+//            $form->text('custom_domain')->width(9,3)->help('Please enter the domain name, such as www.example.com');
             $form->switch('enabled')->width(9,3)->default(1);
 
             //保存后回调

+ 9 - 0
app/Admin/Controllers/DistSiteController.php

@@ -45,6 +45,7 @@ class DistSiteController extends AdminController
             $grid->column('client_code',admin_trans_label('distributor_code'))->width('15%');
             $grid->column('site_name');
             $grid->column('appearance.title' ,admin_trans_field('appearance'));
+            $grid->column('domain_type')->using(admin_trans_array(config('dictionary.domain_type')));
             $grid->column('secondary_domain');
             $grid->column('custom_domain');
             $grid->column('updated_at')->sortable();
@@ -135,6 +136,14 @@ class DistSiteController extends AdminController
     {
         return Form::make(new DistAdminDistributor(), function (Form $form) {
             $form->column(6, function (Form $form) {
+                $form->radio('domain_type')->width(9,3)
+                    ->options([0=>admin_trans_field('secondary_domain'),1=>admin_trans_field('custom_domain')])
+                    ->default(0)
+                    ->required();
+                $form->text('secondary_domain')->width(9,3)
+                    ->required()
+                    ->help('Please enter the domain name, such as demo.'.env('TOP_DOMAIN'));
+                $form->text('custom_domain')->width(9,3)->help('Please enter the domain name, such as www.example.com');
                 $form->text('site_name')->width(9,3)->required();
                 $form->text('seo_title')->width(9,3)->required();
                 $form->text('seo_keywords')->width(9,3);