From 036d58c0afa3fda9f20c7c772cd574fde887b64c 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/auth/register3.blade.php |  4 ++--
 resources/views/good/goodInfo.blade.php  |  4 ++--
 resources/views/layout/header.blade.php  | 14 ++++++++------
 resources/views/user/favlist.blade.php   |  3 +++
 resources/views/welcome.blade.php        | 11 +++++------
 6 files changed, 22 insertions(+), 18 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/auth/register3.blade.php b/resources/views/auth/register3.blade.php
index 21bd2fd..b8f65d1 100644
--- a/resources/views/auth/register3.blade.php
+++ b/resources/views/auth/register3.blade.php
@@ -19,8 +19,8 @@
                     <div id="userinfo-container">
                         @include('user.userInfo')
                     </div>
-                    <div class="ml-auto">
-                        <a href="/" class="ml-auto btn btn-secondary">完成</a>
+                    <div class="float-right">
+                        <a href="/" class="btn btn-secondary">完成</a>
                     </div>
             </div>
             </div>
diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php
index aafef43..0b91596 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>
@@ -37,7 +37,7 @@
             </span>
             <h2 style="margin-left:10px;display:inline-block;word-break:break-all">{{ $good->good_name }}@if($good->baned)【已封禁】@endif</h2>
         </div>
-		卖家：<a href="/user/{{ $user->id }}">{{ $user->nickname }}@if($user->baned)【已封禁】@endif</a> &nbsp; <a href="/message/startConversation/{{ $user->id }}">和我联系</a>
+		卖家：<a href="/user/{{ $user->id }}">{{ $user->nickname }}@if($user->baned)【已封禁】@endif</a>@if(Session::get('user_id') != $user->id) &nbsp; <a href="/message/startConversation/{{ $user->id }}">和我联系</a> @endif
         <div><!-- 放tag 和更多图片缩略图 --></div>
         <div>售价：<h3 style="display:inline-block"><b class="text-warning">￥{{ $good->price }}</b></h3></div>
         <div @if($good->count==0) class="text-danger" @endif>@if($good->count>0) 库存：{{ $good->count }}件 @else 没库存了QAQ @endif</div><br/>
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/user/favlist.blade.php b/resources/views/user/favlist.blade.php
index 0861b03..bd20f39 100644
--- a/resources/views/user/favlist.blade.php
+++ b/resources/views/user/favlist.blade.php
@@ -1,6 +1,7 @@
 @extends('layout.master')
 
 @section('title', "收藏夹")
+
 @section('asset')
     <link rel="stylesheet" href="/css/favlist.css" />
 @endsection
@@ -14,11 +15,13 @@
             <div class="col-md-7">
             {!! csrf_field() !!}
             {!! method_field('DELETE') !!}
+            <div class="row">
             @foreach($goods as $good)
                 <?php $good = $good_info[$good->good_id] ?>
                 @include('good.goodInfoOnWelcome')
             @endforeach
             </div>
+            </div>
             <div class="col-md-3">
                 <button type="button" class="btn btn-primary" onclick="editfav()" id="editbutton">编辑收藏夹</button>
                 <input type="button" id="del_submit" class="btn btn-primary" value="删除选中商品" style="display: none" onclick="submitdel()"  />
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