diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index 43d85098a50b63964d32978a29c6447b29f71541..6231a9755f7aec9b5e9e3f489362c101a2b1ccc3 100755 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -58,9 +58,6 @@ class Config extends Common // 是否 $this->assign('common_is_text_list', lang('common_is_text_list')); - // 热门搜索关键字 - $this->assign('common_search_keywords_type_list', lang('common_search_keywords_type_list')); - // 配置信息 $this->assign('data', ConfigService::ConfigList()); diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php index 1d2d6427800df804dd6458aadc6a5cacc57f2189..2be140ba78269b9cfbfc811c9d0a544ad12282bc 100755 --- a/application/admin/controller/Site.php +++ b/application/admin/controller/Site.php @@ -67,6 +67,12 @@ class Site extends Common // 图片验证码规则 $this->assign('site_images_verify_rules_list', lang('site_images_verify_rules_list')); + // 热门搜索关键字 + $this->assign('common_search_keywords_type_list', lang('common_search_keywords_type_list')); + + // 是否 + $this->assign('common_is_text_list', lang('common_is_text_list')); + // 配置信息 $this->assign('data', ConfigService::ConfigList()); diff --git a/application/admin/view/default/config/index.html b/application/admin/view/default/config/index.html index 621ff698d1091e5aff7fb7ec21f8c428c22c6744..ed6cf1adf9a6159e24aa88e225d7a4ef761b1989 100755 --- a/application/admin/view/default/config/index.html +++ b/application/admin/view/default/config/index.html @@ -17,14 +17,7 @@ -
- - -
+
-
- - -
-
- - -
diff --git a/application/admin/view/default/site/nav.html b/application/admin/view/default/site/nav.html index 8708211991a1bd13d466969c63252411f5420ca8..66dcfb82c79da2d0131cc313374c289210f40a4e 100644 --- a/application/admin/view/default/site/nav.html +++ b/application/admin/view/default/site/nav.html @@ -20,6 +20,9 @@
  • 订单售后
  • +
  • + 搜索 +
  • {{if in_array($nav_type, ['login', 'forgetpwd'])}} diff --git a/application/admin/view/default/site/register.html b/application/admin/view/default/site/register.html index 3dec447c7042fd3cba2c4e7629e0d835a587aa60..571993569489afd431c0f4a34fe7f8df6e69b7b8 100644 --- a/application/admin/view/default/site/register.html +++ b/application/admin/view/default/site/register.html @@ -41,6 +41,15 @@
    +
    + + +
    +
    + {{foreach $common_search_keywords_type_list as $v}} + + {{/foreach}} + +
    +
    + + +
    + +
    + + +
    + + + + + + + +{{include file="public/footer" /}} +