From f8d70ca46beec7bdbe380d98a24b92cb1029c481 Mon Sep 17 00:00:00 2001 From: pushuo Date: Tue, 15 Nov 2022 10:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94=E5=BC=8F?= =?UTF-8?q?=20->=20https://gitee.com/beikeshop/beikeshop/issues/I6151F=3Ff?= =?UTF-8?q?rom=3Dproject-issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beike/shop/default/css/account/account.scss | 12 +++++++++++- resources/beike/shop/default/css/global.scss | 11 +++++++++++ resources/beike/shop/default/css/header.scss | 11 +++++++++++ .../shop/default/css/page-account-order.scss | 17 ++++++++++++++++- .../beike/shop/default/css/page-product.scss | 6 ++++++ themes/default/account/account.blade.php | 8 ++++---- themes/default/components/breadcrumbs.blade.php | 2 +- 7 files changed, 60 insertions(+), 7 deletions(-) diff --git a/resources/beike/shop/default/css/account/account.scss b/resources/beike/shop/default/css/account/account.scss index aeaa14af..c5919157 100644 --- a/resources/beike/shop/default/css/account/account.scss +++ b/resources/beike/shop/default/css/account/account.scss @@ -29,9 +29,19 @@ body.page-account { } } + .card-body { + @media (min-width: 992px) { + min-height: 509px; + } + } + .order-wrap { background-color: #f6f8f9; - padding: 2rem 1rem; + + @media (min-width:768px) { + padding: 2rem 1rem; + } + .icon { i { font-size: 4.5rem; diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index ef555d3a..f5795799 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -260,6 +260,10 @@ body[class^="page-account-"] { transition: all .2s ease-in-out; text-decoration: none !important; + &:last-of-type { + border-bottom: none; + } + &:hover { background-color: #E9ECEF; } @@ -291,4 +295,11 @@ table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-hea display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; +} + +.breadcrumb { + @media (max-width: 768px) { + padding-top: .8rem; + padding-bottom: .8rem; + } } \ No newline at end of file diff --git a/resources/beike/shop/default/css/header.scss b/resources/beike/shop/default/css/header.scss index 6451eb55..e2f1d18e 100644 --- a/resources/beike/shop/default/css/header.scss +++ b/resources/beike/shop/default/css/header.scss @@ -190,6 +190,17 @@ header { > div { width: 33.33%; + + &.center a { + display: flex; + align-items: center; + justify-content: center; + height: 30px; + + img { + max-height: 100%; + } + } } .left { diff --git a/resources/beike/shop/default/css/page-account-order.scss b/resources/beike/shop/default/css/page-account-order.scss index 93b0b6c9..35c30cf4 100644 --- a/resources/beike/shop/default/css/page-account-order.scss +++ b/resources/beike/shop/default/css/page-account-order.scss @@ -51,7 +51,22 @@ body.page-account-order-list { margin-right: 10px; @media (max-width:768px) { - display: none; + // display: none; + flex: 0 0 50px; + width: 50px + } + } + + .name { + @media (max-width:768px) { + a { + overflow: hidden; + text-overflow:ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + font-size: 12px; + } } } } diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss index 38338796..5d6874cc 100644 --- a/resources/beike/shop/default/css/page-product.scss +++ b/resources/beike/shop/default/css/page-product.scss @@ -9,6 +9,12 @@ */ body.page-product { + @media (max-width: 768px) { + .breadcrumb { + display: none + } + } + .product-image { .swiper { height: 250px; diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php index d2ccf307..000c52dd 100644 --- a/themes/default/account/account.blade.php +++ b/themes/default/account/account.blade.php @@ -45,13 +45,13 @@
{{ __('shop/account.pending_payment') }} + class="text-muted text-center">{{ __('shop/account.pending_payment') }} {{ __('shop/account.pending_send') }} + class="text-muted text-center">{{ __('shop/account.pending_send') }} {{ __('shop/account.pending_receipt') }} + class="text-muted text-center">{{ __('shop/account.pending_receipt') }} {{ __('shop/account.after_sales') }} + class="text-muted text-center">{{ __('shop/account.after_sales') }}
@if (!count($latest_orders)) diff --git a/themes/default/components/breadcrumbs.blade.php b/themes/default/components/breadcrumbs.blade.php index 1dc322dd..4e4db13e 100644 --- a/themes/default/components/breadcrumbs.blade.php +++ b/themes/default/components/breadcrumbs.blade.php @@ -1,5 +1,5 @@ @unless ($breadcrumbs->isEmpty()) -