moshaorui 4 ヶ月 前
コミット
a7e51b2c93

+ 1 - 1
app/Admin/Controllers/DistAdminDistributorController.php

@@ -42,7 +42,7 @@ class DistAdminDistributorController extends AdminController
             $grid->view('admin.grid.table');
 
             $grid->column('id')->sortable();
-            $grid->column('company_name');
+            $grid->column('company_name')->width('30%');
             $grid->column('site_name');
             $grid->column('domain_type',admin_trans_label('domain'))->display(function ($domainType) {
                 $title = "";

+ 1 - 1
app/Admin/Controllers/DistAdminUserController.php

@@ -39,7 +39,7 @@ class DistAdminUserController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('username');
             $grid->column('name');
-            $grid->column('distributor.company_name',admin_trans_label('distributor_company_name'));
+            $grid->column('distributor.company_name',admin_trans_label('distributor_company_name'))->width('30%');
             $grid->column('language')->using(config('dictionary.languages'));
             $grid->column('enabled')->switch();
             $grid->column('created_at');

+ 3 - 3
app/Admin/Controllers/DistInquiryController.php

@@ -41,17 +41,17 @@ class DistInquiryController extends AdminController
             $grid->column('customer_name');
             $grid->column('company_name');
             $grid->column('whats_app');
-            $grid->column('email');
+            //$grid->column('email');
             $grid->column('consulting_products');
             //$grid->column('distributor.username', 'Distributor Username');
-            $grid->column('distributor.company_name', admin_trans_label('distributor_company_name'));
+            $grid->column('distributor.company_name', admin_trans_label('distributor_company_name'))->width('20%');;
             $grid->column('status')->using(admin_trans_array(config('dictionary.inquiryStatus')))->label([
                 0 => 'default',
                 1 => 'info',
                 2 => 'success',
             ])->filter(Grid\Column\Filter\In::make(admin_trans_array(config('dictionary.inquiryStatus'))));
             $grid->column('created_at');
-            $grid->column('updated_at')->sortable();
+            //$grid->column('updated_at')->sortable();
             //筛选
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();

+ 2 - 2
app/Admin/Repositories/DistAppearancePublishList.php

@@ -23,13 +23,13 @@ class DistAppearancePublishList extends EloquentRepository
         $model = new Model();
         $row = $model->where('appearance_id',$appearanceId)->where('dist_id',$distId)->first();
         if ($row) {
-            $row->template_update_code = time();
+            $row->template_update_code = generateVersionNumber();
             $row->save();
         } else {
             $model->appearance_id = $appearanceId;
             $model->dist_id = $distId;
             $model->template_version = '1.0';
-            $model->template_update_code = time();
+            $model->template_update_code = generateVersionNumber();
             $model->template_local_code = '';
             $model->save();
         }