diff --git a/application/admin/view/default/design/detail.html b/application/admin/view/default/design/detail.html
deleted file mode 100644
index 319e48a64..000000000
--- a/application/admin/view/default/design/detail.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{{include file="public/header" /}}
-
-<!-- header nav start -->
-{{if isset($is_header) and $is_header eq 1}}
-    <!-- header top nav -->
-    {{include file="public/header_top_nav" /}}
-
-    <!-- search -->
-    {{include file="public/nav_search" /}}
-
-    <!-- header nav -->
-    {{include file="public/header_nav" /}}
-
-    <!-- goods category -->
-    {{include file="public/goods_category" /}}
-{{/if}}
-<!-- header nav end -->
-
-<!-- content start -->
-<div class="am-container">
-    {{if !empty($layout_data)}}
-        {{include file="../../../layout/view/view" /}}
-    {{else /}}
-        {{include file="public/not_data" /}}
-    {{/if}}
-</div>
-<!-- content end -->
-
-<!-- footer start -->
-{{include file="public/footer" /}}
-<!-- footer end -->
\ No newline at end of file
diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php
index d7c08fdac..861ebc01a 100755
--- a/application/index/controller/Search.php
+++ b/application/index/controller/Search.php
@@ -65,45 +65,45 @@ class Search extends Common
         if(!empty($keywords))
         {
             return redirect(MyUrl('index/search/index', ['wd'=>StrToAscii($keywords)]));
-        } else {
-            // 参数初始化
-            $this->ParamsInit();
-
-            // 品牌列表
-            $brand_list = SearchService::CategoryBrandList($this->data_request);
-            $this->assign('brand_list', $brand_list);
-
-            // 指定数据
-            $search_map_info = SearchService::SearchMapInfo($this->data_request);
-            $this->assign('search_map_info', $search_map_info);
-
-            // 商品分类
-            $category_list = SearchService::GoodsCategoryList($this->data_request);
-            $this->assign('category_list', $category_list);
-
-            // 筛选价格区间
-            $screening_price_list = SearchService::ScreeningPriceList($this->data_request);
-            $this->assign('screening_price_list', $screening_price_list);
-
-            // 商品参数
-            $goods_params_list = SearchService::SearchGoodsParamsValueList($this->data_request);
-            $this->assign('goods_params_list', $goods_params_list);
-
-            // 商品规格
-            $goods_spec_list = SearchService::SearchGoodsSpecValueList($this->data_request);
-            $this->assign('goods_spec_list', $goods_spec_list);
-
-            // 参数
-            $this->assign('params', $this->data_request);
-
-            // seo
-            $this->SetSeo($search_map_info);
-
-            // 钩子
-            $this->PluginsHook();
-
-            return $this->fetch();
         }
+
+        // 参数初始化
+        $this->ParamsInit();
+
+        // 品牌列表
+        $brand_list = SearchService::CategoryBrandList($this->data_request);
+        $this->assign('brand_list', $brand_list);
+
+        // 指定数据
+        $search_map_info = SearchService::SearchMapInfo($this->data_request);
+        $this->assign('search_map_info', $search_map_info);
+
+        // 商品分类
+        $category_list = SearchService::GoodsCategoryList($this->data_request);
+        $this->assign('category_list', $category_list);
+
+        // 筛选价格区间
+        $screening_price_list = SearchService::ScreeningPriceList($this->data_request);
+        $this->assign('screening_price_list', $screening_price_list);
+
+        // 商品参数
+        $goods_params_list = SearchService::SearchGoodsParamsValueList($this->data_request);
+        $this->assign('goods_params_list', $goods_params_list);
+
+        // 商品规格
+        $goods_spec_list = SearchService::SearchGoodsSpecValueList($this->data_request);
+        $this->assign('goods_spec_list', $goods_spec_list);
+
+        // 参数
+        $this->assign('params', $this->data_request);
+
+        // seo
+        $this->SetSeo($search_map_info);
+
+        // 钩子
+        $this->PluginsHook();
+
+        return $this->fetch();
     }
 
     /**
diff --git a/application/index/view/default/search/index.html b/application/index/view/default/search/index.html
index 240383645..bd4782a9e 100755
--- a/application/index/view/default/search/index.html
+++ b/application/index/view/default/search/index.html
@@ -396,8 +396,5 @@
     {{/foreach}}
 {{/if}}
 
-<!-- 罩层 -->
-<div class="theme-popover-mask" style="display:none;"></div>
-
-
+<!-- footer -->
 {{include file="public/footer" /}}
\ No newline at end of file
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index a2e17eb6b..2ae0dab62 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -834,12 +834,14 @@ table.am-table .am-btn-danger:hover {
     .shop-navigation .am-topbar-nav {
         margin-bottom: 0;
     }
-    .shop-navigation .navigation-search 
-    {
+    .shop-navigation .navigation-search  {
         display: -webkit-box !important;
         margin-top: 8px;
         width: calc(100% - 160px);
     }
+    .shop-navigation .navigation-search > .am-input-group {
+        width: 100%;
+    }
     .shop-navigation .navigation-search input {
         border-color: #fff;
         border-top-left-radius: 4px;