From f933559847ce6e430b2bfa01281b2e6f3aa796eb Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Sun, 23 Jun 2019 13:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Config.php       |  3 --
 application/admin/controller/Site.php         |  6 +++
 .../admin/view/default/config/index.html      | 21 +----------
 application/admin/view/default/site/nav.html  |  3 ++
 .../admin/view/default/site/register.html     |  9 +++++
 .../admin/view/default/site/search.html       | 37 +++++++++++++++++++
 6 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 application/admin/view/default/site/search.html

diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php
index 43d85098a..6231a9755 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 1d2d64278..2be140ba7 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 621ff698d..ed6cf1adf 100755
--- a/application/admin/view/default/config/index.html
+++ b/application/admin/view/default/config/index.html
@@ -17,14 +17,7 @@
 				<label>{{$data.admin_page_number.name}}<span class="am-form-group-label-tips">{{$data.admin_page_number.describe}}</span></label>
 				<input type="number" name="{{$data.admin_page_number.only_tag}}" placeholder="{{$data.admin_page_number.name}}" pattern="{{:lang('common_regex_page_number')}}" data-validation-message="{{$data.admin_page_number.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.admin_page_number.value}}"{{/if}} required />
 			</div>
-			<div class="am-form-group">
-				<label>{{$data.common_register_is_enable_audit.name}}<span class="am-form-group-label-tips">{{$data.common_register_is_enable_audit.describe}}</span></label>
-				<select name="{{$data.common_register_is_enable_audit.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_register_is_enable_audit.error_tips}}" required>
-					{{foreach $common_is_text_list as $v}}
-						<option value="{{$v.id}}" {{if isset($data['common_register_is_enable_audit']['value']) and $data['common_register_is_enable_audit']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-					{{/foreach}}
-				</select>
-			</div>
+
 			<div class="am-form-group">
 				<label>{{$data.common_is_deduction_inventory.name}}<span class="am-form-group-label-tips">{{$data.common_is_deduction_inventory.describe}}</span></label>
 				<select name="{{$data.common_is_deduction_inventory.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_is_deduction_inventory.error_tips}}" required>
@@ -54,18 +47,6 @@
 				<input type="number" name="{{$data.common_spec_add_max_number.only_tag}}" placeholder="{{$data.common_spec_add_max_number.describe}}" data-validation-message="{{$data.common_spec_add_max_number.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_spec_add_max_number.value}}"{{/if}} />
 			</div>
 
-			<div class="am-form-group">
-				<label>{{$data.home_search_keywords_type.name}}</label>
-				<select name="{{$data.home_search_keywords_type.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_search_keywords_type.error_tips}}">
-					{{foreach $common_search_keywords_type_list as $v}}
-						<option value="{{$v.value}}" {{if isset($data['home_search_keywords_type']['value']) and $data['home_search_keywords_type']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-					{{/foreach}}
-				</select>
-			</div>
-			<div class="am-form-group">
-				<label>{{$data.home_search_keywords.name}}<span class="am-form-group-label-tips">{{$data.home_search_keywords.describe}}</span></label>
-				<input type="text" name="{{$data.home_search_keywords.only_tag}}" placeholder="{{$data.home_search_keywords.describe}}" data-validation-message="{{$data.home_search_keywords.error_tips}}" class="am-radius" data-am-tagsinput {{if !empty($data)}}value="{{$data.home_search_keywords.value}}"{{/if}} />
-			</div>
 			<div class="am-form-group">
 				<label>{{$data.common_baidu_map_ak.name}}<span class="am-form-group-label-tips">{{$data.common_baidu_map_ak.describe}}</span></label>
 				<input type="text" name="{{$data.common_baidu_map_ak.only_tag}}" placeholder="{{$data.common_baidu_map_ak.describe}}" data-validation-message="{{$data.common_baidu_map_ak.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_baidu_map_ak.value}}"{{/if}} />
diff --git a/application/admin/view/default/site/nav.html b/application/admin/view/default/site/nav.html
index 870821199..66dcfb82c 100644
--- a/application/admin/view/default/site/nav.html
+++ b/application/admin/view/default/site/nav.html
@@ -20,6 +20,9 @@
     <li {{if $nav_type eq 'orderaftersale'}}class="am-active"{{/if}} data-type="orderaftersale">
         <a href="{{:MyUrl('admin/site/index', ['nav_type'=>'orderaftersale'])}}">订单售后</a>
     </li>
+    <li {{if $nav_type eq 'search'}}class="am-active"{{/if}} data-type="search">
+        <a href="{{:MyUrl('admin/site/index', ['nav_type'=>'search'])}}">搜索</a>
+    </li>
 </ul>
 
 {{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 3dec447c7..571993569 100644
--- a/application/admin/view/default/site/register.html
+++ b/application/admin/view/default/site/register.html
@@ -41,6 +41,15 @@
                 </select>
             </div>
 
+            <div class="am-form-group">
+                <label>{{$data.common_register_is_enable_audit.name}}<span class="am-form-group-label-tips">{{$data.common_register_is_enable_audit.describe}}</span></label>
+                <select name="{{$data.common_register_is_enable_audit.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_register_is_enable_audit.error_tips}}" required>
+                    {{foreach $common_is_text_list as $v}}
+                        <option value="{{$v.id}}" {{if isset($data['common_register_is_enable_audit']['value']) and $data['common_register_is_enable_audit']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+
             <div class="am-form-group">
                 <label>{{$data.home_is_enable_userregister_agreement.name}}</label>
                 <select name="{{$data.home_is_enable_userregister_agreement.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_is_enable_userregister_agreement.error_tips}}" required>
diff --git a/application/admin/view/default/site/search.html b/application/admin/view/default/site/search.html
new file mode 100644
index 000000000..322381bdf
--- /dev/null
+++ b/application/admin/view/default/site/search.html
@@ -0,0 +1,37 @@
+{{include file="public/header" /}}
+
+<!-- right content start  -->
+<div class="content-right">
+    <div class="content">
+        <!-- table nav start -->
+        {{include file="site/nav" /}}
+        <!-- table nav end -->
+
+        <!-- form start -->
+        <form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'search'])}}" enctype="multipart/form-data">
+            <div class="am-form-group">
+                <label>{{$data.home_search_keywords_type.name}}</label>
+                <select name="{{$data.home_search_keywords_type.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_search_keywords_type.error_tips}}">
+                    {{foreach $common_search_keywords_type_list as $v}}
+                        <option value="{{$v.value}}" {{if isset($data['home_search_keywords_type']['value']) and $data['home_search_keywords_type']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+            </div>
+            <div class="am-form-group">
+                <label>{{$data.home_search_keywords.name}}<span class="am-form-group-label-tips">{{$data.home_search_keywords.describe}}</span></label>
+                <input type="text" name="{{$data.home_search_keywords.only_tag}}" placeholder="{{$data.home_search_keywords.describe}}" data-validation-message="{{$data.home_search_keywords.error_tips}}" class="am-radius" data-am-tagsinput {{if !empty($data)}}value="{{$data.home_search_keywords.value}}"{{/if}} />
+            </div>
+
+            <div class="am-form-group am-form-group-refreshing">
+                <input type="hidden" name="nav_type" value="{{$nav_type}}" />
+                <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
+            </div>
+        </form>
+        <!-- form end -->
+    </div>
+</div>
+<!-- right content end  -->
+        
+<!-- footer start -->
+{{include file="public/footer" /}}
+<!-- footer end
\ No newline at end of file
-- 
GitLab