修BUG

app/Admin/Controllers/BaseVideoController.php

@@ -43,7 +43,7 @@ class BaseVideoController extends AdminController
             $grid->column('id')->display(function () {
                 return $this->_index+1;
             });
-            $grid->column('title')->width('30%');
+            $grid->column('title')->width('25%');
             $grid->column('base_video_category.name',admin_trans_label('category_name'));
             $grid->column('cover_image')->display(function ($image) {
                 // 开始生成 HTML

app/Admin/Controllers/DistInquiryController.php

@@ -47,19 +47,17 @@ class DistInquiryController extends AdminController
                 return $this->_index+1;
             });
             $grid->column('order_number');
-            $grid->column('customer_name');
-            $grid->column('company_name');
+            $grid->column('customer_name')->width('15%');
+            $grid->column('company_name')->width('15%');
             $grid->column('whats_app');
-            //$grid->column('email');
-            $grid->column('consulting_products');
-            //$grid->column('distributor.username', 'Distributor Username');
-            $grid->column('distributor.company_name', admin_trans_label('distributor_company_name'))->width('20%');;
+            $grid->column('consulting_products')->width('15%');
+            $grid->column('distributor.client_code', admin_trans_label('distributor_code'))->width('15%');
             $grid->column('status')->using(admin_trans_array(config('dictionary.inquiryStatus')))->label([
                 0 => 'default',
                 1 => 'info',
                 2 => 'success',
-            ]);
-            $grid->column('created_at');
+            ])->width('10%');
+            $grid->column('created_at')->width('10%');
             //$grid->column('updated_at')->sortable();
             //筛选
             $grid->filter(function (Grid\Filter $filter) {
@@ -68,7 +66,7 @@ class DistInquiryController extends AdminController
                 $filter->equal('order_number')->width(2);
                 $filter->equal('company_name')->width(2);
                 $filter->equal('customer_name')->width(2);
-                $filter->like('distributor.name',admin_trans_label('distributor_company_name'))->width(2);
+                $filter->like('distributor.client_code',admin_trans_label('distributor_code'))->width(2);
                 $inquiryStatus = admin_trans_array(config('dictionary.inquiryStatus'));
                 $filter->equal('status')->select($inquiryStatus)->width(2);
             });
@@ -104,14 +102,17 @@ class DistInquiryController extends AdminController
             $show->field('consulting_products');
             $show->field('freight_forwarder')->using(admin_trans_array(config('dictionary.freight_forwarder')));
             $show->field('business_model');
-            $show->field('allocate_time');
-            $show->field('distributor.company_name',admin_trans_label('distributor_company_name'));
             $show->field('referer_url');
-            $show->field('content');
+            $show->field('content')->as(function ($content) {
+                return "<pre>{$content}</pre>";
+            })->unescape();
             $show->field('ip_address');
             $show->field('status')->using(admin_trans_array(config('dictionary.inquiryStatus')));
             $show->field('created_at');
             $show->field('updated_at');
+            $show->divider();
+            $show->field('allocate_time');
+            $show->field('distributor.distributor_code',admin_trans_label('distributor_code'));
             //按钮
             $show->disableDeleteButton();
             $show->disableEditButton();

app/Admin/Controllers/DistSiteController.php

@@ -94,6 +94,7 @@ class DistSiteController extends AdminController
             $show->field('seo_title');
             $show->field('seo_keywords');
             $show->field('seo_description');
+
             $show->divider();
             $show->field('company_name');
             $show->field('company_address');
@@ -106,7 +107,8 @@ class DistSiteController extends AdminController
             $show->field('youtube');
             $show->field('linkedin');
             $show->field('tiktok');
-            $show->field('remark');
+            $show->field('copy_right');
+            $show->field('statistics_js');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');

app/Admin/Forms/InquiryAssignment.php

@@ -8,6 +8,7 @@ use App\Admin\Repositories\DistInquiry;
 use App\Admin\Renderable\DistDistributorTable;
 use Dcat\Admin\Models\DistAdminUser;
 use Dcat\Admin\Traits\LazyWidget;
+use App\Models\DistAdminDistributor;
 
 class InquiryAssignment extends Form
 {
@@ -33,6 +34,7 @@ class InquiryAssignment extends Form
     {
         $this->selectTable('distId', 'Select Distributor')
             ->title('distId')
+            ->model(DistAdminDistributor::class, 'id', 'client_code')
             ->from(DistDistributorTable::make());
         // 设置隐藏表单，传递用户id
         $this->hidden('id')->attribute('id', 'inquiryIds');

app/Distributor/Controllers/DistInquiryController.php

@@ -43,18 +43,15 @@ class DistInquiryController extends AdminDistController
                 return $this->_index+1;
             });
             $grid->column('order_number')->width('15%');
-            $grid->column('customer_name');
-            $grid->column('company_name');
+            $grid->column('customer_name')->width('15%');
+            $grid->column('company_name')->width('15%');
             $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('status')->using(admin_trans_array(config('dictionary.inquiryStatus')))->label([
                 0 => 'default',
                 1 => 'info',
                 2 => 'success',
             ]);
-           // $grid->column('created_at')->sortable();
             //筛选
             $grid->filter(function (Grid\Filter $filter) {
                 $inquiryStatus = admin_trans_array(config('dictionary.inquiryStatus'));
@@ -97,12 +94,10 @@ class DistInquiryController extends AdminDistController
             $show->field('whats_app');
             $show->field('email');
             $show->field('consulting_products');
-           // $show->field('freight_forwarder');
-            //$show->field('business_model');
-            $show->field('content');
-            //$show->field('ip_address');
+            $show->field('content')->as(function ($content) {
+                return "<pre>{$content}</pre>";
+            })->unescape();
             $show->field('status')->using(config('dictionary.inquiryStatus'));
-            //$show->field('created_at');
             //按钮
             $show->disableDeleteButton();
             $show->disableEditButton();

app/Distributor/Controllers/DistVideoController.php

@@ -45,7 +45,7 @@ class DistVideoController extends AdminDistController
             $grid->column('id')->display(function () {
                 return $this->_index+1;
             });
-            $grid->column('title')->width('30%');
+            $grid->column('title')->width('25%');
             $grid->column('dist_video_category.name',admin_trans_label('category_name'));
             $grid->column('cover_image')->display(function ($image) {
                 // 开始生成 HTML

lang/en/global.php

@@ -163,7 +163,8 @@ return [
         'secondary_domain'    => 'Secondary Domain',
         'attribute'       => 'Attribute',
         'landing_page' => 'Landing Page',
-        'video_help' => 'Help'
+        'video_help' => 'Help',
+        'distributor_code' => 'Distributor Code',
     ],
     'options' => [
         //

lang/zh_CN/global.php

@@ -167,6 +167,7 @@ return [
         'attribute'       => '属性',
         'landing_page' => '独立页',
         'video_help'   => '帮助',
+        'distributor_code' => '分销商编码',
     ],
     'options' => [
         //