From 62ec3a102a618312663a601dcb7116474673b35e Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 20 Jan 2022 11:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DealerEarningController.php   |  1 -
 app/Admin/routes.php                          |  3 +++
 database/seeders/AdminMenuSeeder.php          | 19 ++++++++++++-------
 resources/lang/zh_CN/dealer.php               |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Admin/Controllers/DealerEarningController.php b/app/Admin/Controllers/DealerEarningController.php
index 90bcec39..fc788110 100644
--- a/app/Admin/Controllers/DealerEarningController.php
+++ b/app/Admin/Controllers/DealerEarningController.php
@@ -67,7 +67,6 @@ class DealerEarningController extends AdminController
                 if ($actions->row->earningable_type != (new DealerChannelSubsidyLog())->getMorphClass()) {
                     $actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('dealer_earnings.show', ['dealer_earning'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 &nbsp;&nbsp;</a>');
                 }
-                //如果打款人为空，且待打款，则系统打款
             });
 
             $grid->filter(function (Grid\Filter $filter) {
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index f342ed75..d2e2ae7e 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -177,6 +177,9 @@ Route::group([
         'index', 'show',
     ])->names('dealer_earnings');
     $router->get('dealer-earnings-channel', 'DealerEarningController@index')->name('dealer_earnings.channel');
+    $router->get('dealer-earnings-manage', 'DealerEarningController@index')->name('dealer_earnings.manage');
+    $router->get('dealer-earnings-manager', 'DealerEarningController@index')->name('dealer_earnings.manager');
+    $router->get('dealer-earnings-purchase', 'DealerEarningController@index')->name('dealer_earnings.purchase');
 
     /** api接口 **/
     $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories');
diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php
index beb53df6..89132665 100644
--- a/database/seeders/AdminMenuSeeder.php
+++ b/database/seeders/AdminMenuSeeder.php
@@ -309,11 +309,11 @@ class AdminMenuSeeder extends Seeder
                         'icon' => '',
                         'uri' => 'dealer-manager-orders?type=manager',
                     ],
-                    [
-                        'title' =>'用户资金',
-                        'icon'=>'',
-                        'uri' => 'dealer-earnings',
-                    ],
+                    // [
+                    //     'title' =>'用户资金',
+                    //     'icon'=>'',
+                    //     'uri' => 'dealer-earnings',
+                    // ],
                     [
                         'title' =>'渠道补贴',
                         'icon'=>'',
@@ -322,12 +322,17 @@ class AdminMenuSeeder extends Seeder
                     [
                         'title' =>'进货补贴',
                         'icon' => '',
-                        'uri' => '',
+                        'uri' => 'dealer-earnings-purchase?filter-earningable_type[]=dealer_purchase_subsidy',
                     ],
                     [
                         'title'=>'管理津贴',
                         'icon' => '',
-                        'uri' => '',
+                        'uri' => 'dealer-earnings-manage?filter-earningable_type[]=dealer_manage_subsidy',
+                    ],
+                    [
+                        'title'=>'管理者津贴',
+                        'icon' => '',
+                        'uri' => 'dealer-earnings-manager?filter-earningable_type[]=dealer_manager_subsidy',
                     ],
                 ],
             ],
diff --git a/resources/lang/zh_CN/dealer.php b/resources/lang/zh_CN/dealer.php
index d77c03b1..886d23c1 100644
--- a/resources/lang/zh_CN/dealer.php
+++ b/resources/lang/zh_CN/dealer.php
@@ -4,6 +4,7 @@ return [
     'labels' => [
         'Dealer' => '经销商管理',
         'dealers' => '经销商管理',
+        'dealer-users' => '经销商',
     ],
     'fields' => [
         'user_id' => '用户ID',