From 71ba12775b133cb40eebc9c69aaadf0c6d7f12dc Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 24 Apr 2019 00:45:07 +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

---
 .../index/view/default/public/header_nav.html | 37 ++++---------------
 .../view/default/public/header_top_nav.html   |  2 +-
 public/static/index/default/css/common.css    | 23 ++++++++----
 public/static/plugins/css/answers/index.css   |  4 +-
 4 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/application/index/view/default/public/header_nav.html b/application/index/view/default/public/header_nav.html
index b714ac4aa..d22f18c80 100755
--- a/application/index/view/default/public/header_nav.html
+++ b/application/index/view/default/public/header_nav.html
@@ -1,29 +1,3 @@
-<!-- <div class="shop-nav">
-    <div class="am-container">
-        <div class="nav-cont">
-        	<ul>
-                <li><a href="{{$Think.__MY_URL__}}">首页</a></li>
-                {{if !empty($nav_header)}}
-                    {{foreach $nav_header as $nav}}
-                        <li>
-                            <a href="{{$nav.url}}" {{if $nav['is_new_window_open'] eq 1}}target="_blank"{{/if}}>{{$nav.name}}</a>
-                        </li>
-                    {{/foreach}}
-                {{/if}}
-        	</ul>
-            <div class="nav-extra {{if empty($user)}}login-event{{/if}}">
-                <a href="{{if empty($user)}}javascript:;{{else /}}{{:MyUrl('index/user/index')}}{{/if}}">
-                    <img src="{{if !empty($user['avatar'])}}{{$user.avatar}}{{else /}}{{$attachment_host}}/static/{{$module_name}}/{{$default_theme}}/images/default-user-avatar.jpg{{/if}}" class="nav-user" />
-                	<b></b>
-                    <span>我的商城</span>
-                	<i class="am-icon-angle-right"></i>
-                </a>
-            </div>
-        </div>
-    </div>
-</div> -->
-
-
 <header class="am-topbar shop-navigation">
     <div class="am-container">
         <h1 class="am-topbar-brand wap-logo am-show-sm-only">
@@ -46,7 +20,7 @@
                         {{else /}}
                             <li class="am-dropdown" data-am-dropdown>
                             <a class="am-dropdown-toggle" data-am-dropdown-toggle href="javascript:;">
-                                {{$nav.name}} <span class="am-icon-caret-down"></span>
+                                {{$nav.name}} <span class="am-icon-angle-down"></span>
                             </a>
                             <ul class="am-dropdown-content">
                                 {{foreach $nav.items as $navs}}
@@ -61,8 +35,13 @@
             </ul>
 
             <form class="am-topbar-form am-topbar-left am-form-inline am-show-sm-only" role="search" action="{{:MyUrl('index/search/index')}}" method="POST">
-                <div class="am-form-group">
-                    <input type="text" class="am-form-field am-input-sm" name="keywords" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['keywords'])}}{{$params.keywords}}{{/if}}" autocomplete="off" />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="text" name="keywords" class="am-form-field" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['keywords'])}}{{$params.keywords}}{{/if}}" autocomplete="off" />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="submit">
+                            <span class="am-icon-search am-icon-sm"></span>
+                        </button>
+                    </span>
                 </div>
             </form>
 
diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html
index acbd603cc..d1800d027 100755
--- a/application/index/view/default/public/header_top_nav.html
+++ b/application/index/view/default/public/header_top_nav.html
@@ -57,7 +57,7 @@
                             <a class="am-dropdown-toggle" href="javascript:;" target="_top" data-am-dropdown-toggle>
                                 <i class="am-icon-fw {{$nav.icon}}"></i>
                                 <span>{{$nav.name}}</span>
