Merge branch 'hotfix-phoenix' into develop

app/Admin/Controllers/v3/BannersController.php

@@ -34,7 +34,7 @@ class BannersController extends AdminController
             $grid->column('title');
             $grid->column('cover_url')->image('',100);
             $grid->column('bg_color')->display(function($bgColor){
-                return "<span style='display: block;color: $bgColor;width: 10px;height: 20px;'></span>";
+                return "<span style='display: block;background: $bgColor;width: 30px;height: 20px;'></span>";
             });
             $grid->column('cover_type_text');
             $grid->column('path');

resources/lang/zh-CN/banners.php

@@ -21,6 +21,7 @@ return [
         'status_text' => '状态',
         'type' => '位置',
         'type_text' => '位置',
+        'bg_color' => '色值',
     ],
     'options' => [
     ],