From c1c9f1ec5b413c8f9563cace5992a729318b00f1 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 6 Jul 2022 15:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/View/Components/Header.php        |  2 +-
 beike/Admin/View/Components/Sidebar.php       |  4 ++
 public/build/beike/admin/css/app.css          | 16 +++++++-
 resources/beike/admin/css/_global.scss        | 15 +++++++-
 .../admin/views/layouts/master.blade.php      |  2 +-
 .../admin/views/pages/orders/index.blade.php  | 37 ++++++++++++++++---
 6 files changed, 67 insertions(+), 9 deletions(-)

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 @@
     <aside class="sidebar navbar-expand-xs border-radius-xl">
       <x-admin-sidebar />
     </aside>
+    <div class="page-title-box"><h4 class="page-title">@yield('title')</h4></div>
     <div id="content">
       <div class="container-fluid p-0">
-        <div class="page-title-box"><h4 class="page-title">@yield('title')</h4></div>
         @yield('content')
       </div>
     </div>
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')
-  <div id="customer-app" class="card" v-cloak>
+  <div id="customer-app" class="card">
     <div class="card-body">
-      <div class="d-flex justify-content-between mb-4">
-        <button type="button" class="btn btn-primary" @click="checkedCustomersCreate">创建顾客</button>
-      </div>
+      <table class="table">
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>订单号</th>
+            <th>客户姓名</th>
+            <th>支付方式</th>
+            <th>状态</th>
+            <th>总计</th>
+            <th>生成日期</th>
+            <th>修改日期</th>
+            <th>操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          @foreach ($orders as $order)
+            <tr>
+              <td>{{ $order->id }}</td>
+              <td>{{ $order->number }}</td>
+              <td>{{ $order->customer_name }}</td>
+              <td>{{ $order->payment_method_name }}</td>
+              <td>{{ $order->status }}</td>
+              <td>{{ $order->total }}</td>
+              <td>{{ $order->created_at }}</td>
+              <td>{{ $order->updated_at }}</td>
+              <td><a href="{{ admin_route('orders.show', [$order->id]) }}" class="btn btn-outline-secondary btn-sm">查看</a></td>
+            </tr>
+          @endforeach
+        </tbody>
+      </table>
 
-      {{-- {{ $customers->links('admin::vendor/pagination/bootstrap-4') }} --}}
+      {{ $orders->links('admin::vendor/pagination/bootstrap-4') }}
     </div>
   </div>
 @endsection