diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php
index 2c4e87d5..3aeaae31 100644
--- a/beike/Admin/Http/Controllers/OrderController.php
+++ b/beike/Admin/Http/Controllers/OrderController.php
@@ -29,6 +29,10 @@ class OrderController extends Controller
public function show(Request $request, Order $order)
{
- dd($order);
+ $data = [
+ 'order' => $order,
+ ];
+
+ return view('admin::pages.orders.form', $data);
}
}
diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php
index 832cab4a..b2b3646a 100644
--- a/beike/Admin/View/Components/Sidebar.php
+++ b/beike/Admin/View/Components/Sidebar.php
@@ -40,7 +40,7 @@ class Sidebar extends Component
}
if (Str::startsWith($routeName, ['admin.orders.'])) {
- $this->addLink('订单列表', admin_route('orders.index'), 'fa fa-tachometer-alt', false);
+ $this->addLink('订单列表', admin_route('orders.index'), 'fa fa-tachometer-alt', true);
}
return view('admin::components.sidebar');
diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css
index fed1aee5..ca5d4482 100644
--- a/public/build/beike/admin/css/app.css
+++ b/public/build/beike/admin/css/app.css
@@ -47,7 +47,7 @@ body {
.main-content > #content {
flex: 1;
padding: 1rem 1rem 4rem;
- margin-top: 42px;
+ margin-top: 44px;
overflow-y: auto;
}
@media screen and (max-width: 991px) {
@@ -62,8 +62,7 @@ body {
left: 190px;
z-index: 9;
right: 0;
- height: 43px;
- line-height: 43px;
+ height: 44px;
padding: 0 28px;
background-color: #fff;
border-bottom: 1px solid #f1f1f1;
@@ -311,12 +310,17 @@ hr.horizontal.dark {
padding: 1rem 1rem 0.3rem;
background-color: #fff;
font-weight: bold;
- font-size: 0.8rem;
border-bottom: 0 solid rgba(0, 0, 0, 0.125);
}
.card .card-header:first-child {
border-radius: 1rem 1rem 0 0;
}
+.card .card-header .card-title {
+ margin-bottom: 0;
+ padding-left: 10px;
+ border-left: 3px solid #fd560f;
+ line-height: 1;
+}
.card .card-body {
padding: 1rem;
}
@@ -329,10 +333,8 @@ table.table thead th {
white-space: nowrap;
}
table.table td {
- border-bottom: 0;
font-size: 0.8125rem;
vertical-align: middle;
- border-top: 1px solid #edf2f9;
}
table.table.table-striped > tbody > tr:nth-of-type(odd) {
background: transparent;
diff --git a/public/build/beike/admin/css/bootstrap.css b/public/build/beike/admin/css/bootstrap.css
index 9260f93c..b35a0b81 100644
--- a/public/build/beike/admin/css/bootstrap.css
+++ b/public/build/beike/admin/css/bootstrap.css
@@ -6803,7 +6803,7 @@
--bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
--bs-body-font-family: var(--bs-font-sans-serif);
- --bs-body-font-size: 1rem;
+ --bs-body-font-size: 0.92rem;
--bs-body-font-weight: 400;
--bs-body-line-height: 1.5;
--bs-body-color: #212529;
@@ -6855,47 +6855,47 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
}
h1, .h1 {
- font-size: calc(1.375rem + 1.5vw);
+ font-size: calc(1.355rem + 1.26vw);
}
@media (min-width: 1200px) {
h1, .h1 {
- font-size: 2.5rem;
+ font-size: 2.3rem;
}
}
h2, .h2 {
- font-size: calc(1.325rem + 0.9vw);
+ font-size: calc(1.309rem + 0.708vw);
}
@media (min-width: 1200px) {
h2, .h2 {
- font-size: 2rem;
+ font-size: 1.84rem;
}
}
h3, .h3 {
- font-size: calc(1.3rem + 0.6vw);
+ font-size: calc(1.286rem + 0.432vw);
}
@media (min-width: 1200px) {
h3, .h3 {
- font-size: 1.75rem;
+ font-size: 1.61rem;
}
}
h4, .h4 {
- font-size: calc(1.275rem + 0.3vw);
+ font-size: calc(1.263rem + 0.156vw);
}
@media (min-width: 1200px) {
h4, .h4 {
- font-size: 1.5rem;
+ font-size: 1.38rem;
}
}
h5, .h5 {
- font-size: 1.25rem;
+ font-size: 1.15rem;
}
h6, .h6 {
- font-size: 1rem;
+ font-size: 0.92rem;
}
p {
@@ -7234,7 +7234,7 @@ progress {
}
.lead {
- font-size: 1.25rem;
+ font-size: 1.15rem;
font-weight: 300;
}
@@ -7328,7 +7328,7 @@ progress {
.blockquote {
margin-bottom: 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
}
.blockquote > :last-child {
margin-bottom: 0;
@@ -8715,7 +8715,7 @@ progress {
margin-bottom: 1rem;
color: #212529;
vertical-align: top;
- border-color: #dee2e6;
+ border-color: #e9ecef;
}
.table > :not(caption) > * > * {
padding: 0.5rem 0.5rem;
@@ -8916,13 +8916,13 @@ progress {
.col-form-label-lg {
padding-top: calc(0.5rem + 1px);
padding-bottom: calc(0.5rem + 1px);
- font-size: 1.25rem;
+ font-size: 1.15rem;
}
.col-form-label-sm {
padding-top: calc(0.25rem + 1px);
padding-bottom: calc(0.25rem + 1px);
- font-size: 0.875rem;
+ font-size: 0.805rem;
}
.form-text {
@@ -8935,7 +8935,7 @@ progress {
display: block;
width: 100%;
padding: 0.375rem 0.75rem;
- font-size: 1rem;
+ font-size: 0.92rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
@@ -9076,7 +9076,7 @@ progress {
.form-control-sm {
min-height: calc(1.5em + 0.5rem + 2px);
padding: 0.25rem 0.5rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
border-radius: 0.2rem;
}
.form-control-sm::-webkit-file-upload-button {
@@ -9101,7 +9101,7 @@ progress {
.form-control-lg {
min-height: calc(1.5em + 1rem + 2px);
padding: 0.5rem 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
border-radius: 0.3rem;
}
.form-control-lg::-webkit-file-upload-button {
@@ -9155,7 +9155,7 @@ textarea.form-control-lg {
width: 100%;
padding: 0.375rem 2.25rem 0.375rem 0.75rem;
-moz-padding-start: calc(0.75rem - 3px);
- font-size: 1rem;
+ font-size: 0.92rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
@@ -9197,7 +9197,7 @@ textarea.form-control-lg {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
border-radius: 0.2rem;
}
@@ -9205,13 +9205,13 @@ textarea.form-control-lg {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
border-radius: 0.3rem;
}
.form-check {
display: block;
- min-height: 1.5rem;
+ min-height: 1.38rem;
padding-left: 1.7em;
margin-bottom: 0.125rem;
}
@@ -9509,7 +9509,7 @@ textarea.form-control-lg {
display: flex;
align-items: center;
padding: 0.375rem 0.75rem;
- font-size: 1rem;
+ font-size: 0.92rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
@@ -9525,7 +9525,7 @@ textarea.form-control-lg {
.input-group-lg > .input-group-text,
.input-group-lg > .btn {
padding: 0.5rem 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
border-radius: 0.3rem;
}
@@ -9534,7 +9534,7 @@ textarea.form-control-lg {
.input-group-sm > .input-group-text,
.input-group-sm > .btn {
padding: 0.25rem 0.5rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
border-radius: 0.2rem;
}
@@ -9575,7 +9575,7 @@ textarea.form-control-lg {
max-width: 100%;
padding: 0.25rem 0.5rem;
margin-top: 0.1rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
color: #fff;
background-color: rgba(25, 135, 84, 0.9);
border-radius: 0;
@@ -9664,7 +9664,7 @@ textarea.form-control-lg {
max-width: 100%;
padding: 0.25rem 0.5rem;
margin-top: 0.1rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
color: #fff;
background-color: rgba(220, 53, 69, 0.9);
border-radius: 0;
@@ -9752,7 +9752,7 @@ textarea.form-control-lg {
background-color: transparent;
border: 1px solid transparent;
padding: 0.375rem 0.75rem;
- font-size: 1rem;
+ font-size: 0.92rem;
border-radius: 0;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
}
@@ -10227,13 +10227,13 @@ textarea.form-control-lg {
.btn-lg, .btn-group-lg > .btn {
padding: 0.5rem 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.5rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
border-radius: 0.2rem;
}
@@ -10305,7 +10305,7 @@ textarea.form-control-lg {
min-width: 10rem;
padding: 0.5rem 0;
margin: 0;
- font-size: 1rem;
+ font-size: 0.92rem;
color: #212529;
text-align: left;
list-style: none;
@@ -10539,7 +10539,7 @@ textarea.form-control-lg {
display: block;
padding: 0.5rem 1rem;
margin-bottom: 0;
- font-size: 0.875rem;
+ font-size: 0.805rem;
color: #6c757d;
white-space: nowrap;
}
@@ -10792,10 +10792,10 @@ textarea.form-control-lg {
justify-content: space-between;
}
.navbar-brand {
- padding-top: 0.3125rem;
- padding-bottom: 0.3125rem;
+ padding-top: 0.3275rem;
+ padding-bottom: 0.3275rem;
margin-right: 1rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
white-space: nowrap;
}
.navbar-nav {
@@ -10826,7 +10826,7 @@ textarea.form-control-lg {
.navbar-toggler {
padding: 0.25rem 0.75rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
line-height: 1;
background-color: transparent;
border: 1px solid transparent;
@@ -11412,7 +11412,7 @@ textarea.form-control-lg {
align-items: center;
width: 100%;
padding: 1rem 1.25rem;
- font-size: 1rem;
+ font-size: 0.92rem;
color: #212529;
text-align: left;
background-color: #fff;
@@ -11600,7 +11600,7 @@ textarea.form-control-lg {
.pagination-lg .page-link {
padding: 0.75rem 1.5rem;
- font-size: 1.25rem;
+ font-size: 1.15rem;
}
.pagination-lg .page-item:first-child .page-link {
border-top-left-radius: 0.3rem;
@@ -11613,7 +11613,7 @@ textarea.form-control-lg {
.pagination-sm .page-link {
padding: 0.25rem 0.5rem;
- font-size: 0.875rem;
+ font-size: 0.805rem;
}
.pagination-sm .page-item:first-child .page-link {
border-top-left-radius: 0.2rem;
@@ -11759,7 +11759,7 @@ textarea.form-control-lg {
display: flex;
height: 1rem;
overflow: hidden;
- font-size: 0.75rem;
+ font-size: 0.69rem;
background-color: #e9ecef;
border-radius: 0;
}
@@ -12515,7 +12515,7 @@ textarea.form-control-lg {
word-spacing: normal;
white-space: normal;
line-break: auto;
- font-size: 0.875rem;
+ font-size: 0.805rem;
word-wrap: break-word;
opacity: 0;
}
@@ -12617,7 +12617,7 @@ textarea.form-control-lg {
word-spacing: normal;
white-space: normal;
line-break: auto;
- font-size: 0.875rem;
+ font-size: 0.805rem;
word-wrap: break-word;
background-color: #fff;
background-clip: padding-box;
@@ -12711,7 +12711,7 @@ textarea.form-control-lg {
.popover-header {
padding: 0.5rem 1rem;
margin-bottom: 0;
- font-size: 1rem;
+ font-size: 0.92rem;
background-color: #f0f0f0;
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
border-top-left-radius: calc(0.3rem - 1px);
@@ -14336,27 +14336,27 @@ textarea.form-control-lg {
}
.fs-1 {
- font-size: calc(1.375rem + 1.5vw) !important;
+ font-size: calc(1.355rem + 1.26vw) !important;
}
.fs-2 {
- font-size: calc(1.325rem + 0.9vw) !important;
+ font-size: calc(1.309rem + 0.708vw) !important;
}
.fs-3 {
- font-size: calc(1.3rem + 0.6vw) !important;
+ font-size: calc(1.286rem + 0.432vw) !important;
}
.fs-4 {
- font-size: calc(1.275rem + 0.3vw) !important;
+ font-size: calc(1.263rem + 0.156vw) !important;
}
.fs-5 {
- font-size: 1.25rem !important;
+ font-size: 1.15rem !important;
}
.fs-6 {
- font-size: 1rem !important;
+ font-size: 0.92rem !important;
}
.fst-italic {
@@ -17970,19 +17970,19 @@ textarea.form-control-lg {
}
@media (min-width: 1200px) {
.fs-1 {
- font-size: 2.5rem !important;
+ font-size: 2.3rem !important;
}
.fs-2 {
- font-size: 2rem !important;
+ font-size: 1.84rem !important;
}
.fs-3 {
- font-size: 1.75rem !important;
+ font-size: 1.61rem !important;
}
.fs-4 {
- font-size: 1.5rem !important;
+ font-size: 1.38rem !important;
}
}
@media print {
diff --git a/resources/beike/admin/css/_bootstrap-extra.scss b/resources/beike/admin/css/_bootstrap-extra.scss
index 3456aa0f..1a7817f5 100644
--- a/resources/beike/admin/css/_bootstrap-extra.scss
+++ b/resources/beike/admin/css/_bootstrap-extra.scss
@@ -22,24 +22,26 @@ hr.horizontal.dark {
}
.card {
- // box-shadow: 0 20px 27px 0 rgba(0, 0, 0, .05);
- // box-shadow: 0 0.75rem 1.5rem rgb(18 38 63 / 3%);
box-shadow: rgba(0, 0, 0, .1) 0px 1px 4px 0px;
- // border: 0 solid rgba(0,0,0,.125);
- // border: 1px solid #edf2f9;
border: none;
- // border-radius: 0.5rem;
.card-header {
padding: 1rem 1rem .3rem;
background-color: #fff;
font-weight: bold;
- font-size: .8rem;
+ // font-size: .8rem;
border-bottom: 0 solid rgba(0,0,0,.125);
&:first-child {
border-radius: 1rem 1rem 0 0;
}
+
+ .card-title {
+ margin-bottom: 0;
+ padding-left: 10px;
+ border-left: 3px solid $primary;
+ line-height: 1;
+ }
}
.card-body {
@@ -60,10 +62,10 @@ table.table {
}
td {
- border-bottom: 0;
+ // border-bottom: 0;
font-size: .8125rem;
vertical-align: middle;
- border-top: 1px solid #edf2f9;
+ // border-top: 1px solid #edf2f9;
}
&.table-striped>tbody>tr {
diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss
index 797392f4..b3d8174e 100644
--- a/resources/beike/admin/css/_global.scss
+++ b/resources/beike/admin/css/_global.scss
@@ -8,8 +8,6 @@
// @modified 2021-08-24 15:07:05
//
-$main_color: #fd560f;
-
body {
// min-height: 100vh;
// background-color: #f9f9f9;
@@ -45,7 +43,7 @@ body {
> #content {
flex: 1;
padding: 1rem 1rem 4rem;
- margin-top: 42px;
+ margin-top: 44px;
overflow-y: auto;
@media screen and (max-width: 991px) {
@@ -60,8 +58,7 @@ body {
left: 190px;
z-index: 9;
right: 0;
- height: 43px;
- line-height: 43px;
+ height: 44px;
padding: 0 28px;
background-color: #fff;
border-bottom: 1px solid #f1f1f1;
@@ -116,7 +113,7 @@ body {
}
& ~ input:checked ~ .toggle-outside {
- background-color: $main_color;
+ background-color: $primary;
.toggle-inside {
left: 23px;
@@ -199,7 +196,7 @@ body.page-seller-product {
}
&:active {
- color: $main_color;
+ color: $primary;
}
}
}
\ No newline at end of file
diff --git a/resources/beike/admin/css/_header.scss b/resources/beike/admin/css/_header.scss
index 18552ac2..6a1f5fbb 100644
--- a/resources/beike/admin/css/_header.scss
+++ b/resources/beike/admin/css/_header.scss
@@ -63,7 +63,7 @@
bottom: 0;
width: 100%;
height: 3px;
- background-color: $main_color;
+ background-color: $primary;
}
}
diff --git a/resources/beike/admin/css/_sidebar.scss b/resources/beike/admin/css/_sidebar.scss
index 04d4cd67..8459dc8a 100644
--- a/resources/beike/admin/css/_sidebar.scss
+++ b/resources/beike/admin/css/_sidebar.scss
@@ -39,7 +39,7 @@
&.active, &:hover {
a {
- color: $main_color;
+ color: $primary;
background-color: #f4f4f4;
}
}
@@ -53,7 +53,7 @@
width: 2px;
height: 100%;
z-index: 1;
- background: $main_color;
+ background: $primary;
}
}
}
diff --git a/resources/beike/admin/css/app.scss b/resources/beike/admin/css/app.scss
index f5ca35ef..34f8b747 100644
--- a/resources/beike/admin/css/app.scss
+++ b/resources/beike/admin/css/app.scss
@@ -8,7 +8,7 @@
// @modified 2022-05-09 11:36:06
//
-$main_color: #fd560f;
+$primary: #fd560f;
@import 'global';
@import 'vue';
diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss
index c1294541..0ec12551 100644
--- a/resources/beike/admin/css/bootstrap/bootstrap.scss
+++ b/resources/beike/admin/css/bootstrap/bootstrap.scss
@@ -10,6 +10,7 @@
$primary: #fd560f;
$border-radius: 0;
+$font-size-base: 0.92rem;
$form-check-input-width: 1.2em;
$form-switch-width: 2.6em;
$link-decoration: none;
@@ -19,6 +20,8 @@ $form-floating-input-padding-b: .625rem;
$form-floating-padding-y: .8rem;
$form-floating-height: 50px;
+$table-border-color: #e9ecef;
+
@import './bootstrap-icons';
@import 'node_modules/bootstrap-5.1.3/scss/bootstrap';
// @import 'node_modules/bootstrap/scss/bootstrap';
diff --git a/resources/beike/admin/css/login.scss b/resources/beike/admin/css/login.scss
index 77389981..3f7986e9 100644
--- a/resources/beike/admin/css/login.scss
+++ b/resources/beike/admin/css/login.scss
@@ -62,8 +62,8 @@ body.page-login {
button[type="submit"] {
font-size: 1rem;
- background-image: linear-gradient(310deg, $main_color, #fdb504);
- // background-image: linear-gradient(310deg, $main_color, #fdb504);
+ background-image: linear-gradient(310deg, $primary, #fdb504);
+ // background-image: linear-gradient(310deg, $primary, #fdb504);
border: none;
}
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 02513931..92dcf7ef 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -1,304 +1,91 @@
@extends('admin::layouts.master')
-@section('title', '顾客管理')
+@section('title', '订单详情')
@section('content')
-