diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php index 66d01492..20c45863 100644 --- a/beike/Admin/View/Components/Header.php +++ b/beike/Admin/View/Components/Header.php @@ -16,7 +16,7 @@ class Header extends Component public function __construct() { $this->addLink('管理首页', admin_route('home.index'), equal_route('admin.home.index')); - $this->addLink('订单管理', admin_route('home.index'), equal_route('admin.orders.index')); + $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('home.index'), equal_route('admin.promotions.index')); diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index 1865f444..832cab4a 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -39,6 +39,10 @@ class Sidebar extends Component $this->addLink('用户组', admin_route('customer_groups.index'), 'fa fa-tachometer-alt', false); } + if (Str::startsWith($routeName, ['admin.orders.'])) { + $this->addLink('订单列表', admin_route('orders.index'), 'fa fa-tachometer-alt', false); + } + return view('admin::components.sidebar'); } diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 3d5e47b6..fed1aee5 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -47,6 +47,7 @@ body { .main-content > #content { flex: 1; padding: 1rem 1rem 4rem; + margin-top: 42px; overflow-y: auto; } @media screen and (max-width: 991px) { @@ -55,10 +56,23 @@ body { } } +.page-title-box { + position: fixed; + top: 60px; + left: 190px; + z-index: 9; + right: 0; + height: 43px; + line-height: 43px; + padding: 0 28px; + background-color: #fff; + border-bottom: 1px solid #f1f1f1; + display: flex; + align-items: center; +} .page-title-box .page-title { font-size: 15px; margin: 0; - margin-bottom: 20px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 24aa0854..797392f4 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -45,6 +45,7 @@ body { > #content { flex: 1; padding: 1rem 1rem 4rem; + margin-top: 42px; overflow-y: auto; @media screen and (max-width: 991px) { @@ -54,11 +55,23 @@ body { } .page-title-box { + position: fixed; + top: 60px; + left: 190px; + z-index: 9; + right: 0; + height: 43px; + line-height: 43px; + padding: 0 28px; + background-color: #fff; + border-bottom: 1px solid #f1f1f1; + display: flex; + align-items: center; + .page-title { font-size: 15px; margin: 0; // line-height: 35px; - margin-bottom: 20px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/resources/beike/admin/views/layouts/master.blade.php b/resources/beike/admin/views/layouts/master.blade.php index a27a08b3..29a4528e 100644 --- a/resources/beike/admin/views/layouts/master.blade.php +++ b/resources/beike/admin/views/layouts/master.blade.php @@ -30,9 +30,9 @@ +

@yield('title')

-

@yield('title')

@yield('content')
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index 52cf0039..70c5ba8f 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -3,13 +3,40 @@ @section('title', '订单列表') @section('content') -
+
-
- -
+ + + + + + + + + + + + + + + + @foreach ($orders as $order) + + + + + + + + + + + + @endforeach + +
ID订单号客户姓名支付方式状态总计生成日期修改日期操作
{{ $order->id }}{{ $order->number }}{{ $order->customer_name }}{{ $order->payment_method_name }}{{ $order->status }}{{ $order->total }}{{ $order->created_at }}{{ $order->updated_at }}查看
- {{-- {{ $customers->links('admin::vendor/pagination/bootstrap-4') }} --}} + {{ $orders->links('admin::vendor/pagination/bootstrap-4') }}
@endsection