pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

补充菜单选中，批零订单详情接口返回

release
vine_liutk 2022-02-10 11:30:24 +08:00
parent f6c0566060
commit 2b53c3d782
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Admin/Controllers/HomeController.php
View File

@ -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);
// }
}

3
app/Admin/routes.php
View File

@ -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');
});

6
app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php
View File

@ -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,
];
}
}

8
app/Models/Admin/Layout/Menu.php
View File

@ -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级的菜单