From 960ec9de66ce70d306f490ab1d01e391e01b4ea5 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Mon, 18 Jul 2022 11:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Helpers.php                              |  2 +-
 beike/Services/DesignService.php               |  6 +++++-
 beike/Shop/Http/Controllers/HomeController.php |  1 +
 themes/default/design/slideshow.blade.php      | 11 +++++------
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/beike/Helpers.php b/beike/Helpers.php
index 55023ebd..2ab77b19 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -225,7 +225,7 @@ function current_language_id(): int
 /**
  * 当前语言code
  *
- * @return int
+ * @return string
  */
 function current_language_code(): string
 {
diff --git a/beike/Services/DesignService.php b/beike/Services/DesignService.php
index dfc3bda4..04d2ad1f 100644
--- a/beike/Services/DesignService.php
+++ b/beike/Services/DesignService.php
@@ -35,6 +35,9 @@ class DesignService
     }
 
 
+    /**
+     * @throws \Exception
+     */
     public static function handleModuleContent($moduleCode, $content)
     {
         if ($moduleCode == 'slideshow') {
@@ -54,7 +57,8 @@ class DesignService
     private static function handleSlideShow($content): array
     {
         foreach ($content['images'] as $index => $image) {
-            $content['images'][$index]['image'] = image_resize($image[current_language_code()] ?? '');
+            $imagePath = 'catalog' . ($image['image'][current_language_code()] ?? '');
+            $content['images'][$index]['image'] = image_origin($imagePath);
 
             $link = $image['link'];
             if (empty($link)) {
diff --git a/beike/Shop/Http/Controllers/HomeController.php b/beike/Shop/Http/Controllers/HomeController.php
index 75d6bd22..ca58df77 100644
--- a/beike/Shop/Http/Controllers/HomeController.php
+++ b/beike/Shop/Http/Controllers/HomeController.php
@@ -11,6 +11,7 @@ class HomeController extends Controller
      * 通过page builder 显示首页
      *
      * @return View
+     * @throws \Exception
      */
     public function index(): View
     {
diff --git a/themes/default/design/slideshow.blade.php b/themes/default/design/slideshow.blade.php
index fef8a115..c527366c 100644
--- a/themes/default/design/slideshow.blade.php
+++ b/themes/default/design/slideshow.blade.php
@@ -17,12 +17,11 @@
   <div class="module-info">
     <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>
-        </div>
-        <div class="swiper-slide">
-          <a href=""><img src="{{ asset('image/default/banner.png') }}" class="img-fluid"></a>
-        </div>
+        @foreach($content['images'] as $image)
+          <div class="swiper-slide">
+            <a href="{{ $image['link']['link'] }}"><img src="{{ $image['image'] }}" class="img-fluid"></a>
+          </div>
+        @endforeach
       </div>
       <div class="swiper-pagination"></div>
       <div class="swiper-button-prev"></div>