diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index f504d6fd..2f14885f 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -8,10 +8,13 @@ use App\Admin\Metrics\Orders; use App\Admin\Metrics\StatisticsTotal; use App\Admin\Metrics\Users; use App\Http\Controllers\Controller; +use App\Models\Admin\Layout\Menu as ActiveMenu; +use App\Models\Admin\Menu; use Dcat\Admin\Admin; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; use Dcat\Admin\Layout\Row; +use Illuminate\Http\Request; class HomeController extends Controller { @@ -41,4 +44,18 @@ class HomeController extends Controller }); }); } + + // public function test(Request $request) + // { + // $menus = (new Menu())->fetchAll(); + // $activeMenu = new ActiveMenu(); + // foreach ($menus as $menu) { + // dump([ + // 'title' => $menu->title, + // 'uri' => $menu->uri, + // ]); + // dump($activeMenu->isActive($menu->toArray(), 'dealer-orders/21')); + // } + // dd(123465); + // } } diff --git a/app/Admin/routes.php b/app/Admin/routes.php index b16a055f..6bbc47bd 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -201,4 +201,7 @@ Route::group([ $router->get('api/orders', 'OrderController@orders')->name('api.orders'); $router->get('api/order-products', 'OrderController@orderProducts')->name('api.order_products'); $router->get('api/users', 'UserController@users')->name('api.users'); + + /** 调试接口 **/ + // $router->get('test', 'HomeController@test'); }); diff --git a/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php b/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php index ea808ec0..1c9265b9 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php @@ -28,6 +28,12 @@ class OrderResource extends JsonResource 'consignee_telephone'=>$this->consignee_telephone, 'consignee_zone' => $this->consignee_zone, 'consignee_address' => $this->consignee_address, + + //新增接单人信息返回 + 'consignor'=> $this->consignor ? [ + 'consignor_name' => $this->consignor->userInfo?->nickname ?? '', + 'consignor_phone'=>$this->consignor->phone ?? '', + ] : null, ]; } } diff --git a/app/Models/Admin/Layout/Menu.php b/app/Models/Admin/Layout/Menu.php index 2b0b5cc0..2fb822ab 100644 --- a/app/Models/Admin/Layout/Menu.php +++ b/app/Models/Admin/Layout/Menu.php @@ -22,19 +22,19 @@ class Menu extends DcatLayoutMenu if (empty($item['uri'])) { return false; } - $_uri = trim(str_replace('/admin', '', $this->getPath($item['uri'])), '/'); + $_uri = str_replace('/admin', '', $this->getPath($item['uri'])); if (empty($_uri) && $path !== 'admin') { return false; } - return strpos($path, $_uri) !== false; + return strpos('/'.$path, $_uri) !== false; } foreach ($item['children'] as $v) { - $_uri = trim(str_replace('/admin', '', $this->getPath($v['uri'])), '/'); + $_uri = str_replace('/admin', '', $this->getPath($v['uri'])); if (empty($_uri) && $path !== 'admin') { return false; } - if (strpos($path, $_uri) !== false) { + if (strpos('/'.$path, $_uri) !== false) { return true; } //针对大于2级的菜单