修BUG

.env.dev

@@ -4,11 +4,13 @@ APP_ENV=local
 APP_KEY=base64:bdomFa+r6S774rRyFNeb4pCBxVe4WbuzAzk+LyP86+k=
 #上线时需要改成false
 APP_DEBUG=true
-#后台网站根域名
+#后台网站根域名,暂时未用到
 APP_URL=http://localhost
+#是否https
+ADMIN_HTTPS=true
 
 #后台网站主域名，不含http://www.
-TOP_DOMAIN=mietubl.com
+TOP_DOMAIN=mietubl.com.cn
 #分销商前端站点IP,用于提醒分销商绑定域名IP
 DIST_SITE_IP = 127.0.0.1
 #分销商前端站点端口，用于访问站点

app/Admin/Controllers/BaseProductController.php

@@ -109,13 +109,13 @@ class BaseProductController extends AdminController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $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')));
+            $show->field('created_at');
+            $show->field('updated_at');
         });
     }
 

app/Distributor/Controllers/DistProductController.php

@@ -131,8 +131,6 @@ class DistProductController extends AdminDistController
                 return CommonHelper::displayImage($dataImages,150);
             })->unescape();
             $show->field('content')->unescape();
-            $show->field('created_at');
-            $show->field('updated_at');
             $show->field('seo_title');
             $show->field('seo_keywords');
             $show->field('seo_description');
@@ -141,6 +139,8 @@ class DistProductController extends AdminDistController
             });
             $show->field('order');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
+            $show->field('created_at');
+            $show->field('updated_at');
         });
     }
 

app/Distributor/Controllers/DistVideoCategoryController.php

@@ -39,7 +39,7 @@ class DistVideoCategoryController extends AdminDistController
             $grid->column('id')->display(function () {
                 return $this->_index+1;
             });
-            $grid->column('name');
+            $grid->column('name')->width('20%');
             //$grid->column('parent_id');
             $grid->column('order');
             $grid->column('enabled')->switch();

app/Distributor/Controllers/ImportProductController.php

@@ -68,7 +68,7 @@ class ImportProductController extends AdminDistController
             $grid->column('base_product_category.name',admin_trans_label('category_name'));
             $grid->column('keywords');
             $grid->column('description');
-            $grid->column('issuance_date');
+            //$grid->column('issuance_date');
             // 筛选
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();

app/Distributor/Controllers/SitePagesController.php

@@ -67,7 +67,7 @@ class SitePagesController extends AdminDistController
             $grid->column('id')->display(function () {
                 return $this->_index+1;
             });
-            $grid->column('title')->width('30%');
+            $grid->column('title')->width('25%');
             $grid->column('pagesTag',admin_trans_label('tags'))->pluck('name')->label()->width('15%');
             $grid->column('cover_image')->display(function ($image) {
                 // 开始生成 HTML

app/Distributor/Controllers/SitePagesTagController.php

@@ -45,7 +45,7 @@ class SitePagesTagController extends AdminDistController
             });
             $grid->column('name')->width('20%');
             $grid->column('seo_title')->width('20%');
-            $grid->column('seo_keywords');
+            $grid->column('seo_keywords')->width('20%');
             $grid->column('created_at');
             //$grid->column('seo_description');
             $grid->filter(function (Grid\Filter $filter) {

app/Models/DistAdminDistributor.php

@@ -37,17 +37,21 @@ class DistAdminDistributor extends Model
     {
         $domain = '';
         $row = $this->where('id', $distId)->first();
+        $http = 'http://';
+        if (env('ADMIN_HTTPS') == true) {
+            $http = 'https://';
+        }
         if ($row) {
             if ($type == 0) {
                 if ($row->domain_type == 0) {
-                    $domain = 'http://'.$row->secondary_domain;
+                    $domain = $http.$row->secondary_domain;
                 } else {
-                    $domain = 'http://'.$row->custom_domain;
+                    $domain = $http.$row->custom_domain;
                 }
             } else if ($type == 1) {
-                $domain = 'http://'.$row->secondary_domain;
+                $domain = $http.$row->secondary_domain;
             } else {
-                $domain = 'http://'.$row->custom_domain;
+                $domain = $http.$row->custom_domain;
             }
         }
         if (env('DIST_SITE_PORT') != 80) {