From f3f593ee9e7f5e78766315ea8da263ad36e9341a Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Mon, 18 Jul 2022 10:27:25 +0800
Subject: [PATCH] fixed slide show

---
 .../Http/Controllers/DesignController.php     |  4 ++--
 beike/{Admin => }/Services/DesignService.php  | 19 +++++++++++++++++--
 .../Shop/Http/Controllers/HomeController.php  |  3 ++-
 themes/default/design/slideshow.blade.php     |  8 ++++----
 themes/default/home.blade.php                 |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)
 rename beike/{Admin => }/Services/DesignService.php (65%)

diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php
index 86976964..18b40b41 100644
--- a/beike/Admin/Http/Controllers/DesignController.php
+++ b/beike/Admin/Http/Controllers/DesignController.php
@@ -4,9 +4,9 @@ namespace Beike\Admin\Http\Controllers;
 
 use Illuminate\View\View;
 use Illuminate\Http\Request;
+use Beike\Services\DesignService;
 use Beike\Repositories\SettingRepo;
 use Beike\Repositories\LanguageRepo;
-use Beike\Admin\Services\DesignService;
 
 class DesignController extends Controller
 {
@@ -52,7 +52,7 @@ class DesignController extends Controller
     public function update(Request $request): array
     {
         $content = json_decode($request->getContent(), true);
-        $moduleData = DesignService::handleModules($content);
+        $moduleData = DesignService::handleRequestModules($content);
         $data = [
             'type' => 'system',
             'space' => 'base',
diff --git a/beike/Admin/Services/DesignService.php b/beike/Services/DesignService.php
similarity index 65%
rename from beike/Admin/Services/DesignService.php
rename to beike/Services/DesignService.php
index 1cee3d84..a0d0ff02 100644
--- a/beike/Admin/Services/DesignService.php
+++ b/beike/Services/DesignService.php
@@ -9,13 +9,13 @@
  * @modified   2022-07-14 20:57:37
  */
 
-namespace Beike\Admin\Services;
+namespace Beike\Services;
 
 use Illuminate\Support\Str;
 
 class DesignService
 {
-    public static function handleModules($modulesData): array
+    public static function handleRequestModules($modulesData): array
     {
         $modulesData = $modulesData['modules'];
         if (empty($modulesData)) {
@@ -31,4 +31,19 @@ class DesignService
         }
         return ['modules' => $modulesData];
     }
+
+
+    public static function handleModuleContent($moduleCode, $content)
+    {
+        if ($moduleCode == 'slideshow') {
+            return self::handleSlideShow($content);
+        }
+        return $content;
+    }
+
+
+    private static function handleSlideShow($content)
+    {
+        return $content;
+    }
 }
diff --git a/beike/Shop/Http/Controllers/HomeController.php b/beike/Shop/Http/Controllers/HomeController.php
index 5b02aaf8..75d6bd22 100644
--- a/beike/Shop/Http/Controllers/HomeController.php
+++ b/beike/Shop/Http/Controllers/HomeController.php
@@ -2,6 +2,7 @@
 
 namespace Beike\Shop\Http\Controllers;
 
+use Beike\Services\DesignService;
 use Illuminate\Contracts\View\View;
 
 class HomeController extends Controller
@@ -27,7 +28,7 @@ class HomeController extends Controller
                     'code' => $code,
                     'module_id' => $moduleId,
                     'view_path' => $viewPath,
-                    'content' => $content
+                    'content' => DesignService::handleModuleContent($code, $content)
                 ];
             }
         }
diff --git a/themes/default/design/slideshow.blade.php b/themes/default/design/slideshow.blade.php
index a404c023..a661930d 100644
--- a/themes/default/design/slideshow.blade.php
+++ b/themes/default/design/slideshow.blade.php
@@ -3,7 +3,7 @@
   <link rel="stylesheet" href="{{ asset('vendor/swiper/swiper-bundle.min.css') }}">
 @endpush
 
-<section class="module-item {{ $design ? 'module-item-design' : ''}}" id="module-dasuybkdas">
+<section class="module-item {{ $design ? 'module-item-design' : ''}}" id="module-{{ $module_id }}">
   @if ($design)
   <div class="module-edit">
     <div class="edit-wrap">
@@ -15,7 +15,7 @@
   </div>
   @endif
   <div class="module-info">
-    <div class="swiper module-swiper-dasuybkdas module-slideshow">
+    <div class="swiper module-swiper-{{ $module_id }} module-slideshow">
       <div class="swiper-wrapper">
         <div class="swiper-slide">
           <a href=""><img src="{{ asset('image/default/banner.png') }}" class="img-fluid"></a>
@@ -50,7 +50,7 @@
         prevEl: '.swiper-button-prev',
       },
     })
-    </script>
-  @endpush
+  </script>
+@endpush
 
 
diff --git a/themes/default/home.blade.php b/themes/default/home.blade.php
index 011ee226..e4a4a136 100644
--- a/themes/default/home.blade.php
+++ b/themes/default/home.blade.php
@@ -4,7 +4,7 @@
 
 
 @foreach($modules as $module)
-  @include($module['view_path'], $module['content'])
+  @include($module['view_path'], $module)
 @endforeach
 
 {{-- <script>