From 07111c8396018224cd070e94503fd49cc889cd42 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Tue, 9 Aug 2022 17:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=A8=A1=E5=9D=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Services/DesignService.php | 10 +++++----- public/build/beike/shop/default/css/app.css | 3 +++ .../admin/views/pages/design/builder/footer.blade.php | 10 +++++----- .../admin/views/pages/design/module/image100.blade.php | 2 +- .../admin/views/pages/design/module/image401.blade.php | 8 ++++---- .../views/pages/design/module/slideshow.blade.php | 4 ++-- .../beike/admin/views/pages/orders/form.blade.php | 2 +- resources/beike/admin/views/pages/pages/form.blade.php | 2 +- resources/beike/shop/default/css/footer.scss | 4 ++++ themes/default/layout/footer.blade.php | 2 +- 10 files changed, 27 insertions(+), 20 deletions(-) diff --git a/beike/Services/DesignService.php b/beike/Services/DesignService.php index 7f3ba6d9..a04bb121 100644 --- a/beike/Services/DesignService.php +++ b/beike/Services/DesignService.php @@ -157,9 +157,7 @@ class DesignService $type = $link['type'] ?? ''; $value = (int)$link['value'] ?? 0; - if ($type && $value) { - $images[$index]['link']['link'] = self::handleLink($type, $value); - } + $images[$index]['link']['link'] = self::handleLink($type, $value); } return $images; @@ -175,12 +173,14 @@ class DesignService */ private static function handleLink($type, $value): string { - if ($type == 'product') { + if ($type == 'product' && $value) { return shop_route('products.show', ['product' => $value]); } - if ($type == 'category') { + + if ($type == 'category' && $value) { return shop_route('categories.show', ['category' => $value]); } + return ''; } } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index ed3d6192..106fedf5 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -582,6 +582,9 @@ footer { background: #fafafa; margin-top: 5rem; } +footer .footer-active { + outline: 2px dashed #4bb1f0 !important; +} footer .services-wrap { padding: 2.2rem 0; border-bottom: 1px solid #e4e4e4; diff --git a/resources/beike/admin/views/pages/design/builder/footer.blade.php b/resources/beike/admin/views/pages/design/builder/footer.blade.php index 357aa852..0280a72f 100644 --- a/resources/beike/admin/views/pages/design/builder/footer.blade.php +++ b/resources/beike/admin/views/pages/design/builder/footer.blade.php @@ -232,11 +232,11 @@ }, footerItemChange(val) { - console.log(val) - // $footer = $("#preview-iframe").contents().find('footer'); - // $footer.find("div").removeClass('footer-active'); - // if (!val) return; - // $footer.find(`.${val}`).addClass('footer-active'); + // console.log(val) + $footer = $("#preview-iframe").contents().find('footer'); + $footer.find("div").removeClass('footer-active'); + if (!val) return; + $footer.find(`.${val}`).addClass('footer-active'); }, // 编辑模块 diff --git a/resources/beike/admin/views/pages/design/module/image100.blade.php b/resources/beike/admin/views/pages/design/module/image100.blade.php index 35326086..857e7b40 100644 --- a/resources/beike/admin/views/pages/design/module/image100.blade.php +++ b/resources/beike/admin/views/pages/design/module/image100.blade.php @@ -58,7 +58,7 @@ setTimeout(() => { full: true, images: [ { - image: languagesFill('/demo/banner-2.png'), + image: languagesFill('catalog/demo/banner-2.png'), show: true, link: { type: 'product', diff --git a/resources/beike/admin/views/pages/design/module/image401.blade.php b/resources/beike/admin/views/pages/design/module/image401.blade.php index d5b3e89f..5eba79e9 100644 --- a/resources/beike/admin/views/pages/design/module/image401.blade.php +++ b/resources/beike/admin/views/pages/design/module/image401.blade.php @@ -65,7 +65,7 @@ setTimeout(() => { floor: languagesFill(''), images: [ { - image: languagesFill('/demo/image_plus_1.png'), + image: languagesFill('catalog/demo/image_plus_1.png'), show: true, link: { type: 'product', @@ -73,7 +73,7 @@ setTimeout(() => { } }, { - image: languagesFill('/demo/image_plus_2.png'), + image: languagesFill('catalog/demo/image_plus_2.png'), show: false, link: { type: 'product', @@ -81,7 +81,7 @@ setTimeout(() => { } }, { - image: languagesFill('/demo/image_plus_3.png'), + image: languagesFill('catalog/demo/image_plus_3.png'), show: false, link: { type: 'product', @@ -89,7 +89,7 @@ setTimeout(() => { } }, { - image: languagesFill('/demo/image_plus_4.png'), + image: languagesFill('catalog/demo/image_plus_4.png'), show: false, link: { type: 'product', diff --git a/resources/beike/admin/views/pages/design/module/slideshow.blade.php b/resources/beike/admin/views/pages/design/module/slideshow.blade.php index d220b325..88ac2f49 100644 --- a/resources/beike/admin/views/pages/design/module/slideshow.blade.php +++ b/resources/beike/admin/views/pages/design/module/slideshow.blade.php @@ -102,7 +102,7 @@ setTimeout(() => { floor: languagesFill(''), images: [ { - image: languagesFill('/demo/banner.png'), + image: languagesFill('catalog/demo/banner.png'), show: true, link: { type: 'product', @@ -110,7 +110,7 @@ setTimeout(() => { } }, { - image: languagesFill('/demo/banner.png'), + image: languagesFill('catalog/demo/banner.png'), show: false, link: { type: 'product', diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php index c52e13cd..6e00db22 100644 --- a/resources/beike/admin/views/pages/orders/form.blade.php +++ b/resources/beike/admin/views/pages/orders/form.blade.php @@ -49,7 +49,7 @@ @can('orders_update_status')
-
状态
+
订单状态
diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php index 2a63accf..f27e1276 100644 --- a/resources/beike/admin/views/pages/pages/form.blade.php +++ b/resources/beike/admin/views/pages/pages/form.blade.php @@ -23,7 +23,7 @@
@foreach ($admin_languages as $language)
- +