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

merge

Browse Source
This commit is contained in:
iborvs
2017-06-18 14:18:52 +08:00
parent 115dc25f3a
commit bc2dddee47
4 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/good/goodInfoOnWelcome.blade.php
+8 -9
View File
@@ -16,18 +16,17 @@
库存：{{ $good->count }}
@endif
</div>
<div class="det-d hidden-md-up" style="position:absolute;z-index:200;top:-43px;left:5px;color:white;font-size:15px;">
售价：￥{{ $good->price }}<br/>
@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif
</div>
</div>
</div>
<div class="card-block" style="word-break:break-all">
<div class="card-block" style="word-break:break-all;">
{{ $good->good_name }}
<div class="hidden-md-up" style="font-size:14px;color:black"> 售价：￥{{ $good->price }}<br/>
@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif
</div>
</div>
</div>
</a>
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
+4 -3
View File
@@ -5,17 +5,18 @@
</div>
@endif
@if(isset($user->nickname))
<div class="form-group">
<div class="form-group col-md-4 col-sm-8">
<label for="nickname">昵称</label>
<input type="text" name="nickname" id="nickname" class="form-control" value="{{ $user->nickname }}"></label>
</div>
@else
<div class="form-group">
<div class="form-group col-md-4">
<label for="nickname">昵称</label>
<input type="text" name="nickname" id="nickname" class="form-control"></label>
</div>
@endif
{!! csrf_field() !!}
<div class="col-md-12">
<label for="avatarUpload" class="btn btn-primary">选择头像</label>
<div id="preview"></div>
<div style="display: none">
@@ -26,7 +27,7 @@
<input id="avatarUploadCpHeight" type="hidden" name="crop_height">
<input id="avatarUploadCpX" type="hidden" name="crop_x">
<input id="avatarUploadCpY" type="hidden" name="crop_y">
</div>
<script>
function preview(file) {
var prevDiv = document.getElementById('preview');
resources/views/user/user.blade.php
+5 -2
View File
@@ -19,7 +19,7 @@
<span class="form-error is-visible">{{$errors->first()}}</span>
</label>
@endif
<div class="card">
<div class="card" style="min-height:400px">
<div class="card-header">
<ul class="nav nav-tabs card-header-tabs" role="tablist">
<li class="nav-item"><a class="nav-link @if($tab == "profile") active @endif" href="#profile" aria-controls="profile" role="tab" data-toggle="tab">个人信息</a></li>
@@ -32,7 +32,10 @@
<div class="card-section">
<form action="/user" method="POST" enctype="multipart/form-data">
@include('user.editUserExtra')
<br/><input class="btn btn-primary" type="submit" name="submit" value="保存">
<br/>
<div class="col-md-12">
<input class="btn btn-primary" type="submit" name="submit" value="保存">
</div>
</form>
</div>
</div>