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

app/AdminAgent/Controllers/DemandBiddingController.php

@@ -109,7 +109,7 @@ class DemandBiddingController extends AdminController
 				$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
 
 				if ($provinceId != Admin::user()->province_id) {
-					$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
+					$form->response()->error('竞标失败,只能竞标跟自己相同省份的的需求');
 				}
 				// 判断是否是新增操作
 				if ($form->isCreating()) {

app/AdminGuide/Controllers/DemandBiddingController.php

@@ -109,7 +109,7 @@ class DemandBiddingController extends AdminController
 				$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
 
 				if ($provinceId != Admin::user()->province_id) {
-					$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
+					$form->response()->error('竞标失败,只能竞标跟自己相同省份的的需求');
 				}
 				// 判断是否是新增操作
 				if ($form->isCreating()) {

app/AdminSupplier/Controllers/DemandBiddingController.php

@@ -149,7 +149,7 @@ class DemandBiddingController extends AdminController
 				$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
 
 				if ($provinceId != Admin::user()->province_id) {
-					$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
+					$form->response()->error('竞标失败,只能竞标跟自己相同省份的的需求');
 				}
 				if($form->isEditing()) {
 					$productId = request('demand_product_id', 0);

app/AdminSupplier/Controllers/ProductController.php

@@ -241,7 +241,7 @@ class ProductController extends AdminController
 					}
 
 					DB::commit();
-					return $form->response()->success('更新成功！')->script('history.go(-1)');
+					return $form->response()->success('更新成功！')->redirect('product/list');
 				} catch (\Exception $exception) {
 					DB::rollBack();
 					return $form->response()->error($exception->getMessage());