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

app/AdminAgent/Controllers/MyBiddingProductController.php

@@ -51,6 +51,7 @@ class MyBiddingProductController extends AdminController
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
 			$grid->disableActions();
+			$grid->disableCreateButton();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminAgent/Controllers/MyDemandProductController.php

@@ -61,6 +61,7 @@ class MyDemandProductController extends AdminController
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
 			$grid->disableActions();
+			$grid->disableCreateButton();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminAgent/routes.php

@@ -36,5 +36,5 @@ Route::group([
 	$router->resource('article/list', 'ArticleController');
 	$router->resource('setting', 'SettingController');
 	$router->resource('channel/list', 'ChannelController');
-	$router->resource('/finance_statistics', 'FinanceStatisticsController');
+	$router->resource('finance_statistics', 'FinanceStatisticsController');
 });

app/AdminGuide/Controllers/MyDemandProductController.php

@@ -69,6 +69,7 @@ class MyDemandProductController extends AdminController
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
 			$grid->disableActions();
+			$grid->disableCreateButton();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminSupplier/Controllers/MyBiddingProductController.php

@@ -52,6 +52,7 @@ class MyBiddingProductController extends AdminController
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
 			$grid->disableActions();
+			$grid->disableCreateButton();
 			$grid->filter(function (Grid\Filter $filter) {
 				$filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

app/AdminSupplier/Controllers/MyDemandProductController.php

@@ -61,6 +61,7 @@ class MyDemandProductController extends AdminController
 			$grid->disableQuickEditButton();
 			$grid->disableViewButton();
 			$grid->disableActions();
+			$grid->disableCreateButton();
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
 				$filter->equal('bidding_user_type','竞标用户类型')->select(DemandTraits::$polymorphic);

resources/lang/zh_CN/global.php

@@ -31,6 +31,9 @@ return [
         'root'     => '顶级',
         'scaffold' => '代码生成器',
 		'finance_statistics'=> '财务统计',
+		'demand_bidding'=> '我的竞标',
+		'my_bidding_product' => '竞标产品库',
+		'demand_product'=> '产品管理',
     ],
     'options' => [
         //

resources/lang/zh_CN/my-demand-product.php

@@ -1,8 +1,8 @@
 <?php
 return [
     'labels' => [
-        'MyDemandProduct' => '我的竞标产品库',
-        'my_demand_product' => '我的竞标产品库',
+        'MyDemandProduct' => '需求产品库',
+        'my_demand_product' => '需求产品库',
     ],
     'fields' => [
         'title' => '标题',