diff --git a/beike/Admin/Http/Controllers/AdminUserController.php b/beike/Admin/Http/Controllers/AdminUserController.php index bd7b6001..d95f2932 100644 --- a/beike/Admin/Http/Controllers/AdminUserController.php +++ b/beike/Admin/Http/Controllers/AdminUserController.php @@ -13,14 +13,16 @@ namespace Beike\Admin\Http\Controllers; use Beike\Models\AdminUser; use Illuminate\Http\Request; +use Spatie\Permission\Models\Permission; +use Spatie\Permission\Models\Role; class AdminUserController extends Controller { public function index() { $data = [ - 'admin_users' => AdminUser::query()->get(), - 'admin_user_groups' => [], + 'admin_users' => AdminUser::query()->with(['roles'])->get(), + 'admin_roles' => Role::query()->get() ]; return view('admin::pages.admin_users.index', $data); diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php index 7a9df1d5..e2111e35 100644 --- a/beike/Admin/View/Components/Header.php +++ b/beike/Admin/View/Components/Header.php @@ -19,6 +19,7 @@ class Header extends Component $this->addLink('订单管理', admin_route('orders.index'), equal_route('admin.orders.index')); $this->addLink('商品管理', admin_route('products.index'), equal_route('admin.products.index')); $this->addLink('会员管理', admin_route('customers.index'), equal_route('admin.customers.index')); + $this->addLink('会员管理', admin_route('customers.index'), equal_route('admin.customers.index')); $this->addLink('系统设置', admin_route('settings.index'), equal_route('admin.settings.index')); } diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index a8995711..c700dbbc 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -39,8 +39,8 @@ class Sidebar extends Component $this->addLink('商品分类', admin_route('categories.index'), 'fa fa-tachometer-alt', $this->equalRoute('categories.index')); $this->addLink('品牌管理', admin_route('brands.index'), 'fa fa-tachometer-alt', $this->equalRoute('brands.index')); $this->addLink('税率设置', admin_route('tax_rates.index'), 'fa fa-tachometer-alt', $this->equalRoute('tax_rates.index')); - $this->addLink('多语言', admin_route('tax_rates.index'), 'fa fa-tachometer-alt', $this->equalRoute('tax_rates.index')); - $this->addLink('多货币', admin_route('tax_rates.index'), 'fa fa-tachometer-alt', $this->equalRoute('tax_rates.index')); + $this->addLink('语言管理', admin_route('tax_rates.index'), 'fa fa-tachometer-alt', $this->equalRoute('tax_rates.index')); + $this->addLink('货币管理', admin_route('tax_rates.index'), 'fa fa-tachometer-alt', $this->equalRoute('tax_rates.index')); } if (Str::startsWith($routeName, ['products.', 'categories.', 'brands.'])) {