Basicly make sure that the front would not have bugs.

This commit is contained in:
※黑猫<Kuro/Neko>
2016-11-03 21:12:47 +08:00
parent 35f0a47c1d
commit 5478c2129d
15 changed files with 114 additions and 438 deletions
+3 -3
View File
@@ -105,12 +105,12 @@ class GoodController extends Controller
return Redirect::to('/good');
}
public function mygood(Request $request)
public function myGood(Request $request)
{
$data = [];
$user_id = $request->session()->get('user_id');
$data['mygoods'] = GoodInfo::where('user_id',$user_id)->get();
return view::make('good.mygood')->with($data);
$data['goods'] = GoodInfo::where('user_id',$user_id)->get();
return view::make('good.myGood')->with($data);
}
/**
* @function GoodController@addGood
+1 -1
View File
@@ -46,7 +46,7 @@ class Kernel extends HttpKernel
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'admin'=> \App\Http\Middleware\Check::class,
'admin'=> \App\Http\Middleware\CheckAdmin::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
@@ -5,7 +5,7 @@ use Closure;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Redirect;
class Check
class CheckAdmin
{
public function handle($request, Closure $next)
{
+2 -2
View File
@@ -41,8 +41,8 @@ Route::group(['middleware' => ['web']],function () {
"middleware" => "auth"
]);
Route::match(['post', 'get'], '/good/mygood', [
"uses" => "GoodController@mygood",
Route::match(['post', 'get'], '/good/my', [
"uses" => "GoodController@myGood",
"middleware" => "auth"
]);
+46 -22
View File
@@ -1,37 +1,54 @@
html{
@font-face {
font-family: msyhl;
src: url('/font/msyhl.ttf');
}
html {
overflow-x: hidden;
}
body{
font-family: "微软雅黑 Light"
body {
font-family: msyhl;
}
.button{
box-shadow: 0 -2px 0 rgba(0,0,0,0.2) inset;
.button {
box-shadow: 0 -2px 0 rgba(0, 0, 0, 0.2) inset;
border: none;
border-radius: 3px;
}
.top-bar{
box-shadow: rgba(0,0,0,0.1) 0 1px 2px;
.top-bar {
box-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
}
.top-bar .menu{
.top-bar .menu {
background: none;
}
.top-bar .menu a{
.top-bar .menu a {
color: black;
}
.top-bar .menu a:hover{
.top-bar .menu a:hover {
color: white;
}
.top-bar .menu a:active{
.top-bar .menu a:active {
color: grey;
}
.top-bar .menu .button{
.top-bar .menu .button {
color: white!IMPORTANT;
}
.top-bar, .top-bar-left, .top-bar-right{
.top-bar,
.top-bar-left,
.top-bar-right {
position: relative;
z-index: 10000;
}
.top-bar-back{
.top-bar-back {
position: absolute;
top: 0;
left: 0;
@@ -39,16 +56,18 @@ body{
height: 100%;
overflow: hidden;
}
.top-bar-filter{
.top-bar-filter {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 100;
background-color: rgba(255,255,255,0.4);
background-color: rgba(255, 255, 255, 0.4);
}
.top-bar-bg{
.top-bar-bg {
background-image: url('/img/banner.jpg');
background-size: 100%;
background-repeat: no-repeat;
@@ -62,7 +81,8 @@ body{
filter: blur(5px);
z-index: 50;
}
.banner{
.banner {
background-image: url('/img/banner.jpg');
background-size: 100%;
background-repeat: no-repeat;
@@ -73,19 +93,23 @@ body{
max-width: 150%;
height: 100%;
}
.banner-content{
.banner-content {
margin: 69px auto 10px;
}
.banner-logo{
.banner-logo {
width: 100px;
height: 100px;
max-width: 100px;
}
#top-bar-quick-access{
#top-bar-quick-access {
position: relative;
top: 30px;
}
.page-content{
.page-content {
position: relative;
z-index: 50;
margin-top: 120px;
Binary file not shown.
+10 -1
View File
@@ -1 +1,10 @@
$(document).foundation()
function test(Names, cat_count) {
if (Names == 0) {
for (var j = 1; j <= cat_count; j++) $(".cat" + j).css("display", "");
return;
}
for (var j = 1; j < Names; j++) $(".cat" + j).css("display", "none");
$(".cat" + Names).css("display", "");
for (var j = parseInt(Names) + 1; j <= cat_count; j++) $(".cat" + j).css("display", "none");
}
$(document).foundation();
-7
View File
File diff suppressed because one or more lines are too long
Binary file not shown.
+1 -82
View File
@@ -5,87 +5,6 @@
<body>
@include('layout.header')
<div class="page-content">
<form class="form-horizontal" action="/good/add" method="POST" enctype="multipart/form-data">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="form-group ">
<label class="col-sm-2 control-label">商品名称:</label>
<div class="col-sm-10">
<input type="text" class="form-control" placeholder="商品名称" name="good_name">
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">商品分类:</label>
<div class="col-sm-10">
<select name="cat_id" style="margin: 0;">
@foreach($cats as $cat)
<option value="{{$cat->id}}">{{$cat->cat_name}}</option>
@endforeach
</select>
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">商品描述:</label>
<div class="col-sm-10">
<textarea style="margin: 0;" name="description" placeholder="商品描述(此处应支持HTML)"></textarea>
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">最低价格:</label>
<div class="col-sm-10">
<input type="number" class="form-control" placeholder="最低价格" name="pricemin">
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">最高价格:</label>
<div class="col-sm-10">
<input type="number" class="form-control" placeholder="最高价格" name="pricemax">
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">商品类型:</label>
<div class="col-sm-10">
<select class="form-control" name="type" style="margin: 0;">
<option value="0">普通商品</option>
<option value="1">拍卖商品</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品数量:</label>
<div class="col-sm-10">
<input type="number" class="form-control" placeholder="库存" name="counts">
</div>
</div>
<div class="form-group ">
<label class="col-sm-2 control-label">商品标签:</label>
<div class="col-sm-10">
<input type="text" class="form-control" placeholder="TAG" name="good_tag">
</div>
</div>
<div class="form-group">
<label for="goodTitleUpload" class="col-md-2 col-sm-offset-5 button">上传封面</label>
<div class="col-sm-10">
<input type="file" id="goodTitleUpload" class="show-for-sr" name="goodTitlePic" style="margin: 0;" onchange="preview(this)">
{!! csrf_field() !!}
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">封面预览:</label>
<div class="col-sm-10">
<div id="preview" style="max-width: 50%;margin-left: 25%"></div>
</div>
</div>
<div class="form-group">
<div class="col-sm-2 col-sm-offset-4">
<input type="submit" class=" button" value="确认添加" style="margin: 0;"/>
</div>
<div class="col-sm-4">
<a href="/good" class="button">返回商品列表</a>
</div>
</div>
</div>
</div>
<form action="/good/add" method="POST">
<table border="0" align="center" cellpadding="0" cellspacing="0" style="width: 50%;margin-bottom: 0">
<tr>
@@ -185,7 +104,7 @@
<input type="submit" class="button" value="添加" style="margin: 0;"/>
</td>
<td>
<a href='/good'>商品列表</a>
<a href='/good' class="button">商品列表</a>
</td>
</tr>
</table>
+27 -160
View File
@@ -4,166 +4,33 @@
</head>
<body>
@include('layout.header')
<script language="javascript" type="text/javascript">
function test(Names) {
if(Names=="mune_x0")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
}else if(Names=="mune_x1")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
}else if(Names=="mune_x2")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
}else if(Names=="mune_x3")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
} else if(Names=="mune_x4")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
}
}
</script>
<div class="page-content">
<div class="row">
<div class="medium-6 columns">
<div class="form-group">
<label class="col-sm-2 control-label">选择分类:</label>
<div class="col-sm-10">
<select size="1" name="D1" onChange="javascript:test('mune_x'+this.value)">
<option value="0" selected="selected">全部显示</option>
<option value="1" >我是分类1</option>
<option value="2">我是分类2</option>
<option value="3">我是分类4</option>
<option value="4">我是滑稽</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品列表</label>
<table class="table table-striped">
<tr>
<td>#</td>
<td>商品名称</td>
<td>最低价格</td>
<td>最高价格</td>
</tr>
@foreach($goods as $good)
<tr class="cat{{ $good->cat_id }}">
<td>{{$good->id}}</td>
<td>{{ $good->good_name }}</td>
<td>{{ $good->pricemin }}</td>
<td>{{ $good->pricemax }}</td>
</tr>
@endforeach
</table>
</div>
<div class="form-group">
<div class="col-sm-3 col-sm-offset-3">
<a href="/good/add" class="button">添加商品</a>
</div>
<div class="col-sm-4">
<a href="/good/mygood" class="button">我的商品</a>
</div>
</div>
</div>
</div>
<ul>
<label>选择分类:</label>
<select size="1" name="D1" onChange="javascript:test(this.value,{{count($cats)}})">
<option value="0" selected="selected">*</option>
@foreach($cats as $cat)
<option value="{{$cat->id}}">{{$cat->cat_name}}</option>
@endforeach
</select>
<label>商品列表</label>
<table class="table">
<tr>
<td>#</td>
<td>商品名称</td>
<td>最低价格</td>
<td>最高价格</td>
</tr>
@foreach($goods as $good)
<tr class="cat{{ $good->cat_id }}">
<td>{{ $good->id }}</td>
<td><a href="/good/{{$good->id}}">{{ $good->good_name }}</a></td>
<td>{{ $good->pricemin }}</td>
<td>{{ $good->pricemax }}</td>
</tr>
@endforeach
</table>
<a href="/good/add" class="button">添加商品</a>
<a href="/good/my" class="button">我的商品</a>
</div>
@include('layout.footer')
@include('includes.foot')
+20 -157
View File
@@ -1,165 +1,28 @@
@include('includes.head')
@include('includes.good')
<title>我的商品</title>
<title>先锋市场</title>
</head>
<body>
@include('layout.header')
<script language="javascript" type="text/javascript">
function test(Names) {
if(Names=="mune_x0")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
}else if(Names=="mune_x1")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
}else if(Names=="mune_x2")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
}else if(Names=="mune_x3")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
} else if(Names=="mune_x4")
{
var Nnews = document.querySelectorAll(".cat1")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat2")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat3")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = 'none';
}
var Nnews = document.querySelectorAll(".cat4")
for (var i = 0, len = Nnews.length; i < len; i++) {
var Nnew = Nnews.item(i);
Nnew.style.display = '';
}
}
}
</script>
<div class="page-content">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="form-group">
<label class="col-sm-2 control-label">选择分类:</label>
<div class="col-sm-10">
<select size="1" name="D1" onChange="javascript:test('mune_x'+this.value)">
<option value="0" selected="selected">全部显示</option>
<option value="1" >我是分类1</option>
<option value="2">我是分类2</option>
<option value="3">我是分类4</option>
<option value="4">我是滑稽</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品列表</label>
<table class="table table-striped">
<tr>
<td>#</td>
<td>商品名称</td>
<td>最低价格</td>
<td>最高价格</td>
</tr>
@foreach($mygoods as $mygood)
<tr class="cat{{ $mygood->cat_id }}">
<td>{{$mygood->id}}</td>
<td>{{ $mygood->good_name }}</td>
<td>{{ $mygood->pricemin }}</td>
<td>{{ $mygood->pricemax }}</td>
</tr>
@endforeach
</table>
</div>
<div class="form-group">
<div class="col-sm-3 col-sm-offset-5">
<a href="/good/add" class="button">添加商品</a>
</div>
</div>
</div>
</div>
<label>商品列表</label>
<table class="table">
<tr>
<td>#</td>
<td>商品名称</td>
<td>最低价格</td>
<td>最高价格</td>
</tr>
@foreach($goods as $good)
<tr>
<td>{{ $good->id }}</td>
<td><a href="/good/{{$good->id}}">{{ $good->good_name }}</a></td>
<td>{{ $good->pricemin }}</td>
<td>{{ $good->pricemax }}</td>
</tr>
@endforeach
</table>
<a href="/good/add" class="button">添加商品</a>
</div>
@include('layout.footer')
@include('includes.foot')
+1 -2
View File
@@ -1,3 +1,2 @@
<link rel="stylesheet" href="/css/good.css">
<script src="/js/jquery-1.8.3.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/jquery-1.8.3.min.js"></script>
+1
View File
@@ -6,6 +6,7 @@
</div>
<div class="top-bar-left">
<ul class="dropdown menu" data-dropdown-menu>
<li><a href="/">主页</a></li>
<li><a href="/good">商品</a></li>
</ul>
</div>
+1
View File
@@ -18,6 +18,7 @@
</br>
<a href='/user/{{$user->id}}/edit'>Edit</a><br/>
<a href='/logout'>Log Out</a><br/>
<a href='/good/check'>Check</a><br/>
</div>
@include('layout.footer')
@include('includes.foot')