From 39af91d6254429613252c65d0734c8151ce59b82 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Thu, 8 Jul 2021 23:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=95=86=E5=93=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=96=B0=E5=A2=9E=E9=92=A9=E5=AD=90=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=81=BF=E5=85=8D=E6=97=A0=E6=95=B0=E6=8D=AE=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/layout/service/BaseLayout.php     | 13 +++-
 .../view/public/common/module_admin.html      | 78 ++++++++++---------
 .../view/public/common/module_view.html       | 78 ++++++++++---------
 3 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/application/layout/service/BaseLayout.php b/application/layout/service/BaseLayout.php
index d4bcb0253..988ff58f4 100644
--- a/application/layout/service/BaseLayout.php
+++ b/application/layout/service/BaseLayout.php
@@ -708,6 +708,15 @@ class BaseLayout
             $where[] = [$category_field, 'in', $category_id];
         }
 
+        // 商品搜索列表读取钩子
+        $hook_name = 'plugins_layout_service_search_goods_begin';
+        Hook::listen($hook_name, [
+            'hook_name'     => $hook_name,
+            'is_backend'    => true,
+            'params'        => $params,
+            'where'         => &$where,
+        ]);
+
         // 获取商品总数
         $result['total'] = GoodsService::CategoryGoodsTotal($where);
 
@@ -814,8 +823,8 @@ class BaseLayout
                 return DataReturn('数据类型未处理['.$params['data_type'].']', -1);
         }
 
