From a67754f8c0a4250aa0e5bab48dbdd275f755fccc Mon Sep 17 00:00:00 2001 From: Devil Date: Thu, 26 Nov 2020 22:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=B0=8F=E5=AF=BC=E8=88=AA/l?= =?UTF-8?q?ogo=E4=BD=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E9=92=A9=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Common.php | 19 ++- .../view/default/public/header_top_nav.html | 120 ++++++++++++------ .../index/view/default/public/nav_search.html | 28 ++++ changelog.txt | 1 + 4 files changed, 129 insertions(+), 39 deletions(-) diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 8152534eb..ca020d91f 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -153,8 +153,17 @@ class Common extends Controller // 公共底部钩子 $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); - // 公共顶部小导航钩子-左侧 - $this->assign('plugins_view_header_navigation_top_left_data', Hook::listen('plugins_view_header_navigation_top_left', ['hook_name'=>'plugins_view_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + // 公共顶部小导航钩子-左侧前面 + $this->assign('plugins_view_header_navigation_top_left_begin_data', Hook::listen('plugins_view_header_navigation_top_left_begin', ['hook_name'=>'plugins_view_header_navigation_top_left_begin', 'is_backend'=>false, 'user'=>$this->user])); + + // 公共顶部小导航钩子-左侧后面 + $this->assign('plugins_view_header_navigation_top_left_end_data', Hook::listen('plugins_view_header_navigation_top_left_end', ['hook_name'=>'plugins_view_header_navigation_top_left_end', 'is_backend'=>false, 'user'=>$this->user])); + + // 公共顶部小导航钩子-右侧前面 + $this->assign('plugins_view_header_navigation_top_right_begin_data', Hook::listen('plugins_view_header_navigation_top_right_begin', ['hook_name'=>'plugins_view_header_navigation_top_right_begin', 'is_backend'=>false, 'user'=>$this->user])); + + // 公共顶部小导航钩子-右侧后面 + $this->assign('plugins_view_header_navigation_top_right_end_data', Hook::listen('plugins_view_header_navigation_top_right_end', ['hook_name'=>'plugins_view_header_navigation_top_right_end', 'is_backend'=>false, 'user'=>$this->user])); // 用户登录页面顶部钩子 $this->assign('plugins_view_user_login_info_top_data', Hook::listen('plugins_view_user_login_info_top', ['hook_name'=>'plugins_view_user_login_info_top', 'is_backend'=>false, 'user'=>$this->user])); @@ -171,6 +180,12 @@ class Common extends Controller // 底部导航上面钩子 $this->assign('plugins_view_common_footer_top_data', Hook::listen('plugins_view_common_footer_top', ['hook_name'=>'plugins_view_common_footer_top', 'is_backend'=>false, 'user'=>$this->user])); + // logo右侧 + $this->assign('plugins_view_common_logo_right_data', Hook::listen('plugins_view_common_logo_right', ['hook_name'=>'plugins_view_common_logo_right', 'is_backend'=>false, 'user'=>$this->user])); + + // 公共搜索框右侧 + $this->assign('plugins_view_common_search_right_data', Hook::listen('plugins_view_common_search_right', ['hook_name'=>'plugins_view_common_search_right', 'is_backend'=>false, 'user'=>$this->user])); + // 公共表格钩子名称动态处理 $current = 'plugins_view_index_'.$this->controller_name; diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html index db0a1e5e0..45d889a9c 100755 --- a/application/index/view/default/public/header_top_nav.html +++ b/application/index/view/default/public/header_top_nav.html @@ -4,6 +4,20 @@ + diff --git a/application/index/view/default/public/nav_search.html b/application/index/view/default/public/nav_search.html index f87ce59c6..f5d3ea34c 100755 --- a/application/index/view/default/public/nav_search.html +++ b/application/index/view/default/public/nav_search.html @@ -12,6 +12,20 @@ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_common_logo_right +
+ {{/if}} + {{if !empty($plugins_view_common_logo_right_data) and is_array($plugins_view_common_logo_right_data)}} + {{foreach $plugins_view_common_search_right_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
@@ -30,6 +44,20 @@ {{/if}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_common_search_right +
+ {{/if}} + {{if !empty($plugins_view_common_search_right_data) and is_array($plugins_view_common_search_right_data)}} + {{foreach $plugins_view_common_search_right_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
\ No newline at end of file diff --git a/changelog.txt b/changelog.txt index b23c3b701..f31bb9e56 100755 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,7 @@ 全局 1. 首页商品支持自定义配置 2. 首页左侧二级商品分类支持自定义配置 + 3. 快捷导航新增开关控制 web端 1. 后台管理小程序列表新增主题管理