diff --git a/app/AdminAgent/Controllers/DemandBiddingController.php b/app/AdminAgent/Controllers/DemandBiddingController.php
index d59d320..5d40948 100755
--- a/app/AdminAgent/Controllers/DemandBiddingController.php
+++ b/app/AdminAgent/Controllers/DemandBiddingController.php
@@ -27,7 +27,13 @@ class DemandBiddingController extends AdminController
$grid->column('price');
$grid->column('comment');
$grid->column('demand.title','竞拍标题');
- $grid->column('demand.comment','竞拍内容');
+ $grid->column('demand.comment','竞拍内容')
+ ->display('查看')
+ ->modal('详情',function ($modal) {
+ $modal->xl();
+ return $this->demand->comment;
+ });
+
$grid->column('state','状态')->using(DemandTraits::$biddingState)->dot(
[
'yellow',
diff --git a/app/AdminGuide/Controllers/DemandBiddingController.php b/app/AdminGuide/Controllers/DemandBiddingController.php
index f11bd42..39ee223 100755
--- a/app/AdminGuide/Controllers/DemandBiddingController.php
+++ b/app/AdminGuide/Controllers/DemandBiddingController.php
@@ -27,7 +27,13 @@ class DemandBiddingController extends AdminController
$grid->column('price');
$grid->column('comment');
$grid->column('demand.title','竞拍标题');
- $grid->column('demand.comment','竞拍内容');
+ $grid->column('demand.comment','竞拍内容')
+ ->display('查看')
+ ->modal('详情',function ($modal) {
+ $modal->xl();
+ return $this->demand->comment;
+ });
+
$grid->column('state','状态')->using(DemandTraits::$biddingState)->dot(
[
'yellow',
diff --git a/app/AdminSupplier/Controllers/DemandBiddingController.php b/app/AdminSupplier/Controllers/DemandBiddingController.php
index fe695a5..02078a9 100755
--- a/app/AdminSupplier/Controllers/DemandBiddingController.php
+++ b/app/AdminSupplier/Controllers/DemandBiddingController.php
@@ -53,7 +53,7 @@ class DemandBiddingController extends AdminController
return $this->state == 1 && $this->bidding_user_type == DemandTraits::$col[1] && empty($this->demand->demand_product_id);
})
->then(function (Grid\Column $column) {
- $column->append('绑定产品');
+ $column->append('添加中标产品');
})
->if(function (){
return $this->state == 1 && $this->bidding_user_type == DemandTraits::$col[1] && !empty($this->demand->demand_product_id);
@@ -114,7 +114,7 @@ class DemandBiddingController extends AdminController
->title('选择产品')
->dialogWidth('50%;min-width:600px;') //不起作用
->from(SelectProduct::make())
- ->model(DemandProduct::class, 'id', 'title');
+ ->model(DemandProduct::class);
}else{
$form->text('price');
$form->textarea('comment');
diff --git a/app/AdminSupplier/Renderable/SelectProduct.php b/app/AdminSupplier/Renderable/SelectProduct.php
index dfa6f82..cba2759 100644
--- a/app/AdminSupplier/Renderable/SelectProduct.php
+++ b/app/AdminSupplier/Renderable/SelectProduct.php
@@ -26,11 +26,11 @@ class SelectProduct extends LazyRenderable
$grid->disableBatchActions();
//$grid->model()->where('status', ProductStatus::ON_SALE);
- $grid->model()->where('supplier_id',Admin::user()->id);
+ $grid->model()->where('supplier_id', Admin::user()->id);
$grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商');
$grid->column('id');
- $grid->column('supplier.name', '供应商');
+ $grid->column('supplier.name', '供应商')->display(fn($v) => $v);
$grid->column('title');
$grid->column('picture')->image('',60, 60);
$grid->column('sale');
diff --git a/resources/lang/zh_CN/demand-product.php b/resources/lang/zh_CN/demand-product.php
index ac923a0..4b56122 100755
--- a/resources/lang/zh_CN/demand-product.php
+++ b/resources/lang/zh_CN/demand-product.php
@@ -13,6 +13,7 @@ return [
'know' => '旅客须知',
'original_price' => '原价',
'picture' => '产品图片',
+ 'pictures' => '产品图片',
'price' => '价格',
'sale' => '销量',
'status' => '状态',