From eb6d07ea0f5c64a06f8068371f38ee9b9b56e4e4 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 27 Jun 2022 20:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E9=A1=B5=E9=9D=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Shop/Repositories/ProductRepo.php | 1 - public/build/beike/shop/default/css/app.css | 5 + .../beike/shop/default/css/bootstrap.css | 10 +- .../shop/default/bootstrap/bootstrap.scss | 2 +- resources/beike/shop/default/cart.scss | 8 ++ .../beike/shop/default/page-categories.scss | 5 + themes/default/account.blade.php | 88 ++++++++++++-- themes/default/category.blade.php | 21 +++- themes/default/pages/cart.blade.php | 2 +- themes/default/product.blade.php | 111 ++++++++++++++---- 10 files changed, 208 insertions(+), 45 deletions(-) create mode 100644 resources/beike/shop/default/page-categories.scss diff --git a/beike/Shop/Repositories/ProductRepo.php b/beike/Shop/Repositories/ProductRepo.php index 2f8d1251..771c6e10 100644 --- a/beike/Shop/Repositories/ProductRepo.php +++ b/beike/Shop/Repositories/ProductRepo.php @@ -26,7 +26,6 @@ class ProductRepo $product = Product::query()->findOrFail($product); } $product->load('description', 'skus', 'master_sku'); - dd($product); return $product; } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index a5b66de5..0e856c9a 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -430,3 +430,8 @@ body.page-cart .total-wrap .card-header { border-bottom: none; background-color: transparent; } +body.page-cart .total-wrap .list-group li { + display: flex; + align-items: center; + justify-content: space-between; +} diff --git a/public/build/beike/shop/default/css/bootstrap.css b/public/build/beike/shop/default/css/bootstrap.css index 1f27fa64..ae6be897 100644 --- a/public/build/beike/shop/default/css/bootstrap.css +++ b/public/build/beike/shop/default/css/bootstrap.css @@ -229,7 +229,7 @@ a { text-decoration: none; } a:hover { - color: #fd560f; + color: #191919; } a:not([href]):not([class]), a:not([href]):not([class]):hover { @@ -3463,7 +3463,7 @@ textarea.form-control-lg { text-decoration: none; } .btn-link:hover { - color: #fd560f; + color: #191919; } .btn-link:disabled, .btn-link.disabled { color: #6c757d; @@ -3939,7 +3939,7 @@ textarea.form-control-lg { } } .nav-link:hover, .nav-link:focus { - color: #fd560f; + color: #191919; } .nav-link.disabled { color: #6c757d; @@ -4802,13 +4802,13 @@ textarea.form-control-lg { } .page-link:hover { z-index: 2; - color: #fd560f; + color: #191919; background-color: #e9ecef; border-color: #dee2e6; } .page-link:focus { z-index: 3; - color: #fd560f; + color: #191919; background-color: #e9ecef; outline: 0; box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); diff --git a/resources/beike/shop/default/bootstrap/bootstrap.scss b/resources/beike/shop/default/bootstrap/bootstrap.scss index 3b5e7d1f..57df4852 100644 --- a/resources/beike/shop/default/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/bootstrap/bootstrap.scss @@ -33,7 +33,7 @@ $input-btn-font-size: 0.9rem; $link-decoration: none; $link-color: #1f1f1f; -$link-hover-color: $primary; +// $link-hover-color: $primary; @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; @import './bootstrap-icons'; diff --git a/resources/beike/shop/default/cart.scss b/resources/beike/shop/default/cart.scss index c67c012f..d27d0a28 100644 --- a/resources/beike/shop/default/cart.scss +++ b/resources/beike/shop/default/cart.scss @@ -75,5 +75,13 @@ body.page-cart { border-bottom: none; background-color: transparent; } + + .list-group { + li { + display: flex; + align-items: center; // flex-start | center + justify-content: space-between; // flex-end | center | space-between + } + } } } \ No newline at end of file diff --git a/resources/beike/shop/default/page-categories.scss b/resources/beike/shop/default/page-categories.scss new file mode 100644 index 00000000..65b20fe7 --- /dev/null +++ b/resources/beike/shop/default/page-categories.scss @@ -0,0 +1,5 @@ +@charset "UTF-8"; + +body.page-categories { + +} \ No newline at end of file diff --git a/themes/default/account.blade.php b/themes/default/account.blade.php index f65413f7..f3fb3314 100644 --- a/themes/default/account.blade.php +++ b/themes/default/account.blade.php @@ -1,12 +1,84 @@ @extends('layout.master') -@section('content') -
-

Account

- 尊敬的会员 {{ $email }}， 欢迎您回来。 -
-
- 退出 -
+@section('body-class', 'page-account') +@section('content') +
+ + +
+
+ +
+
+ + +
+
+
@endsection diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php index cc09dcf8..12e5a2be 100644 --- a/themes/default/category.blade.php +++ b/themes/default/category.blade.php @@ -1,11 +1,20 @@ @extends('layout.master') +@section('body-class', 'page-categories') @section('content') - @foreach ($products as $product) - - {{ $product->description->name }} - {{ $product->description->name }} - - @endforeach +
+ + +
+ @foreach ($products as $product) +
@include('layout.product')
+ @endforeach +
+
@endsection diff --git a/themes/default/pages/cart.blade.php b/themes/default/pages/cart.blade.php index 34b84a1f..6f78915f 100644 --- a/themes/default/pages/cart.blade.php +++ b/themes/default/pages/cart.blade.php @@ -73,7 +73,7 @@ diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index df17d06e..b247d86b 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -1,29 +1,94 @@ @extends('layout.master') -@section('content') -

{{ $product->description->name }}

+@section('body-class', 'page-product') -

SKUs

- - - - - - - - - - - - @foreach ($product->skus as $sku) +@section('content') + +
+ + +
+
+
+
+ @for ($i = 0; $i < 5; $i++) +
+ @endfor +
+
+
+
+
+
+

{{ $product->description->name }}

+
+
+ @for ($i = 0; $i < 5; $i++) + + @endfor +
+ 132 reviews +
+
+
{{ $product->master_sku->price }}
+
{{ $product->master_sku->origin_price }}
+
+
+
#modelskuprice
+ - - - - - + + - @endforeach - -
{{ $loop->iteration }}{{ $sku->model }}{{ $sku->sku }}{{ $sku->price }}Add to cart型号{{ $product->master_sku->model }}
+ + Sku + {{ $product->master_sku->sku }} + +{{-- + 型号 + product-222 + --}} + + + + +
+
+ +
+ + +
+
+ +
+ + + + +
+
+ + Description + + + Size & Fit + + + Shipping & Return + +
+
+
111
+
222
+
333
+
+
+ @endsection +