From e39730e6321f41f43f2ccf30daf7d8ae8f973171 Mon Sep 17 00:00:00 2001
From: catsworld <519418441@qq.com>
Date: Thu, 15 Jun 2017 14:46:20 +0800
Subject: [PATCH] Commit at 2017/06/15 14:46

---
 public/css/main.css                         | 10 ++++
 resources/views/auth/login.blade.php        | 59 ++++++++++++++++-----
 resources/views/good/goodInfo.blade.php     | 13 +++--
 resources/views/good/goodInfoForm.blade.php |  2 +-
 resources/views/good/goodList.blade.php     |  4 +-
 resources/views/layout/catlist.blade.php    |  4 +-
 resources/views/layout/footer.blade.php     |  2 +-
 resources/views/layout/header.blade.php     | 13 +++--
 resources/views/welcome.blade.php           | 20 +++----
 9 files changed, 85 insertions(+), 42 deletions(-)

diff --git a/public/css/main.css b/public/css/main.css
index a17f350..bc7f3b7 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -89,6 +89,11 @@ a:hover, a:focus {
 
 #searchq {
     border: 0px;
+    z-index: 0;
+}
+
+.search-group input {
+    z-index: 0;
 }
 
 @media (min-width: 750px) {
@@ -117,4 +122,9 @@ a:hover, a:focus {
 
 .titlepic {
     width: 100%;
+}
+
+.col-centered{
+    float: none;
+    margin: 0 auto;
 }
\ No newline at end of file
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 7f751c9..df1fab6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -3,13 +3,16 @@
 @section('title', "登录")
 
 @section('content')
-    <div class="row">
-    <div class="hidden-sm-down col-md-6 card">
+    <div class="row hidden-sm-down">
+    <div class="col-6">
+    <div class="card float-right">
         <div class="card-block">
-            <img src="/img/loginpic.jpg" style="width:100%">
+            <img src="/img/loginpic.jpg" style="height:210px">
         </div>
     </div>
-    <div class="col-10 offset-1 col-md-4 offset-md-1 card">
+    </div>
+    <div class="col-6">
+    <div class="card float-left">
         <div class="card-block">
             @if (count($errors) > 0)
                 <div class="alert alert-danger" role="alert">
@@ -21,11 +24,11 @@
             <form action="/login" method="POST">
                 <div class="form-group">
                     <label for="username">用户名/邮箱</label>
-                    <input type="text" name="username" id="username" class="form-control" placeholder="用户名/邮箱">
+                    <input type="text" name="username" id="username" class="form-control" placeholder="用户名/邮箱" style="width:373.63px">
                 </div>
                 <div class="form-group">
                     <label for="password">密码</label>
-                    <input type="password" name="password" id="password" class="form-control" placeholder="密码">
+                    <input type="password" name="password" id="password" class="form-control" placeholder="密码" style="width:373.63px">
                 </div>
                 {!! csrf_field() !!}
                 <div class="float-left">
@@ -37,13 +40,45 @@
             </form>
         </div>
     </div>
-    </div><br/>
-    <div class="row">
-    <div class="hidden-md-up col-10 offset-1 card">
-        <div class="card-block">
-            <img src="/img/loginpic.jpg" style="width:100%">
-        </div>
     </div>
     </div>
+    <div class="hidden-md-up">
+        <div class="container">
+        <div class="card">
+            <div class="card-block">
+                @if (count($errors) > 0)
+                    <div class="alert alert-danger" role="alert">
+                        <span class="fa fa-exclamation-circle" aria-hidden="true"></span>
+                        <span class="sr-only">Error:</span>
+                        {!! $errors->first() !!}
+                    </div>
+                @endif
+                <form action="/login" method="POST">
+                    <div class="form-group">
+                        <label for="username">用户名/邮箱</label>
+                        <input type="text" name="username" id="username" class="form-control" placeholder="用户名/邮箱">
+                    </div>
+                    <div class="form-group">
+                        <label for="password">密码</label>
+                        <input type="password" name="password" id="password" class="form-control" placeholder="密码">
+                    </div>
+                    {!! csrf_field() !!}
+                    <div class="float-left">
+                        <input type="submit" class="btn btn-primary" value="登录">
+                    </div>
+                    <div class="float-right">
+                        <input type="button" class="btn btn-success" value="校卡平台快捷登录" onclick="window.location.href='/sso'">
+                    </div>
+                </form>
+            </div>
+        </div>
+        </div><br/>
+        <div class="container">
+        <div class="card">
+            <div class="card-block">
+                <img src="/img/loginpic.jpg" style="width:100%">
+            </div>
+        </div>
+    </div>
 
 @endsection
\ No newline at end of file
diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php
index 4bb8278..b74a999 100644
--- a/resources/views/good/goodInfo.blade.php
+++ b/resources/views/good/goodInfo.blade.php
@@ -9,14 +9,17 @@
             max-width: 200px;
         }
     </style>
-@endsection
-
-@section('content')
     <script>
         $(function () {
             $('[data-toggle="tooltip"]').tooltip()
         })
+        $('.popover-dismiss').popover({
+            trigger: 'focus'
+        })
     </script>
+@endsection
+
+@section('content')
     <div class="row">
     <div class="col-12 col-md-5">
         <a id="pic" href="/good/{{ sha1($good->id) }}/titlepic"><img class="card" src="/good/{{ sha1($good->id) }}/titlepic" style="width:100%"/></a><br/>
@@ -130,10 +133,10 @@
                     <button class="fa fa-star-o btn btn-primary" onclick="add_favlist()" href="#" title="收藏OvO" style="position:relative;top:4px"></button>
                 @endif
                 @if(count($inFvlst) != 0)
-                    <button class="fa fa-star btn btn-primary" onclick="del_favlist()" href="#" title="取消收藏QAQ"></button>
+                    <button class="fa fa-star btn btn-primary" onclick="del_favlist()" href="#" title="取消收藏QAQ" style="position:relative;top:4px"></button>
                  @endif
             @else
-                <button class="fa fa-star-o btn btn-primary" onclick="window.location.href='/login'" title="收藏OvO"></button>
+                <button class="fa fa-star-o btn btn-primary" onclick="window.location.href='/login'" title="收藏OvO" style="position:relative;top:4px"></button>
             @endif
         </div>
         <div class="float-right">
diff --git a/resources/views/good/goodInfoForm.blade.php b/resources/views/good/goodInfoForm.blade.php
index 2d1fd75..7bf17ba 100644
--- a/resources/views/good/goodInfoForm.blade.php
+++ b/resources/views/good/goodInfoForm.blade.php
@@ -15,7 +15,7 @@
         <div class="card">
             <div class="card-block">
             <div class="row">
-            <div class="col-10 offset-1 col-md-6 offset-md-3 col-lg-4 offset-lg-4">
+            <div class="col-10 offset-1 col-md-6 offset-md-3">
             @if (count($errors) > 0)
                 <div class="alert alert-danger" role="alert">
                     <span class="fa fa-exclamation-circle" aria-hidden="true"></span>
diff --git a/resources/views/good/goodList.blade.php b/resources/views/good/goodList.blade.php
index 397ad86..3655f83 100644
--- a/resources/views/good/goodList.blade.php
+++ b/resources/views/good/goodList.blade.php
@@ -27,10 +27,10 @@
                 </div>
             </div>
             </div>
-            <div class="col-12 col-lg-6">
+            <div class="col-12 col-lg-5">
                 <a>价格筛选</a> <input id="priceSet1" style="display:inline-block"maxlength="9" class="form-control" value="@if(isset($_GET['start_price'])){{ $_GET['start_price'] }}@endif"/> - <input id="priceSet2" class="form-control" style="display:inline-block" maxlength="9" value="@if(isset($_GET['end_price'])){{ $_GET['end_price'] }}@endif"/>&nbsp;<button class="btn btn-primary" onclick="setc('a')">确定</button>
             </div>
-            <div class="col-12 col-lg-4">
+            <div class="col-12 col-lg-5">
                 <a>库存下限</a> <input id="pricec" style="display:inline-block" maxlength="9" class="form-control" value="@if(isset($_GET['start_count'])){{ $_GET['start_count'] }}@endif"/>&nbsp;<button class="btn btn-primary" id="subs" onclick="setc('a')">确定</button>
             </div>
         </div>
diff --git a/resources/views/layout/catlist.blade.php b/resources/views/layout/catlist.blade.php
index 09bfd8c..e3b46a8 100644
--- a/resources/views/layout/catlist.blade.php
+++ b/resources/views/layout/catlist.blade.php
@@ -1,4 +1,4 @@
-<div class="col-md-2 hidden-sm-down">
+<div class="col-md-2 hidden-sm-down" style="position:sticky;top:0">
     <ul class="nav nav-pills flex-column">
         <li class="nav-item"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif" style="white-space:nowrap;overflow:hidden">所有商品</a></li>
         @foreach($cats as $cat)
@@ -6,7 +6,7 @@
         @endforeach
     </ul>
 </div>
-<div class="col-12 hidden-md-up">
+<div class="col-12 hidden-md-up" style="position:sticky;top:0">
     <ul class="nav nav-pills" style="overflow-x: scroll;overflow-y: hidden;white-space: nowrap;height:40px;display:-webkit-box;display:-moz-box">
         <li class="nav-item" style="float: none"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif">所有商品</a></li>
         @foreach($cats as $cat)
diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php
index a14034b..fd1438a 100644
--- a/resources/views/layout/footer.blade.php
+++ b/resources/views/layout/footer.blade.php
@@ -17,7 +17,7 @@
 	</div>
 @if( env('SHOW_VER') || env('APP_DEBUG') )
     <footer class="row">
-        <div class="small-11 small-centered columns">
+        <div class="col-10 offset-1 columns">
 		<span>
 			<center>
 				@if(env('APP_DEBUG'))当前处于调试模式<br>@endif
diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php
index 608af76..184f5b1 100644
--- a/resources/views/layout/header.blade.php
+++ b/resources/views/layout/header.blade.php
@@ -1,20 +1,22 @@
-<nav class="navbar navbar-toggleable-sm navbar-inverse">
-  <div class="navbar-back">
+  <div class="navbar-back" style="height:56px">
     <div class="navbar-bg"></div>
     <div class="navbar-filter"></div>
   </div>
+<div class="container">
+<nav class="navbar navbar-toggleable-sm navbar-inverse" style="box-shadow:#ffffff 0 0 0">
   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
     <a class="navbar-brand" href="/">先锋市场</a>
     <div class="collapse navbar-collapse" id="navbar">
-      <ul class="nav navbar-nav ml-auto">
+      <ul class="navbar-nav ml-auto">
         @if(Session::has('user_id'))
           <li class="nav-item dropdown">
             <a class="nav-link navbar-avatar dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
               <img src="/avatar/{{ Session::get('user_id') }}/40/40" class="avatar"/>
             </a>
-            <div class="dropdown-menu">
+            <div class="dropdown-menu dropdown-menu-right">
+              <h6 class="dropdown-header">{{ Session::get('nickname') }}</h6>
               <a href="/user" class="dropdown-item">个人中心</a>
               <a href="/user/fav" class="dropdown-item">收藏夹</a>
               <a href="/user/trans" class="dropdown-item">我的购买</a>
@@ -31,7 +33,7 @@
         @else
           <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle navbar-li" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">登录 <span class="caret"></span></a>
-            <div class="dropdown-menu">
+            <div class="dropdown-menu dropdown-menu-right">
               <a href="/login" class="dropdown-item">普通登录</a>
               <a href="/sso" class="dropdown-item">校卡平台快捷登录</a>
             </div>
@@ -41,6 +43,7 @@
       </ul>
   </div>
 </nav>
+</div>
 
 <div class="banner-back"><div class="banner"></div></div>
 
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index a13fa12..5c5548e 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -10,6 +10,11 @@
         }
     }
     </style>
+    <script>
+        $(function () {
+            $('[data-toggle="popover"]').popover()
+        })
+    </script>
 @endsection
 
 @section('content')
@@ -49,20 +54,7 @@
             <div class="card-header"><h4>公告</h4></div>
             <div class="list-group list-group-flush">
             @foreach($announces as $announce)
-                <a href="#ann{{$announce->id}}" class="list-group-item" data-toggle="modal">{{ $announce->title }}</a>
-                <div class="modal fade" id="ann{{$announce->id}}" tabindex="-1" role="dialog" aria-labelledby="ann{{$announce->id}}Label">
-                    <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <h4 class="modal-title" id="myModalLabel">{{ $announce->title }}</h4>
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                            </div>
-                            <div class="modal-body">
-                                {!! $announce->content !!}
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                <a tabindex="0" class="list-group-item" role="button" data-toggle="popover" data-trigger="focus" data-placement="left" data-content=" {{ $announce->content }} " style="outline:none">{{ $announce->title }}</a>
             @endforeach
             </div>
         </div>