From e332135dac9ce7da4db1c7252bf7786edd63d16a Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 17 May 2022 18:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Cache.php                |  3 --
 app/index/controller/Common.php               |  6 ++++
 app/index/view/default/public/nav_search.html | 29 +++++++++++++++++++
 public/static/index/default/css/common.css    |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/Cache.php b/app/admin/controller/Cache.php
index e60a1c158..41422f5f2 100755
--- a/app/admin/controller/Cache.php
+++ b/app/admin/controller/Cache.php
@@ -69,9 +69,6 @@ class Cache extends Common
 		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'cache');
 		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'data');
 
-		// 缓存操作清除
-		\think\facade\Cache::clear();
-
 		return $this->success('更新成功');
 	}
 
diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php
index 35e696b59..13b8c4942 100755
--- a/app/index/controller/Common.php
+++ b/app/index/controller/Common.php
@@ -603,6 +603,12 @@ class Common extends BaseController
         // 公共搜索框右侧
         MyViewAssign('plugins_view_common_search_right_data', MyEventTrigger('plugins_view_common_search_right', ['hook_name'=>'plugins_view_common_search_right', 'is_backend'=>false, 'user'=>$this->user]));
 
+        // 公共搜索框内左侧
+        MyViewAssign('plugins_view_common_search_inside_left_data', MyEventTrigger('plugins_view_common_search_inside_left', ['hook_name'=>'plugins_view_common_search_inside_left', 'is_backend'=>false, 'user'=>$this->user]));
+
+        // 公共搜索框内右侧
+        MyViewAssign('plugins_view_common_search_inside_right_data', MyEventTrigger('plugins_view_common_search_inside_right', ['hook_name'=>'plugins_view_common_search_inside_right', 'is_backend'=>false, 'user'=>$this->user]));
+
         // 公共表格钩子名称动态处理
         $current = 'plugins_view_index_'.$this->controller_name;
 
diff --git a/app/index/view/default/public/nav_search.html b/app/index/view/default/public/nav_search.html
index 48eaa79b9..acaf418de 100755
--- a/app/index/view/default/public/nav_search.html
+++ b/app/index/view/default/public/nav_search.html
@@ -27,6 +27,21 @@
         {{/if}}
 
         <div class="search-bar">
+            <!-- 公共搜索框内左侧 -->
+            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+                <div class="plugins-tag">
+                    <span>plugins_view_common_search_inside_left</span>
+                </div>
+            {{/if}}
+            {{if !empty($plugins_view_common_search_inside_left_data) and is_array($plugins_view_common_search_inside_left_data)}}
+                {{foreach $plugins_view_common_search_inside_left_data as $hook}}
+                    {{if is_string($hook) or is_int($hook)}}
+                        {{$hook|raw}}
+                    {{/if}}
+                {{/foreach}}
+            {{/if}}
+
+            <!-- 搜索框 -->
             <form action="{{:MyUrl('index/search/index')}}" method="POST">
                 <div class="search-group">
                     <input id="search-input" name="wd" type="text" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['wd'])}}{{$params.wd}}{{/if}}" autocomplete="off" />
@@ -43,6 +58,20 @@
                     </ul>
                 {{/if}}
             </form>
+
+            <!-- 公共搜索框内右侧 -->
+            {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+                <div class="plugins-tag">
+                    <span>plugins_view_common_search_inside_right</span>
+                </div>
+            {{/if}}
+            {{if !empty($plugins_view_common_search_inside_right_data) and is_array($plugins_view_common_search_inside_right_data)}}
+                {{foreach $plugins_view_common_search_inside_right_data as $hook}}
+                    {{if is_string($hook) or is_int($hook)}}
+                        {{$hook|raw}}
+                    {{/if}}
+                {{/foreach}}
+            {{/if}}
         </div>
 
         <!-- 公共搜索框右侧 -->
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index cfeb83636..31a611a2f 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -79,7 +79,7 @@ input.add,input.min{width:15px}
 #ai-topsearch { width:27%;height:26px;border:none;background: #d2364c none repeat scroll 0% 0%; color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: absolute;top: 0;right: 0;}
 .search-group:hover {border: 2px solid #ea304b !important;}
 .search-group:hover #ai-topsearch {background: #ea304b;}
-.search-hot-keywords { margin-top: 5px; height: 16px; overflow: hidden; display: none; }
+.search-hot-keywords { margin-top: 5px; height: 16px; overflow: hidden; display: none; padding-left: 2px; }
 .search-hot-keywords li { float: left; }
 .search-hot-keywords li:not(:last-child) { margin-right: 10px; }