-        // 商品搜索列表读取钩子
-        $hook_name = 'plugins_layout_service_search_goods_begin';
+        // 商品数据列表读取钩子
+        $hook_name = 'plugins_layout_service_goods_data_begin';
         Hook::listen($hook_name, [
             'hook_name'     => $hook_name,
             'is_backend'    => true,
diff --git a/application/layout/view/public/common/module_admin.html b/application/layout/view/public/common/module_admin.html
index 6ebe11773..686ca1cda 100644
--- a/application/layout/view/public/common/module_admin.html
+++ b/application/layout/view/public/common/module_admin.html
@@ -68,47 +68,49 @@
                                         </div>
                                     {{/case}}
                                     {{case goods}}
-                                        {{switch vss.config.view_list_show_style}}
-                                            {{case rolling}}
-                                                <div class="am-slider am-slider-default am-slider-carousel module-goods-content {{$vss.config.frontend_config.nav_dot_ent}}" data-am-flexslider="{itemWidth: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_width'])}}200{{else /}}{{$vss.config.view_list_show_style_value_arr.item_width}}{{/if}}, itemMargin: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_margin'])}}0{{else /}}{{$vss.config.view_list_show_style_value_arr.item_margin}}{{/if}}, slideshow: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_auto_play']) or $vss['config']['view_list_show_style_value_arr']['is_auto_play'] eq 0}}false{{else /}}true{{/if}}, controlNav: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_nav_dot']) or $vss['config']['view_list_show_style_value_arr']['is_nav_dot'] eq 0}}false{{else /}}true{{/if}}}">
-                                                    <div class="am-viewport">
-                                                        <ul class="am-slides module-list-content">
-                                                            {{foreach $vss.config.data_list as $g}}
-                                                                <li>
-                                                                    <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
-                                                                        <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
-                                                                            <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
-                                                                        </a>
-                                                                        <div class="item-bottom">
-                                                                            <div class="module-title">
-                                                                                <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
-                                                                            <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                        {{if !empty($vss['config']['data_list']) and is_array($vss['config']['data_list'])}}
+                                            {{switch vss.config.view_list_show_style}}
+                                                {{case rolling}}
+                                                    <div class="am-slider am-slider-default am-slider-carousel module-goods-content {{$vss.config.frontend_config.nav_dot_ent}}" data-am-flexslider="{itemWidth: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_width'])}}200{{else /}}{{$vss.config.view_list_show_style_value_arr.item_width}}{{/if}}, itemMargin: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_margin'])}}0{{else /}}{{$vss.config.view_list_show_style_value_arr.item_margin}}{{/if}}, slideshow: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_auto_play']) or $vss['config']['view_list_show_style_value_arr']['is_auto_play'] eq 0}}false{{else /}}true{{/if}}, controlNav: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_nav_dot']) or $vss['config']['view_list_show_style_value_arr']['is_nav_dot'] eq 0}}false{{else /}}true{{/if}}}">
+                                                        <div class="am-viewport">
+                                                            <ul class="am-slides module-list-content">
+                                                                {{foreach $vss.config.data_list as $g}}
+                                                                    <li>
+                                                                        <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
+                                                                            <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
+                                                                                <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
+                                                                            </a>
+                                                                            <div class="item-bottom">
+                                                                                <div class="module-title">
+                                                                                    <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
+                                                                                <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                                            </div>
                                                                         </div>
-                                                                    </div>
-                                                                </li>
-                                                            {{/foreach}}
-                                                        </ul>
+                                                                    </li>
+                                                                {{/foreach}}
+                                                            </ul>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            {{/case}}
-                                            {{default /}}
-                                                <ul class="module-goods-content module-list-content {{$vss.config.frontend_config.list_ent}}">
-                                                    {{foreach $vss.config.data_list as $g}}
-                                                        <li>
-                                                            <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
-                                                                <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
-                                                                    <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
-                                                                </a>
-                                                                <div class="item-bottom">
-                                                                    <div class="module-title">
-                                                                        <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
-                                                                    <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                {{/case}}
+                                                {{default /}}
+                                                    <ul class="module-goods-content module-list-content {{$vss.config.frontend_config.list_ent}}">
+                                                        {{foreach $vss.config.data_list as $g}}
+                                                            <li>
+                                                                <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
+                                                                    <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
+                                                                        <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
+                                                                    </a>
+                                                                    <div class="item-bottom">
+                                                                        <div class="module-title">
+                                                                            <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
+                                                                        <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                                    </div>
                                                                 </div>
-                                                            </div>
-                                                        </li>
-                                                    {{/foreach}}
-                                                </ul>
-                                        {{/switch}}
+                                                            </li>
+                                                        {{/foreach}}
+                                                    </ul>
+                                            {{/switch}}
+                                        {{/if}}
                                     {{/case}}
                                     {{case title}}
                                         <div class="module-title-content">
diff --git a/application/layout/view/public/common/module_view.html b/application/layout/view/public/common/module_view.html
index e846ecccf..08c2593f1 100644
--- a/application/layout/view/public/common/module_view.html
+++ b/application/layout/view/public/common/module_view.html
@@ -60,47 +60,49 @@
                                         </div>
                                     {{/case}}
                                     {{case goods}}
-                                        {{switch vss.config.view_list_show_style}}
-                                            {{case rolling}}
-                                                <div class="am-slider am-slider-default am-slider-carousel module-goods-content {{$vss.config.frontend_config.nav_dot_ent}}" data-am-flexslider="{itemWidth: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_width'])}}200{{else /}}{{$vss.config.view_list_show_style_value_arr.item_width}}{{/if}}, itemMargin: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_margin'])}}0{{else /}}{{$vss.config.view_list_show_style_value_arr.item_margin}}{{/if}}, slideshow: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_auto_play']) or $vss['config']['view_list_show_style_value_arr']['is_auto_play'] eq 0}}false{{else /}}true{{/if}}, controlNav: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_nav_dot']) or $vss['config']['view_list_show_style_value_arr']['is_nav_dot'] eq 0}}false{{else /}}true{{/if}}}">
-                                                    <div class="am-viewport">
-                                                        <ul class="am-slides module-list-content">
-                                                            {{foreach $vss.config.data_list as $g}}
-                                                                <li>
-                                                                    <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
-                                                                        <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
-                                                                            <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
-                                                                        </a>
-                                                                        <div class="item-bottom">
-                                                                            <div class="module-title">
-                                                                                <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
-                                                                            <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                        {{if !empty($vss['config']['data_list']) and is_array($vss['config']['data_list'])}}
+                                            {{switch vss.config.view_list_show_style}}
+                                                {{case rolling}}
+                                                    <div class="am-slider am-slider-default am-slider-carousel module-goods-content {{$vss.config.frontend_config.nav_dot_ent}}" data-am-flexslider="{itemWidth: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_width'])}}200{{else /}}{{$vss.config.view_list_show_style_value_arr.item_width}}{{/if}}, itemMargin: {{if empty($vss['config']['view_list_show_style_value_arr']) or empty($vss['config']['view_list_show_style_value_arr']['item_margin'])}}0{{else /}}{{$vss.config.view_list_show_style_value_arr.item_margin}}{{/if}}, slideshow: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_auto_play']) or $vss['config']['view_list_show_style_value_arr']['is_auto_play'] eq 0}}false{{else /}}true{{/if}}, controlNav: {{if empty($vss['config']['view_list_show_style_value_arr']) or !isset($vss['config']['view_list_show_style_value_arr']['is_nav_dot']) or $vss['config']['view_list_show_style_value_arr']['is_nav_dot'] eq 0}}false{{else /}}true{{/if}}}">
+                                                        <div class="am-viewport">
+                                                            <ul class="am-slides module-list-content">
+                                                                {{foreach $vss.config.data_list as $g}}
+                                                                    <li>
+                                                                        <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
+                                                                            <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
+                                                                                <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
+                                                                            </a>
+                                                                            <div class="item-bottom">
+                                                                                <div class="module-title">
+                                                                                    <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
+                                                                                <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                                            </div>
                                                                         </div>
-                                                                    </div>
-                                                                </li>
-                                                            {{/foreach}}
-                                                        </ul>
+                                                                    </li>
+                                                                {{/foreach}}
+                                                            </ul>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            {{/case}}
-                                            {{default /}}
-                                                <ul class="module-goods-content module-list-content {{$vss.config.frontend_config.list_ent}}">
-                                                    {{foreach $vss.config.data_list as $g}}
-                                                        <li>
-                                                            <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
-                                                                <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
-                                                                    <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
-                                                                </a>
-                                                                <div class="item-bottom">
-                                                                    <div class="module-title">
-                                                                        <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
-                                                                    <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                {{/case}}
+                                                {{default /}}
+                                                    <ul class="module-goods-content module-list-content {{$vss.config.frontend_config.list_ent}}">
+                                                        {{foreach $vss.config.data_list as $g}}
+                                                            <li>
+                                                                <div class="module-item" style="{{$vss.config.frontend_config.item_style}}">
+                                                                    <a href="{{$g.goods_url}}" target="_blank" class="{{$vss.config.frontend_config.media_fixed.media_container_ent}}" style="{{$vss.config.frontend_config.media_fixed.media_container_style}}">
+                                                                        <img src="{{$g.images}}" alt="{{$g.title}}" class="{{$vss.config.frontend_config.media_fixed.media_ent}}" />
+                                                                    </a>
+                                                                    <div class="item-bottom">
+                                                                        <div class="module-title">
+                                                                            <a href="{{$g.goods_url}}" target="_blank">{{$g.title}}</a></div>
+                                                                        <p class="module-price">{{$currency_symbol}}{{$g.price}}</p>
+                                                                    </div>
                                                                 </div>
-                                                            </div>
-                                                        </li>
-                                                    {{/foreach}}
-                                                </ul>
-                                        {{/switch}}
+                                                            </li>
+                                                        {{/foreach}}
+                                                    </ul>
+                                            {{/switch}}
+                                        {{/if}}
                                     {{/case}}
                                     {{case title}}
                                         <div class="module-title-content">