From c45bc8ca2983c70c99441d7b0fdfa0f50bfb1062 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Fri, 15 Jul 2022 18:56:11 +0800 Subject: [PATCH] wip --- beike/Shop/Providers/ShopServiceProvider.php | 3 +++ public/build/beike/shop/default/css/app.css | 4 ++-- .../views/pages/design/builder/index.blade.php | 2 +- resources/beike/shop/default/css/home.scss | 14 ++++++++------ themes/default/design/slideshow.blade.php | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php index bf029903..c29215c6 100644 --- a/beike/Shop/Providers/ShopServiceProvider.php +++ b/beike/Shop/Providers/ShopServiceProvider.php @@ -60,6 +60,9 @@ class ShopServiceProvider extends ServiceProvider protected function loadShareViewData() { + + View::share('design', request('design') == 1); + View::share('languages', languages()); $menuCategories = CategoryRepo::getTwoLevelCategories(); diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index ee06f7d2..57a17061 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -784,10 +784,10 @@ body.page-account-address .addresses-wrap .item .address-bottom a, body.page-che .module-item { position: relative; } -.module-item:hover .module-edit { +.module-item.module-item-design:hover .module-edit { display: flex; } -.module-item:hover:after { +.module-item.module-item-design:hover:after { display: block; } .module-item:after { diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index 5f673fe5..d3130502 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -49,7 +49,7 @@
- +
diff --git a/resources/beike/shop/default/css/home.scss b/resources/beike/shop/default/css/home.scss index 7571d3b6..29f355e7 100644 --- a/resources/beike/shop/default/css/home.scss +++ b/resources/beike/shop/default/css/home.scss @@ -3,13 +3,15 @@ .module-item { position: relative; - &:hover { - .module-edit { - display: flex; - } + &.module-item-design { + &:hover { + .module-edit { + display: flex; + } - &:after { - display: block; + &:after { + display: block; + } } } diff --git a/themes/default/design/slideshow.blade.php b/themes/default/design/slideshow.blade.php index 301ce02c..37d04753 100644 --- a/themes/default/design/slideshow.blade.php +++ b/themes/default/design/slideshow.blade.php @@ -1,5 +1,5 @@ -
- @if (true) +
+ @if ($design)