-                                <i class="am-icon-caret-down"></i>
+                                <i class="am-icon-angle-down"></i>
                             </a>
                             {{if !empty($user)}}
                                 <ul class="am-dropdown-content">
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index 406b69458..aa09d00d5 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -174,10 +174,10 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
     .category-content .category-list li.last .c-category-list{ border-bottom: none; }
     .category-content .category-list a:hover{ text-decoration: none; color: #D2364C; }
     .category-content .category-name{ overflow:hidden; position: relative;}
-    .category-content .category-name img{ position: absolute; top: 6px; width: 25px; height: 25px; left: 6px; display:block;}
-    .category-content .category-name .ml-22{font-size:14px ;padding-left: 35px;}
+    .category-content .category-name img{ position: absolute; top: 8px; width: 20px; height: 20px; left: 6px; display:block;}
+    .category-content .category-name .ml-22{font-size:14px ;padding-left: 30px;}
     .category-content .category-list .bd-b{ height: 1px;  margin: -1px 10px 0 10px;  background: #eee; line-height: 1; font-size: 0; }
-    .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px; padding-right: 35px;}
+    .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px; padding-right: 40px;}
     .category-content .b-category-name b{ margin-left: 4px; font:400 12px/28px "宋体"; }
     .category-content .b-category-name a{ color: #fff; }
     .category-content .c-category-list a{ margin-right:8px; color:#626262; }
@@ -244,7 +244,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
     .category-content .category-info {padding-left: 12px;width: 180px;overflow: hidden;}
     .category-content .menu-item {left: 179px;}
     .category-content .category-list li {height:43px;}
-    .category-content .b-category-name {padding-left:10px; padding-right: 35px;}
+    .category-content .b-category-name {padding-left:10px;}
     .category-content .category-name i {top:6px}
     .category-content .category-info em{top:9px}
 }
@@ -455,6 +455,7 @@ ul.am-dropdown-content > .am-active > a:focus,
 .am-nav > li.am-active > a:hover,
 .am-nav > li.am-active > a:focus {
     color: #d2354c !important;
+    background-color: transparent;
 }
 
 .am-article-title.blog-title{
@@ -520,7 +521,7 @@ ul.am-dropdown-content > .am-active > a:focus,
  * 框架覆盖
  */
 .am-btn-default {
-    color: #959595 !important;
+    color: #666 !important;
     background-color: #e6e6e6;
     border-color: #e6e6e6;
 }
@@ -707,7 +708,7 @@ ul.am-dropdown-content > .am-active > a:focus,
 }
 @media only screen and (max-width:1025px) {
     .shop-navigation {
-        margin-top: 10px;
+        margin-top: 15px;
     }
     .shop-navigation .am-topbar-nav {
         width: 100%;
@@ -717,10 +718,18 @@ ul.am-dropdown-content > .am-active > a:focus,
     .shop-navigation {
         margin-top: 0;
     }
+    .shop-navigation .am-topbar-collapse {
+        background: #f3f3f3;
+    }
+    .shop-navigation .am-nav > li {
+        border-bottom: 1px solid #eaeaea;
+    }
+    .shop-navigation .am-topbar-collapse .am-dropdown.am-active .am-dropdown-content li:not(:first-child) {
+        border-top: 1px solid #f8f8f8;
+    }
 }
 
 
-
 /**
  * 用户中心左侧菜单
  */
diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index.css
index 0cc0b63d9..4615269f1 100644
--- a/public/static/plugins/css/answers/index.css
+++ b/public/static/plugins/css/answers/index.css
@@ -31,13 +31,13 @@
     color: #fff !important;
     background-color: #f15262;
     border-color: #f15262;
-    font-size: 16px;
+    font-size: 14px;
 }
 .plugins-answers .answers-btn-list .am-btn-warning {
     color: #fff !important;
     background-color: #F44336;
     border-color: #F44336;
-    font-size: 16px;
+    font-size: 14px;
 }
 .plugins-answers .answers-btn-list, .plugins-answers .am-list-news-bd .am-list {
     margin-bottom: 10px;