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

fix some front-end

Browse Source
This commit is contained in:
LI JIAHAO
2017-06-20 14:15:07 +08:00
parent efdc7b744e
commit 70a4eed0f9
4 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/message.css
Vendored
+5
View File
@@ -43,6 +43,7 @@
.con-wrapper {
vertical-align: middle;
text-align: center;
width: 100%;
}
.balloon-tip {
@@ -182,4 +183,8 @@
#contact-closer:hover {
background-color: #b42600;
}
ul {
padding-left: 0 !important;
}
resources/views/transaction.blade.php
+37 -37
View File
@@ -9,24 +9,24 @@
<div class="row table-responsive">
<table class="table">
<tr>
<td>订单编号</td>
<td>商品名称</td>
<td>数量</td>
<td>订单状态</td>
<td>操作</td>
<td nowrap="nowrap">订单编号</td>
<td nowrap="nowrap">商品名称</td>
<td nowrap="nowrap">数量</td>
<td nowrap="nowrap">订单状态</td>
<td nowrap="nowrap">操作</td>
</tr>
<tr id="tran{{ $tran->id }}">
<td>{{ $tran->id }}</td>
<td><a href="/good/{{$tran->good_id}}"
<td nowrap="nowrap">{{ $tran->id }}</td>
<td nowrap="nowrap"><a href="/good/{{$tran->good_id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $tran->good->good_name }}</a></td>
<td>{{ $tran->number }}</td>
<td nowrap="nowrap">{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
<td nowrap="nowrap">
已取消
</td>
@elseif($tran->status == 1)
<td>
<td nowrap="nowrap">
等待卖家确认
</td>
<td>
@@ -38,28 +38,28 @@
</form>
</td>
@elseif($tran->status == 2)
<td>
<td nowrap="nowrap">
交易已成立
</td>
<td>
<td nowrap="nowrap">
<a href="/trans/{{ $tran->id }}">查看交易</a>
</td>
@elseif($tran->status == 3)
<td>
<td nowrap="nowrap">
交易失败
</td>
@elseif($tran->status == 4)
<td>
<td nowrap="nowrap">
交易成功待评价
</td>
<td>
<td nowrap="nowrap">
<form action="/comment/{{ $tran->id }}">
{!! csrf_field() !!}
<input type="submit" class="button" value="评价" style="margin: 0;">
</form>
</td>
@elseif($tran->status == 5)
<td>
<td nowrap="nowrap">
已评价
</td>
@endif
@@ -72,20 +72,20 @@
<div class="row table-responsive">
<table class="table">
<tr>
<th>真实姓名</th>
<th>手机</th>
<th>QQ</th>
<th>微信</th>
<th>地址</th>
<th nowrap="nowrap">真实姓名</th>
<th nowrap="nowrap">手机</th>
<th nowrap="nowrap">QQ</th>
<th nowrap="nowrap">微信</th>
<th nowrap="nowrap">地址</th>
</tr>
@foreach($seller->user_infos as $userinfo)
<tr>
<td>{{ $seller->realname }}</td>
<td>{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td>{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td>{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
<td>{{ isset($userinfo->address) ? $userinfo->address : "" }}</td>
<td nowrap="nowrap">{{ $seller->realname }}</td>
<td nowrap="nowrap">{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->address) ? $userinfo->address : "" }}</td>
</tr>
@endforeach
</table>
@@ -94,22 +94,22 @@
<h3>买家联系方式</h3>
<div class="card-section">
<div class="row table-responsive">
<table class="card-table" rules="rows">
<table class="table">
<tr>
<th>真实姓名</th>
<th>手机</th>
<th>QQ</th>
<th>微信</th>
<th>地址</th>
<th nowrap="nowrap">真实姓名</th>
<th nowrap="nowrap">手机</th>
<th nowrap="nowrap">QQ</th>
<th nowrap="nowrap">微信</th>
<th nowrap="nowrap">地址</th>
</tr>
@foreach($buyer->user_infos as $userinfo)
<tr>
<td>{{ $buyer->realname }}</td>
<td>{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td>{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td>{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
<td>{{ isset($userinfo->address) ? $userinfo->address : "" }}</td>
<td nowrap="nowrap">{{ $buyer->realname }}</td>
<td nowrap="nowrap">{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
<td nowrap="nowrap">{{ isset($userinfo->address) ? $userinfo->address : "" }}</td>
</tr>
@endforeach
</table>
resources/views/user/seller/mygoods.blade.php
+9 -9
View File
@@ -18,22 +18,22 @@
<thead>
<tr>
<th>#</th>
<th>商品名称</th>
<th>商品价格</th>
<th>剩余库存</th>
<th>修改信息</th>
<th>删除商品</th>
<th nowrap="nowrap">商品名称</th>
<th nowrap="nowrap">商品价格</th>
<th nowrap="nowrap">剩余库存</th>
<th nowrap="nowrap">修改信息</th>
<th nowrap="nowrap">删除商品</th>
</tr>
</thead>
<tbody>
@foreach($goods as $good)
<tr id="good{{ $good->id }}">
<td>{{ $good->id }}</td>
<td><a href="/good/{{$good->id}}"
<td nowrap="nowrap">{{ $good->id }}</td>
<td nowrap="nowrap"><a href="/good/{{$good->id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($good->id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $good->good_name }}</a></td>
<td>{{ $good->price }}</td>
<td>{{ $good->count }}</td>
<td nowrap="nowrap">{{ $good->price }}</td>
<td nowrap="nowrap">{{ $good->count }}</td>
<td>
<form action="/good/{{ $good->id }}/edit">
<input type="submit" class="btn btn-primary" value="修改" style="margin: 0;">
resources/views/user/seller/sellerTrans.blade.php
+20 -20
View File
@@ -19,48 +19,48 @@
<label>友情提示：如果需要取消订单，请务必和对方沟通说明理由。恶意取消订单的行为可以举报。</label>
<table class="table table-hover table-responsive">
<tr>
<td>订单编号</td>
<td>商品名称</td>
<td>买家昵称</td>
<td>数量</td>
<td>订单状态</td>
<td colspan="3">操作</td>
<td nowrap="nowrap">订单编号</td>
<td nowrap="nowrap">商品名称</td>
<td nowrap="nowrap">买家昵称</td>
<td nowrap="nowrap">数量</td>
<td nowrap="nowrap">订单状态</td>
<td nowrap="nowrap" colspan="3">操作</td>
</tr>
@foreach($trans as $tran)
<tr id="tran{{ $tran->id }}">
<td>{{ $tran->id }}</td>
<td><a href="/good/{{$tran->good_id}}"
<td nowrap="nowrap">{{ $tran->id }}</td>
<td nowrap="nowrap"><a href="/good/{{$tran->good_id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $tran->good->good_name }}</a></td>
<td><a href="/user/{{ $tran->buyer_id }}">{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}@if($tran->buyer->baned)【已封禁】@endif</a></td>
<td>{{ $tran->number }}</td>
<td nowrap="nowrap"><a href="/user/{{ $tran->buyer_id }}">{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}@if($tran->buyer->baned)【已封禁】@endif</a></td>
<td nowrap="nowrap">{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
<td nowrap="nowrap">
已取消
</td>
@elseif($tran->status == 1)
<td>
<td nowrap="nowrap">
买家已下单
</td>
<td>
<form method="POST" action="/trans/{{ $tran->id }}/confirm">
{!! csrf_field() !!}
<input type="submit" class="button" value="确认订单" style="margin: 0;">
<input type="submit" class="btn btn-primary" value="确认订单" style="margin: 0;">
</form>
</td>
<td>
<form method="POST" action="/trans/{{ $tran->id }}/cancel" id="delform">
{!! csrf_field() !!}
{!! method_field('DELETE') !!}
<input type="submit" class="button" value="取消订单" style="margin: 0;"
<input type="submit" class="btn btn-primary" value="取消订单" style="margin: 0;"
id="delbutton">
</form>
</td>
@elseif($tran->status == 2)
<td>
<td nowrap="nowrap">
交易已成立
</td>
<td>
<td nowrap="nowrap">
<a href="/trans/{{ $tran->id }}">查看交易</a>
</td>
{{--<td>
@@ -72,19 +72,19 @@
<form method="POST" action="/trans/{{ $tran->id }}/confirm">
{!! csrf_field() !!}
<input type="hidden" name="result" value="1">
<input type="submit" class="button" value="完成交易" style="margin: 0;">
<input type="submit" class="btn btn-primary" value="完成交易" style="margin: 0;">
</form>
</td>
@elseif($tran->status == 3)
<td>
<td nowrap="nowrap">
交易失败
</td>
@elseif($tran->status == 4)
<td>
<td nowrap="nowrap">
交易成功待评价
</td>
@elseif($tran->status == 5)
<td>
<td nowrap="nowrap">
买家已评价
</td>
@endif