Merge remote-tracking branch 'origin/develop' into develop

app/Admin/Controllers/DemandProductController.php

@@ -3,11 +3,10 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Extensions\Grid\AuditDemandProduct;
-use App\Admin\Repositories\Product;
+use App\Admin\Repositories\DemandProduct;
 use App\Common\ProductStatus;
 use App\Common\UserStatus;
 use App\Models\Category;
-use App\Models\DemandProduct;
 use App\Models\Supplier;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;

app/Admin/Repositories/DemandProduct.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\DemandProduct as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class DemandProduct extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/AdminSupplier/Controllers/DemandBiddingController.php

@@ -109,18 +109,6 @@ class DemandBiddingController extends AdminController
 			$form->disableViewButton();
 			$form->disableViewCheck();
 
-			$demand_id = request('demand_id');
-
-			$isBidding = \App\Models\DemandBidding::query()
-				->where('demand_id',$demand_id)
-				->where([
-					'bidding_user_type' => DemandTraits::$col[1],
-					'bidding_user_id' => Admin::user()->id
-				])
-				->exists();
-			if ($demand_id && $isBidding) {
-				Admin::exit('你已经竞标过了，无需重复参加');
-			}
 
 			$form->display('id')->disable();
 			if(request('is_bidding',0)) {
@@ -145,6 +133,21 @@ class DemandBiddingController extends AdminController
 				$form->bidding_user_id = Admin::user()->id;
 			});
 
+			$form->saving(function (Form $form) {
+				if ($form->isCreating()) {
+					$isBidding = \App\Models\DemandBidding::query()
+						->where('demand_id',$form->demand_id)
+						->where([
+							'bidding_user_type' => DemandTraits::$col[1],
+							'bidding_user_id' => Admin::user()->id
+						])
+						->exists();
+					if ($isBidding) {
+						Admin::exit('你已经竞标过了，无需重复参加');
+					}
+				}
+			});
+
 			$form->saved(function (Form $form) {
 				$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');