From 22fbb6706e0b913ca74c5aac832cf35753d37a03 Mon Sep 17 00:00:00 2001
From: catsworld <519418441@qq.com>
Date: Wed, 14 Jun 2017 20:45:48 +0800
Subject: [PATCH] header! header

---
 public/css/main.css                     |  4 ++--
 resources/views/good/goodInfo.blade.php |  2 +-
 resources/views/layout/header.blade.php | 14 ++++++++------
 resources/views/welcome.blade.php       | 11 +++++------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/public/css/main.css b/public/css/main.css
index bebe232..a17f350 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -6,7 +6,7 @@ a:hover, a:focus {
     position: absolute;
     top: 0;
     left: 0;
-    height: 135px;
+    height: 152px;
     width: 100%;
     z-index: -2;
     overflow: hidden;
@@ -20,7 +20,7 @@ a:hover, a:focus {
     top: -10px;
     left: -20px;
     padding: 0 20px;
-    height: 135px;
+    height: 152px;
     width: 100%;
     box-sizing: content-box;
 }
diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php
index aafef43..aa14cfa 100644
--- a/resources/views/good/goodInfo.blade.php
+++ b/resources/views/good/goodInfo.blade.php
@@ -5,7 +5,7 @@
 @section('asset')
     <link rel="stylesheet" href="/css/lrtk.css"/>
     <style>
-        .input-group {
+        .input-group:not(.search-group) {
             max-width: 200px;
         }
     </style>
diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php
index 6bbe5b3..608af76 100644
--- a/resources/views/layout/header.blade.php
+++ b/resources/views/layout/header.blade.php
@@ -44,20 +44,22 @@
 
 <div class="banner-back"><div class="banner"></div></div>
 
-  <div class="hidden-sm-down col-12">
+<br/>
+
+  <div class="container hidden-sm-down">
       <form action="/good" method="GET">
-        <div class="input-group float-right" style="width:250px">
-            <input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif" style="width:300px">
+        <div class="input-group float-right search-group" style="width:250px">
+            <input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif">
             <span class="input-group-btn">
                 <input type="submit" class="btn btn-primary" value="G♂">
             </span>
         </div>
       </form>
   </div>
-  <div class="hidden-md-up col-12">
+  <div class="hidden-md-up container">
       <form action="/good" method="GET">
-        <div class="input-group float-right">
-            <input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif" style="width:300px">
+        <div class="input-group float-right search-group">
+            <input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif">
             <span class="input-group-btn">
                 <input type="submit" class="btn btn-primary" value="G♂">
             </span>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 410fe4b..885224b 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,6 +1,6 @@
 @extends('layout.master')
 
-<title>先锋市场 Powered by NEUPioneer</title>
+@section('title', "首页")
 
 @section('asset')
     <style>
@@ -13,7 +13,7 @@
 @endsection
 
 @section('content')
-    <div class="row">
+<div class="row">
     @include('layout.catlist')
     <div class="col-12 col-md-7">
         @if(count($newgoods)>0)
@@ -67,9 +67,8 @@
             </div>
         </div>
     </div>
-    </div>
-    <script src="/js/good/cat.js"></script>
-    <script src="/js/good/editfav.js"></script>
-    <script src="/js/jquery.color.js"></script>
 </div>
+<script src="/js/good/cat.js"></script>
+<script src="/js/good/editfav.js"></script>
+<script src="/js/jquery.color.js"></script>
 @endsection