diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index 29f2596..4783034 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -30,21 +30,14 @@ class AgentProductController extends AdminController $grid->model()->where('agent_id', $agent_id); $grid->column('id')->sortable(); - $grid->column('product.title', '产品名称'); - $grid->column('product_id', '产品信息') + $grid->column('product.picture', '产品图片')->image(60, 60); + $grid->column('product.title', '产品名称')->limit(15); + $grid->column('product_id', '产品详情') ->display('查看') ->modal(function ($v) { - $titles = [ - '供应商', - '产品标题', - '产品图片', - '原价', - '现价', - '销量', - '库存', - ]; + $titles = ['供应商', '产品标题', '产品图片', '原价', '现价', '销量', '库存']; $pic = isset($this->product->picture) - ? '' + ? "product->picture}\" style=\"max-width:80px;max-height:200px;cursor:pointer\" class=\"img img-thumbnail\">" : ''; $data = [[ $this->product->supplier->name ?? '', @@ -63,9 +56,11 @@ class AgentProductController extends AdminController $channels = Channel::where('agent_id', $agent_id)->pluck('name', 'id')->toArray(); $grid->column('channel_id', '频道') - ->display(function ($v) use ($grid, $channels) { - $arr = array_flip(explode(',', $v)); - return join(',', array_intersect_key($channels, $arr)); + ->display('查看') + ->modal('关联频道', function ($modal) use ($channels) { + $data = array_flip(explode(',', $this->channel_id)); + $data = array_intersect_key($channels, $data); + return Table::make(['频道ID', '频道名称'], $data); }); $grid->column('category.name', '分类')->label(); $grid->column('status') @@ -130,7 +125,7 @@ class AgentProductController extends AdminController $form->display('id'); $form->hidden('agent_id')->value($agent_id); - $form->selectTable('product_id') + $form->multipleSelectTable('product_id', '供应商产品') ->title('选择产品') ->dialogWidth('80%;min-width:825px;') ->from(SelectProduct::make()) diff --git a/app/AdminAgent/Renderable/SelectProduct.php b/app/AdminAgent/Renderable/SelectProduct.php index 0fa0325..fabe59a 100644 --- a/app/AdminAgent/Renderable/SelectProduct.php +++ b/app/AdminAgent/Renderable/SelectProduct.php @@ -23,8 +23,8 @@ class SelectProduct extends LazyRenderable $grid->disableActions(); $grid->disableBatchDelete(); - $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); $grid->model()->where('status', ProductStatus::ON_SALE); + $grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商'); $grid->column('id'); $grid->column('supplier.name', '供应商');