From 98fa56a444237fd8db31b3b24a4dddfaea6374d0 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 18 Sep 2020 20:55:10 +0800
Subject: [PATCH] =?UTF-8?q?banners-=E6=B7=BB=E5=8A=A0=E8=89=B2=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/v3/BannersController.php      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/v3/BannersController.php b/app/Admin/Controllers/v3/BannersController.php
index 92576a9..62867cd 100644
--- a/app/Admin/Controllers/v3/BannersController.php
+++ b/app/Admin/Controllers/v3/BannersController.php
@@ -20,13 +20,22 @@ class BannersController extends AdminController
     protected function grid()
     {
         return Grid::make(new Banners(), function (Grid $grid) {
+            $marketList = MarketModel::getMarket();
             $grid->column('id')->sortable();
-            $grid->column('market_id')->display(function($markerId){
-                $market = MarketModel::getMarketInfo($markerId,'name');
-                return empty($market) ? '' : $market['name'];
+            $grid->column('market_ids','适用市场')->display(function($marketIds) use($marketList){
+                $item = '';
+                if(!empty($marketIds)){
+                    foreach($marketIds as $value){
+                        $item .= isset($marketList[$value])?$marketList[$value].'</br>' : '';
+                    }
+                }
+                return $item;
             });
             $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>";
+            });
             $grid->column('cover_type_text');
             $grid->column('path');
             $grid->column('path_type_text');
@@ -63,6 +72,7 @@ class BannersController extends AdminController
                 $show->width(6)->field('sub_title');
                 $show->width(6)->field('cover_type_text');
                 $show->width(6)->field('cover')->image();
+                $show->width(6)->field('bg_color')->color();
                 $show->width(6)->field('type_text');
             });
             $show->row(function (Show\Row $show) {
@@ -89,7 +99,7 @@ class BannersController extends AdminController
                 $form->hidden('id');
                 // 市场
                 $marketList = MarketModel::getMarket();
-                $form->select('market_id')->options($marketList)->default(0);
+                $form->hidden('market_id')->options($marketList)->default(0);
                 // 多个市场
                 $form->multipleSelect('market_ids')->options($marketList);
                 $form->select('type')->options(BannersModel::$_TYPE)->required();
@@ -105,6 +115,7 @@ class BannersController extends AdminController
                     });
             });
             $form->column(6, function (Form $form) {
+                $form->color('bg_color')->required()->default('#FF7B21');
                 $form->image('cover')->autoUpload()->required()->uniqueName();
                 $form->select('cover_type')->options(BannersModel::$_COVER_TYPE)->required();
                 $form->text('path')->default('');