c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/iborvs/NEUP-FleaMarket into dev

Browse Source
This commit is contained in:
LI JIAHAO
2017-06-19 09:56:29 +08:00
parent 55318da7ef 0e283a4f1d
commit 3f097688c1
11 changed files with 210 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/good/goodInfo.blade.php
+3 -3
View File
@@ -9,7 +9,7 @@
max-width: 200px;
}
p>img{
max-width: 50%;
max-width: 100%;
}
</style>
<script>
@@ -60,7 +60,7 @@
@if(($good->user_id) != Session::get('user_id') && !$good->baned)
<form action="/good/{{ $good->id }}/buy" method="post">
<div class="input-group">
<input type="number" name="count" value="1" class="form-control"/>
<input type="number" name="count" value="1" class="form-control" min="0" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"/>
{!! csrf_field() !!}
<span class="input-group-btn">
<input type="submit" class="btn btn-primary" value="购买"/>
@@ -91,7 +91,7 @@
<div class="card-header">
<h4>商品介绍</h4>
</div>
<div class="card-block" style="word-break:break-all">{!! $good->description !!}</div>
<div class="card-block" style="word-break:break-all;min-height: 100px">{!! $good->description !!}</div>
</div>
</div>
<script>
resources/views/good/goodInfoForm.blade.php
+3 -3
View File
@@ -38,11 +38,11 @@
</div>
<div class="form-group">
<label for="description">商品描述</label>
<textarea name="description" id="description" placeholder="商品描述" class="form-control" style="resize:none" rows="6">{!! count($errors) ? old('description') : $good->description !!}</textarea>
<textarea name="description" id="description" placeholder="商品描述" class="form-control" style="resize:none;" rows="6">{!! count($errors) ? old('description') : $good->description !!}</textarea>
</div>
<div class="form-group">
<label for="price">商品价格</label>
<input type="number" min="0" name="price" id="price" value="{{count($errors) ? old('price') : $good->price}}" placeholder="商品价格" class="form-control">
<input type="number" min="0" name="price" id="price" value="{{count($errors) ? old('price') : $good->price}}" placeholder="商品价格" class="form-control" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
</div>
<div class="form-group hidden-xs-up">
<label>商品类型</label>
@@ -53,7 +53,7 @@
</div>
<div class="form-group">
<label for="count">商品数量</label>
<input type="number" name="count" id="count" min="0" value="{{count($errors) ? old('count') : $good->count}}" placeholder="库存" class="form-control">
<input type="number" name="count" id="count" min="0" value="{{count($errors) ? old('count') : $good->count}}" placeholder="库存" class="form-control" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')" />
</div>
{{--
<div class="row">
resources/views/good/goodInfoOnWelcome.blade.php
+34 -25
View File
@@ -1,24 +1,37 @@
<div class="col-6 col-lg-4">
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
<div style="position:absolute;z-index:201">
<input type="checkBox" name="del_goods[]" value="0" id="box{{ $good->good_id }}" class="cb" onclick="{setValue({{ $good->good_id }})}" style="visibility:hidden;width:20%;z-index:203" />
</div>
<img src="/good/{{ sha1($good->id) }}/titlepic" class="titlepic"/>
<div class="details" style="position:absolute;z-index:200;width:100%;display:none;">
<div class="det-d hidden-sm-down" style="position:absolute;z-index:200;top:-37px;left:5px;color:white;font-size:12px;">
<p>售价：￥{{ $good->price }}</p>
<p>@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif</p>
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
<div style="position:absolute;z-index:201">
<input type="checkBox" name="del_goods[]" value="0" id="box{{ $good->good_id }}" class="cb" onclick="{setValue({{ $good->good_id }})}" style="visibility:hidden;width:20%;z-index:203" />
</div>
<div class="det-d hidden-md-up" style="position:absolute;z-index:200;top:-43px;left:5px;color:white;font-size:15px;">
<p>售价：￥{{ $good->price }}</p>
<p>@if($good->count==0)
<img src="/good/{{ sha1($good->id) }}/titlepic" class="titlepic"/>
<div class="details" style="position:absolute;z-index:200;width:100%;display:none;">
<div class="det-d hidden-sm-down" style="position:absolute;z-index:200;top:-37px;left:5px;color:white;font-size:12px;">
售价：￥{{ $good->price }}
<p> @if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif
</p>
</div>
<div class="det-d hidden-md-up" style="position:absolute;z-index:200;top:-43px;left:5px;color:white;font-size:15px;">
<p>售价：￥{{ $good->price }}</p>
<p>@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif</p>
</div>
</div>
</div>
<div class="card-block" style="word-break:break-all">
{{ $good->good_name }}
<div class="hidden-md-up" style="font-size: 13px;color:black">
<p class="text-warning" style="margin-bottom: 0">售价：￥{{ $good->price }}</p>
<p style="margin-bottom: 0">@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@@ -26,10 +39,6 @@
</div>
</div>
</div>
<div class="card-block" style="word-break:break-all">
{{ $good->good_name }}
</div>
</div>
</a>
</div>
</a>
</div>
</div>
resources/views/good/goodList.blade.php
+9 -10
View File
@@ -9,14 +9,13 @@
@section('content')
<div class="row">
@include('layout.catlist')
<div class="hidden-md-up">&nbsp;</div>
<div class="col-12 col-md-10">
<p>
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="sort" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<input type="hidden" id="nm" class="@if(isset($_GET['sort'])){{ $_GET['sort'] }}@endif">
<input type="hidden" id="nm" class="@if(isset($_GET['sort'])){{ $_GET['sort'] }}@endif" />
排序
</button>
<div class="dropdown-menu" aria-labelledby="sort">
@@ -28,11 +27,11 @@
</div>
</div>
</div>
<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 class="col-12 col-lg-5" id="ds">
<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"/><button class="btn btn-primary" onclick="setc('a')">确定</button>
</div>
<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 class="col-12 col-lg-5" style="display:none">
<a>库存下限</a> <input id="pricec" style="display:inline-block" maxlength="9" class="form-control" value="@if(isset($_GET['start_count'])){{ $_GET['start_count'] }}@endif"/><button class="btn btn-primary" id="subs" onclick="setc('a')">确定</button>
</div>
</div>
</p>
@@ -47,11 +46,11 @@
</div>
<div class="card-block">
<div style="word-break:break-all">{{ $good->good_name }}</div>
<div class="text-warning"><b>￥{{ $good->price }}</b></div>
<div class="text-warning" style="font-size: 13px"><b>￥{{ $good->price }}</b></div>
@if($good->count==0)
<div class="text-danger">无库存QAQ</div>
<div class="text-danger" style="font-size: 13px;color: black">无库存QAQ</div>
@else
<div>库存：{{ $good->count }}</div>
<div style="font-size: 13px;color: black">库存：{{ $good->count }}</div>
@endif
</div>
</div>
resources/views/layout/catlist.blade.php
+3 -3
View File
@@ -1,12 +1,12 @@
<div class="col-md-2 hidden-sm-down" style="position:sticky;top:0;left:0">
<div class="col-md-2 hidden-sm-down" style="top:0;left: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>
<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" data-toggle="tooltip">所有商品</a></li>
@foreach($cats as $cat)
<li class="nav-item"><a href="/good?cat_id={{ $cat->id }}" class="nav-link @if(isset($cat_id)&&$cat_id == $cat->id) active @endif" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ $cat->cat_name }}</a></li>
@endforeach
</ul>
</div>
<div class="col-12 hidden-md-up" style="position:sticky;top:0">
<div class="col-12 hidden-md-up" style="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)
resources/views/user/buyer.blade.php
+65 -66
View File
@@ -7,7 +7,6 @@
h5 {
color: #ffffff;
}
.trans_msg {
filter: alpha(opacity=100) revealTrans(duration=.2, transition=1) blendtrans(duration=.2);
width: 400px;
@@ -19,71 +18,71 @@
@section('content')
<h3>我的订单</h3>
<label>友情提示：如果需要取消订单，请务必和对方沟通说明理由。恶意取消订单的行为可以举报。</label>
<table class="table table-hover table-responsive">
<tr>
<td>订单编号</td>
<td>商品名称</td>
<td>数量</td>
<td>订单状态</td>
<td>操作</td>
</tr>
@foreach($trans as $tran)
<tr id="tran{{ $tran->id }}">
<td>{{ $tran->id }}</td>
<td><a href="/good/{{$tran->good_id}}"
@if(isset($tran->good))
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()"
<label>友情提示：如果需要取消订单，请务必和对方沟通说明理由。恶意取消订单的行为可以举报。</label>
<table class="table table-hover table-responsive">
<tr>
<td>订单编号</td>
<td>商品名称</td>
<td>数量</td>
<td>订单状态</td>
<td>操作</td>
</tr>
@foreach($trans as $tran)
<tr id="tran{{ $tran->id }}">
<td>{{ $tran->id }}</td>
<td><a href="/good/{{$tran->good_id}}"
@if(isset($tran->good))
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()"
@endif
>{{ isset($tran->good) ? $tran->good->good_name : "此商品已删除" }}</a></td>
<td>{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
已取消
</td>
@elseif($tran->status == 1)
<td>
等待卖家确认
</td>
<td>
<form method="POST" action="/trans/{{ $tran->id }}/cancel" id="delform">
{!! csrf_field() !!}
{!! method_field('DELETE') !!}
<input type="submit" class="btn btn-primary" value="取消订单" style="margin: 0;"
id="delbutton">
</form>
</td>
@elseif($tran->status == 2)
<td>
交易已成立
</td>
<td>
<a href="/trans/{{ $tran->id }}">查看交易</a>
</td>
@elseif($tran->status == 3)
<td>
交易失败
</td>
@elseif($tran->status == 4)
<td>
交易成功待评价
</td>
<td>
<form action="/comment/{{ $tran->id }}">
{!! csrf_field() !!}
<input type="submit" class="btn btn-primary" value="评价" style="margin: 0;">
</form>
</td>
@elseif($tran->status == 5)
<td>
已评价
</td>
@endif
</tr>
>{{ isset($tran->good) ? $tran->good->good_name : "此商品已删除" }}</a></td>
<td>{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
已取消
</td>
@elseif($tran->status == 1)
<td>
等待卖家确认
</td>
<td>
<form method="POST" action="/trans/{{ $tran->id }}/cancel" id="delform">
{!! csrf_field() !!}
{!! method_field('DELETE') !!}
<input type="submit" class="btn btn-primary" value="取消订单" style="margin: 0;"
id="delbutton">
</form>
</td>
@elseif($tran->status == 2)
<td>
交易已成立
</td>
<td>
<a href="/trans/{{ $tran->id }}">查看交易</a>
</td>
@elseif($tran->status == 3)
<td>
交易失败
</td>
@elseif($tran->status == 4)
<td>
交易成功待评价
</td>
<td>
<form action="/comment/{{ $tran->id }}">
{!! csrf_field() !!}
<input type="submit" class="btn btn-primary" value="评价" style="margin: 0;">
</form>
</td>
@elseif($tran->status == 5)
<td>
已评价
</td>
@endif
</tr>
@endforeach
{{ $trans->links() }}
</table>
@endforeach
{{ $trans->links() }}
</table>
@endsection
@endsection
resources/views/user/editUserExtra.blade.php
+41 -42
View File
@@ -1,45 +1,44 @@
<style>
.cropper-crop-box, .cropper-view-box {
border-radius: 50%;
}
.cropper-view-box {
box-shadow: 0 0 0 1px #39f;
outline: 0;
}
</style>
<div class="row">
<div class="mx-auto">
<div id="preview"><label for="avatarUpload"><img id="avatarpreview" class="avatar" src="/avatar/{{Session::get('user_id')}}"/></label></div>
<div style="display: none">
<input type="file" id="avatarUpload" name="avatarPic" onchange="preview(this)"/>
</div>
<style>
.cropper-crop-box, .cropper-view-box {
border-radius: 50%;
}
.cropper-view-box {
box-shadow: 0 0 0 1px #39f;
outline: 0;
}
</style>
<div class="row">
<div class="mx-auto">
<div id="preview"><img id="avatarpreview" class="avatar" src="/avatar/{{Session::get('user_id')}}"/></div>
<div style="display: none">
<input type="file" id="avatarUpload" name="avatarPic" onchange="preview(this)"/>
</div>
</div>
<input id="avatarUploadCpWidth" type="hidden" name="crop_width">
<input id="avatarUploadCpHeight" type="hidden" name="crop_height">
<input id="avatarUploadCpX" type="hidden" name="crop_x">
<input id="avatarUploadCpY" type="hidden" name="crop_y">
<p>
<div class="row">
<div class="mx-auto">
<label for="avatarUpload" class="btn btn-secondary">更改头像</label>
</div>
</div>
<input id="avatarUploadCpWidth" type="hidden" name="crop_width">
<input id="avatarUploadCpHeight" type="hidden" name="crop_height">
<input id="avatarUploadCpX" type="hidden" name="crop_x">
<input id="avatarUploadCpY" type="hidden" name="crop_y">
<p>
<div class="row">
<div class="mx-auto">
<label for="avatarUpload" class="btn btn-secondary">更改头像</label>
</div>
</p>
{!! csrf_field() !!}
<div class="nickname-form">
<div class="mx-auto">
<div class="form-group">
<label for="nickname">昵称</label>
@if(isset($user->nickname))
<input type="text" name="nickname" id="nickname" class="form-control nickname-input" value="{{ $user->nickname }}">
@else
<input type="text" name="nickname" id="nickname" class="form-control nickname-input">
@endif
</div>
</div>
</p>
{!! csrf_field() !!}
<div class="nickname-form">
<div class="mx-auto">
<div class="form-group">
<label for="nickname">昵称</label>
@if(isset($user->nickname))
<input type="text" name="nickname" id="nickname" class="form-control nickname-input" value="{{ $user->nickname }}">
@else
<input type="text" name="nickname" id="nickname" class="form-control nickname-input">
@endif
</div>
</div>
</div>
<script>
function preview(file) {
@@ -64,11 +63,11 @@
prreader.onload = function (evt) {
var fileBuf = new Uint8Array(evt.target.result.slice(0, 11));
/*var mime = isImage(fileBuf);
if (mime == null) {
alert("Please open image!");
return;
} else {*/
reader.readAsDataURL(file.files[0]);
if (mime == null) {
alert("Please open image!");
return;
} else {*/
reader.readAsDataURL(file.files[0]);
//}
};
prreader.readAsArrayBuffer(file.files[0]);
resources/views/user/user.blade.php
+41 -42
View File
@@ -17,10 +17,10 @@
min-height: 400px;
}
.col-card {
max-width:130px;
max-width:130px;
}
.nav-pills {
width:100px;
width:100px;
}
.password-form {
width:300px;
@@ -48,7 +48,6 @@
</style>
<script>
match_media = "(min-width:992px)";
function WidthChange(mq) {
if (mq.matches) {
$('.row-first').attr('class','row row-first');
@@ -75,51 +74,51 @@
@section('content')
<div class="row-first" style="margin-top:20px">
<div class="mx-auto">
<div class="card main-card">
<div class="card-block">
<div class="row-card">
<div class="col col-card">
<div class="row paowa">
<div class="mx-auto">
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link @if(!isset($tab) || ($tab != 'account') && ($tab != 'contact')) active @endif" href="/user">个人信息</a></li>
<li class="nav-item"><a class="nav-link @if($tab == 'account') active @endif" href="/user?tab=account">用户帐户</a></li>
<li class="nav-item"><a class="nav-link @if($tab == 'contact') active @endif" href="/user?tab=contact">联系方式</a></li>
</ul>
</div>
</div>
</div>
<p>
<div class="col">
@if(!isset($tab) || $tab == 'profile')
<div id="profile">
<form action="/user" method="POST" enctype="multipart/form-data">
@include('user.editUserExtra')
<div class="row">
<div class="row-first" style="margin-top:20px">
<div class="mx-auto">
<div class="card main-card">
<div class="card-block">
<div class="row-card">
<div class="col col-card">
<div class="row paowa">
<div class="mx-auto">
<input class="btn btn-success" type="submit" name="submit" value="保存">
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link @if(!isset($tab) || ($tab != 'account') && ($tab != 'contact')) active @endif" href="/user">个人信息</a></li>
<li class="nav-item"><a class="nav-link @if($tab == 'account') active @endif" href="/user?tab=account">用户帐户</a></li>
<li class="nav-item"><a class="nav-link @if($tab == 'contact') active @endif" href="/user?tab=contact">联系方式</a></li>
</ul>
</div>
</div>
</form>
</div>
<p>
<div class="col">
@if(!isset($tab) || $tab == 'profile')
<div id="profile">
<form action="/user" method="POST" enctype="multipart/form-data">
@include('user.editUserExtra')
<div class="row">
<div class="mx-auto">
<input class="btn btn-success" type="submit" name="submit" value="保存">
</div>
</div>
</form>
</div>
@endif
@if($tab == 'account')
<div id="account">
@include('user.editUserAccount')
</div>
@endif
@if($tab == 'contact')
<div id="contact">
@include('user.userInfo')
</div>
@endif
</div>
</p>
</div>
@endif
@if($tab == 'account')
<div id="account">
@include('user.editUserAccount')
</div>
@endif
@if($tab == 'contact')
<div id="contact">
@include('user.userInfo')
</div>
@endif
</div>
</p>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/welcome.blade.php
+4 -2
View File
@@ -22,7 +22,9 @@
@include('layout.catlist')
<div class="col-12 col-md-7">
@if(count($newgoods)>0)
<h3>新品</h3>
<h3 style="display : inline">新品</h3>
<span style="font-size: 13px;margin-left:3px" class="text-warning hidden-md-up">点击分类查看更多商品哦↑</span>
<span style="font-size: 13px;margin-left:3px" class="text-warning hidden-sm-down">点击分类查看更多商品哦</span>
<div class="row">
@foreach($newgoods as $good)
@include('good.goodInfoOnWelcome')
@@ -30,7 +32,7 @@
</div>
@endif
@if(count($populargoods)>0)
<h3>热门</h3>
<h3 style="display : inline">热门</h3><span style="font-size: 13px;margin-left:3px" class="text-warning">热门商品都在这里哦</span>
<div class="row">
@foreach($populargoods as $good)
@include('good.goodInfoOnWelcome')