From 32f0e836d169af9791751a9c3f9cdff08f005c09 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Tue, 19 Jul 2022 20:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/DesignController.php | 2 +- beike/Admin/View/Components/Header.php | 1 + beike/Admin/View/DesignBuilders/Image100.php | 44 +++++++++++ beike/Services/DesignService.php | 5 ++ public/build/beike/admin/css/design.css | 5 +- public/build/beike/shop/default/css/app.css | 4 + resources/beike/admin/css/design/app.scss | 5 +- .../pages/design/builder/index.blade.php | 11 ++- .../pages/design/module/image100.blade.php | 76 +++++++++++++++++++ .../default/css/module/module-image-plus.scss | 5 ++ themes/default/design/image100.blade.php | 18 +++++ themes/default/design/tab_product.blade.php | 2 +- 12 files changed, 169 insertions(+), 9 deletions(-) create mode 100644 beike/Admin/View/DesignBuilders/Image100.php create mode 100644 resources/beike/admin/views/pages/design/module/image100.blade.php create mode 100644 themes/default/design/image100.blade.php diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php index 80c58015..96a82b4f 100644 --- a/beike/Admin/Http/Controllers/DesignController.php +++ b/beike/Admin/Http/Controllers/DesignController.php @@ -19,7 +19,7 @@ class DesignController extends Controller public function index(Request $request): View { $data = [ - 'editors' => ['editor-slide_show', 'editor-image401', 'editor-tab_product'], + 'editors' => ['editor-slide_show', 'editor-image401', 'editor-tab_product', 'editor-image100'], 'languages' => LanguageRepo::all(), 'design_settings' => system_setting('base.design_setting'), ]; diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php index 4fc6c0a8..277ccc4e 100644 --- a/beike/Admin/View/Components/Header.php +++ b/beike/Admin/View/Components/Header.php @@ -21,6 +21,7 @@ class Header extends Component $this->addLink('会员管理', admin_route('customers.index'), equal_route('admin.customers.index')); // $this->addLink('营销管理', admin_route('home.index'), equal_route('admin.promotions.index')); $this->addLink('插件管理', admin_route('plugins.index'), equal_route('admin.plugins.index')); + $this->addLink('首页装修', admin_route('design.index'), equal_route('admin.design.index')); $this->addLink('系统设置', admin_route('home.index'), equal_route('admin.settings.index')); } diff --git a/beike/Admin/View/DesignBuilders/Image100.php b/beike/Admin/View/DesignBuilders/Image100.php new file mode 100644 index 00000000..7f3c8a87 --- /dev/null +++ b/beike/Admin/View/DesignBuilders/Image100.php @@ -0,0 +1,44 @@ + + * @created 2022-07-08 17:09:15 + * @modified 2022-07-08 17:09:15 + */ + +namespace Beike\Admin\View\DesignBuilders; + +use Illuminate\View\Component; +use Illuminate\Contracts\View\View; + +class Image100 extends Component +{ + /** + * Create a new component instance. + * + * @return void + */ + public function __construct() + { + } + + /** + * Get the view / contents that represent the component. + * + * @return View + */ + public function render(): View + { + $data['register'] = [ + 'code' => 'image100', + 'sort' => 0, + 'name' => '单图模块', + 'icon' => '', + ]; + + return view('admin::pages.design.module.image100', $data); + } +} diff --git a/beike/Services/DesignService.php b/beike/Services/DesignService.php index 20cca45f..b43273f9 100644 --- a/beike/Services/DesignService.php +++ b/beike/Services/DesignService.php @@ -43,6 +43,8 @@ class DesignService return self::handleSlideShow($content); } elseif ($moduleCode == 'image401') { return self::handleImage401($content); + } elseif ($moduleCode == 'image100') { + return self::handleImage401($content); } elseif ($moduleCode == 'tab_product') { return self::handleTabProducts($content); } @@ -84,6 +86,7 @@ class DesignService } $content['images'] = self::handleImages($images); + $content['full'] = $content['full'] ?? false; return $content; } @@ -109,6 +112,7 @@ class DesignService } } $content['tabs'] = $tabs; + $content['title'] = $content['title'][current_language_code()]; return $content; } @@ -138,6 +142,7 @@ class DesignService $images[$index]['link']['link'] = self::handleLink($type, $value); } } + return $images; } diff --git a/public/build/beike/admin/css/design.css b/public/build/beike/admin/css/design.css index c54c3203..f3504579 100644 --- a/public/build/beike/admin/css/design.css +++ b/public/build/beike/admin/css/design.css @@ -56,9 +56,10 @@ body.page-design .design-box .design-head > div { text-align: center; font-size: 0.8rem; transition: all 0.2s ease-in-out; + border-right: 1px solid #5692ff; } -body.page-design .design-box .design-head > div.save-btn { - border-left: 1px solid #5692ff; +body.page-design .design-box .design-head > div:last-of-type { + border-right: none; } body.page-design .design-box .design-head > div i { margin-right: 7px; diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index aff72ff7..c4816e1a 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -852,6 +852,10 @@ body.page-account-address .addresses-wrap .item .address-bottom a, body.page-che background-color: #eb4802; } +.module-image-plus .container-fluid { + padding-right: 0; + padding-left: 0; +} .module-image-plus .module-image-plus-top { display: flex; } diff --git a/resources/beike/admin/css/design/app.scss b/resources/beike/admin/css/design/app.scss index 040b8e24..79a39ac4 100644 --- a/resources/beike/admin/css/design/app.scss +++ b/resources/beike/admin/css/design/app.scss @@ -49,9 +49,10 @@ body.page-design { text-align: center; font-size: .8rem; transition: all .2s ease-in-out; + border-right: 1px solid #5692ff; - &.save-btn { - border-left: 1px solid #5692ff; + &:last-of-type { + border-right: none; } i { 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 59ff19c5..35eb4be2 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -26,8 +26,9 @@