From 329bdb0a9c2bb39f974847e1d904595fa5c513b1 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Fri, 1 Jul 2022 17:49:40 +0800 Subject: [PATCH] wip --- public/build/beike/admin/css/app.css | 8 +++++++- public/build/beike/shop/default/css/app.css | 4 ++++ public/build/beike/shop/default/js/app.js | 1 + resources/beike/admin/css/_global.scss | 2 +- resources/beike/admin/css/_header.scss | 8 ++++++++ .../beike/admin/views/components/header.blade.php | 4 ++-- resources/beike/shop/default/css/cart.scss | 6 ++++++ resources/beike/shop/default/css/global.scss | 1 + resources/beike/shop/default/js/app.js | 1 + themes/default/cart.blade.php | 13 ++++++++++--- themes/default/checkout.blade.php | 2 +- 11 files changed, 42 insertions(+), 8 deletions(-) diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index c37d1add..5b492b2d 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -46,7 +46,7 @@ body { } .main-content > #content { flex: 1; - padding: 1rem; + padding: 1rem 1rem 4rem; overflow-y: auto; } @media screen and (max-width: 991px) { @@ -224,6 +224,12 @@ body.page-seller-product .share-link-pop .share-links-code img { } .header-wrap .header-left { width: 190px; + display: flex; + align-items: center; + justify-content: center; +} +.header-wrap .header-left .logo { + max-width: 76%; } .header-wrap .header-right { display: flex; diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 504c6d97..2d2a9901 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -104,6 +104,7 @@ height: 17px; text-align: center; cursor: pointer; + background-color: #fff; } .quantity-wrap > .right i:last-of-type { border-top: 1px solid #ced4da; @@ -429,6 +430,9 @@ body.page-cart .cart-products-wrap .table tbody td { vertical-align: middle; border-color: #f0f2f4; } +body.page-cart .cart-products-wrap .table tbody tr.active { + background-color: #fff6f1; +} body.page-cart .cart-products-wrap .table thead { background-color: #F8F9FA; } diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js index 85fafe9d..0a59726f 100644 --- a/public/build/beike/shop/default/js/app.js +++ b/public/build/beike/shop/default/js/app.js @@ -18,6 +18,7 @@ $(document).ready(function ($) { } }); $('.quantity-wrap .right i').on('click', function (event) { + event.stopPropagation(); var input = $(this).parent().siblings('input'); if ($(this).hasClass('bi-chevron-up')) { diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 76f955f3..24aa0854 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -44,7 +44,7 @@ body { > #content { flex: 1; - padding: 1rem; + padding: 1rem 1rem 4rem; overflow-y: auto; @media screen and (max-width: 991px) { diff --git a/resources/beike/admin/css/_header.scss b/resources/beike/admin/css/_header.scss index 1e1511c2..18552ac2 100644 --- a/resources/beike/admin/css/_header.scss +++ b/resources/beike/admin/css/_header.scss @@ -17,6 +17,14 @@ .header-left { width: 190px; + display: flex; + align-items: center; // flex-start | center + justify-content: center; // flex-end | center | space-between + // flex-wrap: wrap; + + .logo { + max-width: 76%; + } } .header-right { diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index 70b46cfb..ab9c71d5 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -1,8 +1,8 @@
diff --git a/resources/beike/shop/default/css/cart.scss b/resources/beike/shop/default/css/cart.scss index 4e0a27ee..014c2536 100644 --- a/resources/beike/shop/default/css/cart.scss +++ b/resources/beike/shop/default/css/cart.scss @@ -9,6 +9,12 @@ body.page-cart { vertical-align: middle; border-color: #f0f2f4; } + + tr { + &.active { + background-color: #fff6f1; + } + } } thead { diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index 2685a090..835dfb4c 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -101,6 +101,7 @@ height: 17px; text-align: center; cursor: pointer; + background-color: #fff; &:last-of-type { border-top: 1px solid #ced4da; } diff --git a/resources/beike/shop/default/js/app.js b/resources/beike/shop/default/js/app.js index 08a267a5..549ac22b 100644 --- a/resources/beike/shop/default/js/app.js +++ b/resources/beike/shop/default/js/app.js @@ -6,6 +6,7 @@ $(document).ready(function ($) { }); $('.quantity-wrap .right i').on('click', function(event) { + event.stopPropagation(); let input = $(this).parent().siblings('input') if ($(this).hasClass('bi-chevron-up')) { diff --git a/themes/default/cart.blade.php b/themes/default/cart.blade.php index e49d2fbb..899fcb1e 100644 --- a/themes/default/cart.blade.php +++ b/themes/default/cart.blade.php @@ -40,10 +40,11 @@ - +
- +
@@ -75,7 +76,8 @@
商品总计
    -
  • 总数@{{ total_quantity }}
    • +
  • 全部@{{ products.length }}
    • +
  • 已选@{{ total_quantity }}
  • 总价@{{ amount_format }}
  • {{-- 去结账 --}} @@ -151,6 +153,11 @@ }) }, + checkedCartTr(index) { + this.products[index].selected = !this.products[index].selected; + this.selectedBtnSelected(); + }, + selectedBtnSelected() { const self = this; const cart_ids = this.products.filter(e => e.selected).map(x => x.cart_id) diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index c3f1843b..8632641b 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -213,6 +213,7 @@ }, beforeMount () { + this.countryChange(this.dialogAddress.form.country_id); }, methods: { @@ -225,7 +226,6 @@ }) } - this.countryChange(this.dialogAddress.form.country_id); this.dialogAddress.show = true },