名称修改

app/AdminAgent/Controllers/MyBiddingProductController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\AdminAgent\Controllers;
+
+
+use App\Common\ProductStatus;
+use App\Traits\ResponseHelper;
+use App\AdminAgent\Repositories\Demand;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Http\Controllers\AdminController;
+use App\Traits\DemandTraits;
+
+class MyBiddingProductController extends AdminController
+{
+
+	use ResponseHelper;
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Demand(['publisher','biddingUser','product.category']), function (Grid $grid) {
+
+			$grid->model()
+				//->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]])
+				->where('product_id','>',0)
+				->whereHas('bidding',function ($query) {
+					$query->where(['state' => 1,'bidding_user_id' => Admin::user()->id,'bidding_user_type' => DemandTraits::$col[0]]);
+				});
+            $grid->column('id')->sortable();
+            //$grid->column('title');
+            //$grid->column('detail','内容')->display('查看')->modal('详情',function ($modal) {
+			//	$modal->xl();
+            //	return $this->comment;
+			//});
+			$grid->column('biddingUser.name','中标人');
+            $grid->column('price','发标价格');
+			$grid->column('product.category.name', '产品分类');
+			$grid->column('product.title','产品标题');
+			$grid->column('product.picture','产品图片')->image('', 60, 60);
+			$grid->column('product.price','产品售价');
+			$grid->column('product.original_price','产品原价');
+			$grid->column('product.stock','产品库存');
+			$grid->column('product.sale','产品销量');
+			$grid->column('product.status','产品状态')->using(ProductStatus::array());
+			$grid->disableDeleteButton();
+			$grid->disableEditButton();
+			$grid->disableQuickEditButton();
+			$grid->disableViewButton();
+			$grid->disableActions();
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);
+            });
+        });
+    }
+
+}

app/AdminAgent/routes.php

@@ -27,6 +27,7 @@ Route::group([
 	$router->resource('demand', 'DemandController');
 	$router->resource('demand_bidding', 'DemandBiddingController');
 	$router->resource('my_demand_product', 'MyDemandProductController');
+	$router->resource('my_bidding_product', 'MyBiddingProductController');
 
 	$router->resource('message/list', 'MessageController');
 	$router->resource('notice/list', 'NoticeController');

app/AdminSupplier/Controllers/MyBiddingProductController.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\AdminSupplier\Controllers;
+
+
+use App\Common\ProductStatus;
+use App\Traits\ResponseHelper;
+use App\AdminAgent\Repositories\Demand;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Http\Controllers\AdminController;
+use App\Traits\DemandTraits;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class MyBiddingProductController extends AdminController
+{
+
+	use ResponseHelper;
+	/**
+	 * Make a grid builder.
+	 *
+	 * @return Grid
+	 */
+	protected function grid()
+	{
+		return Grid::make(new Demand(['publisher','biddingUser','product.category']), function (Grid $grid) {
+
+			$grid->model()
+				//->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]])
+				->where('product_id','>',0)
+				->whereHas('bidding',function ($query) {
+					$query->where(['state' => 1,'bidding_user_id' => Admin::user()->id,'bidding_user_type' => DemandTraits::$col[1]]);
+				});
+			$grid->column('id')->sortable();
+			//$grid->column('title');
+			//$grid->column('detail','内容')->display('查看')->modal('详情',function ($modal) {
+			//	$modal->xl();
+			//	return $this->comment;
+			//});
+			$grid->column('publisher.name','发标人');
+			$grid->column('price','发标价格');
+			$grid->column('product.category.name', '产品分类');
+			$grid->column('product.title','产品标题');
+			$grid->column('product.picture','产品图片')->image('', 60, 60);
+			$grid->column('product.price','产品售价');
+			$grid->column('product.original_price','产品原价');
+			$grid->column('product.stock','产品库存');
+			$grid->column('product.sale','产品销量');
+			$grid->column('product.status','产品状态')->using(ProductStatus::array());
+			$grid->disableDeleteButton();
+			$grid->disableEditButton();
+			$grid->disableQuickEditButton();
+			$grid->disableViewButton();
+			$grid->disableActions();
+			$grid->filter(function (Grid\Filter $filter) {
+				$filter->equal('id');
+				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);
+			});
+		});
+	}
+
+}

app/AdminSupplier/Controllers/MyDemandProductController.php

@@ -37,7 +37,7 @@ class MyDemandProductController extends AdminController
         return Grid::make(new Demand(['publisher','biddingUser','product.category']), function (Grid $grid) {
 
 			$grid->model()
-				->where(['bidding_user_id' => Admin::user()->id,'bidding_user_type' => DemandTraits::$col[1]])
+				->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[1]])
 				->where('product_id','>',0);
 
             $grid->column('id')->sortable();

app/AdminSupplier/routes.php

@@ -24,6 +24,7 @@ Route::group([
 	$router->resource('demand_bidding', 'DemandBiddingController');
 	$router->resource('demand_product', 'DemandProductController');
 	$router->resource('my_demand_product', 'MyDemandProductController');
+	$router->resource('my_bidding_product', 'MyBiddingProductController');
 	//api
 	$router->any('/api/demand/binding', 'DemandController@binding');
 });

app/Models/Demand.php

@@ -32,4 +32,9 @@ class Demand extends BaseModel
 	{
 		return $this->hasOne(AgentProduct::class, 'id', 'agent_product_id');
 	}
+
+	public function bidding()
+	{
+		return $this->hasOne(DemandBidding::class,'id','bidding_id');
+	}
 }