Merge branch 'master' into foundation

.env.example

@@ -30,4 +30,7 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 ALLOW_REG=false
-FRESH_YEAR=16
+# 大一同学的入学年份（两位），用来判断用户是否过期
+FRESH_YEAR=16
+# 在底部显示版本信息
+SHOW_VER=true

resources/views/good/goodList.blade.php

@@ -30,7 +30,7 @@
                 <div class="medium-12 shx">
                     <ul class="dropdown menu" style="background-color: white;" data-dropdown-menu>
                         <li>
-                        <a id="nm" class="<?php if(isset($_GET['sort'])){echo $_GET['sort']; } ?>">排序</a>
+                        <a id="nm" class="@if(isset($_GET['sort'])){{$_GET['sort']}}@endif">排序</a>
                         <ul class="menu">
                         <li><a href="/good/">综合排序</a></li>
                         <li><a onclick="setc('p')">按价格从低到高</a></li>
@@ -40,11 +40,11 @@
                         </ul>
                         </li>
                         <li>
-                            <a id="sxa"><div class="ad">价格筛选</div> <input id="priceSet1" style="" maxlength="9" value="<?php if(isset($_GET['start_price'])){echo $_GET['start_price']; } ?>"/>-<input id="priceSet2" style="" maxlength="9" value="<?php if(isset($_GET['end_price'])){echo $_GET['end_price']; } ?>"/>&nbsp;<button class="button sub" id="subk"  onclick="setc('a')">确定</button>
+                            <a id="sxa"><div class="ad">价格筛选</div> <input id="priceSet1" style="" maxlength="9" value="@if(isset($_GET['start_price'])){{$_GET['start_price']}}@endif"/>-<input id="priceSet2" style="" maxlength="9" value="@if(isset($_GET['end_price'])){{$_GET['end_price']}}@endif"/>&nbsp;<button class="button sub" id="subk"  onclick="setc('a')">确定</button>
                             </a>
                         </li>
                         <li class="kucli">
-                            <a id="kca"><div class="ad">库存下限</div> <input id="pricec" maxlength="9" style="" value="<?php if(isset($_GET['start_count'])){echo $_GET['start_count']; } ?>" />&nbsp;<button class="button sub" id="subs"  onclick="setc('a')">确定</button>
+                            <a id="kca"><div class="ad">库存下限</div> <input id="pricec" maxlength="9" style="" value="@if(isset($_GET['start_count'])){{$_GET['start_count']}}@endif" />&nbsp;<button class="button sub" id="subs"  onclick="setc('a')">确定</button>
                             </a>
                            </li>
                         </li>

resources/views/layout/footer.blade.php

@@ -19,14 +19,16 @@
         <span><center>© {{date("Y")}} 东北大学先锋网</center></span>
     </div>
 </footer>
-@if( env('APP_DEBUG') )
+@if( env('SHOW_VER') || env('APP_DEBUG') )
     <footer class="row">
         <div class="small-11 small-centered columns">
 		<span>
 			<center>
-				当前处于调试模式<br>  程序版本：{{ config('app.version')       }}&nbsp;&nbsp; 文件版本：<a
+				@if(env('APP_DEBUG'))当前处于调试模式<br>@endif
+                @if(env('SHOW_VER'))程序版本：{{ config('app.version')       }}&nbsp;&nbsp; 文件版本：<a
                         href="https://github.com/NEUP-Net-Depart/NEUP-FleaMarket/commit/{{ explode(' ', exec('git log --pretty=oneline -1'))[0]   }}">{{ exec('git log --abbrev-commit --pretty=oneline -1')  }}</a>
-			</center>
+                @endif
+            </center>
 		</span>
         </div>
     </footer>

resources/views/layout/header.blade.php

@@ -75,7 +75,7 @@
     <div class="medium-12 columns">
       <form action="/good" method="GET">
         <div class="input-group float-right" id="top-bar-quick-access">
-            <input class="input-group-field" type="search" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="<?php if(isset($_GET['query'])){echo $_GET['query']; } ?>"/>
+            <input class="input-group-field" type="search" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif"/>
             <div class="input-group-button">
                 <input type="submit" class="button" value="G♂"/>
             </div>
@@ -88,7 +88,7 @@
   <div class="small-11 small-centered columns">
       <form action="/good" method="GET">
         <div class="input-group float-right" id="top-bar-quick-access-small">
-            <input class="input-group-field" type="search" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="<?php if(isset($_GET['query'])){echo $_GET['query']; } ?>"/>
+            <input class="input-group-field" type="search" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif"/>
             <div class="input-group-button">
               <input type="submit" class="button" value="G♂"/>
             </div>