Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 8ef24967 by 朱继来
Options

详情页调整

parent a9fa7310
Inline Side-by-side
Showing with 129 additions and 116 deletions
public/css/detail.css
/* 订单信息 */ /* 订单信息 */
.order-details .order-info { .order-details .order-info {
width: 33%; width: 100%;
display: inline-block; display: inline-block;
} }
.order-details .table { .order-details .table {
...@@ -9,10 +9,14 @@ ...@@ -9,10 +9,14 @@
/* 订单信息右侧 */ /* 订单信息右侧 */
.order-details .order-right { .order-details .order-right {
width: 66%; width: 100%;
display: inline-block; display: inline-block;
} }
.changeBtn {
float: right;
}
.order-details .order-total { .order-details .order-total {
text-align: right; text-align: right;
} }
......
resources/views/detail/content.blade.php
...@@ -13,100 +13,34 @@ ...@@ -13,100 +13,34 @@
?> ?>
<input type="hidden" class="action_type" value="{{$action_name}}"> <input type="hidden" class="action_type" value="{{$action_name}}">
<div class="tabs-box"> <div class="tabs-box">
<div class="order-info"> <table class="table table-bordered order-express">
<input type="hidden" id="order_id" value="{{$order_info['order_id']}}"> <?php
<table class="table table-bordered"> $currency = $order_info['currency'] == 2 ? '$' : '￥';
<tr class="caption"><th colspan="2">订单信息</th></tr> ?>
<tr>
<th>订单编号</th>
<td>
{{$order_info['order_sn']}}
</td>
</tr>
<tr> <tr>
<th>会员账号</th> @if ($order_info['order_pay_type'] == 2)
<td> <th>预付款</th>
@if ($user_mobile) <th>尾款</th>
{{$user_mobile}}
@else
{{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}}
@endif @endif
</td>
</tr>
<tr> <th>交易状态</th>
<th>收货人</th> <th>对账状态</th>
<td>{{$order_address_info['consignee']}}</td> <th>配送状态</th>
</tr> <th>支付方式</th>
<tr> <th>支付类型</th>
<th>联系电话/手机</th> <th>支付状态</th>
<td>{{$order_address_info['mobile']}}</td>
</tr> </tr>
@if ($order_info['order_shipping_type'] == 2)
<tr> <tr>
<th>配送方式</th>
<td>客户自提</td>
</tr>
<tr>
<th>自提地址</th><td>{{$order_address_info['address']}}</td>
</tr>
@else
<tr>
<th>配送方式</th>
<td>快递送货</td>
</tr>
<tr>
<th>收货地址</th>
<td>
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
<!-- 订单状态小于5 且 更新地址权限存在 显示按钮 -->
@if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms))
@if (isset($_REQUEST['tags']))
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm">更改收货地址</a>
@else
<a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm">更改收货地址</a>
@endif
@endif
</td>
</tr>
@endif
<tr>
<th>客户备注</th>
<td>{{$order_info['order_remark']}}</td>
</tr>
</table>
</div>
<div class="order-right">
<table class="table order-express">
<?php
$currency = $order_info['currency'] == 2 ? '$' : '￥';
?>
@if ($order_info['order_pay_type'] == 2) @if ($order_info['order_pay_type'] == 2)
<tr> <td>{{$currency.$order_info['advance_amount']}}</td>
<td colspan="2">
<p>
<b style="font-weight:bolder !important;">预付款:</b>
{{$currency.$order_info['advance_amount']}}
</p>
</td>
<td colspan="3"> <td>
<p>
<b style="font-weight:bolder !important;">尾款:</b>
{{$currency.number_format($order_info['order_amount'] - $order_info['advance_amount'], 2, '.', '')}} {{$currency.number_format($order_info['order_amount'] - $order_info['advance_amount'], 2, '.', '')}}
</p>
</td> </td>
</tr>
@endif @endif
<tr>
<td> <td>
<p>
<b style="font-weight:bolder !important;">交易状态:</b>
<?php <?php
switch ($order_info['status']) { switch ($order_info['status']) {
case -2: echo "审核未通过";break; case -2: echo "审核未通过";break;
...@@ -120,11 +54,9 @@ ...@@ -120,11 +54,9 @@
case 10: echo "交易成功";break; case 10: echo "交易成功";break;
} }
?> ?>
</p>
</td> </td>
<td> <td>
<p>
<b style="font-weight:bolder !important;">对账状态:</b>
<?php <?php
if ($order_info['order_pay_type'] == 1) { if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['order_id'] != '') { if (!empty($order_pay_log) && $order_pay_log[0]['order_id'] != '') {
...@@ -142,11 +74,9 @@ ...@@ -142,11 +74,9 @@
} }
} }
?> ?>
</p>
</td> </td>
<td> <td>
<p>
<b style="font-weight:bolder !important;">配送状态:</b>
<?php <?php
switch ($order_shipping_info['status']) { switch ($order_shipping_info['status']) {
case 1: echo '已配送'; break; case 1: echo '已配送'; break;
...@@ -154,15 +84,9 @@ ...@@ -154,15 +84,9 @@
default: echo '未配送'; break; default: echo '未配送'; break;
} }
?> ?>
</p>
</td> </td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td> <td>
<p>
<b style="font-weight:bolder !important;">支付方式:</b>
<?php <?php
if ($order_info['order_pay_type'] == 1) { if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') { if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') {
...@@ -180,11 +104,9 @@ ...@@ -180,11 +104,9 @@
} }
} }
?> ?>
</p>
</td> </td>
<td> <td>
<p>
<b style="font-weight:bolder !important;">支付类型:</b>
<?php <?php
if ($order_info['order_pay_type'] == 1) { if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') { if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') {
...@@ -202,11 +124,9 @@ ...@@ -202,11 +124,9 @@
} }
} }
?> ?>
</p>
</td> </td>
<td> <td>
<p>
<b style="font-weight:bolder !important;">支付状态:</b>
<?php <?php
if ($order_info['order_pay_type'] == 1) { if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') { if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') {
...@@ -224,22 +144,81 @@ ...@@ -224,22 +144,81 @@
} }
} }
?> ?>
</p>
</td> </td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr> </tr>
</table> </table>
<div class="order-info">
<input type="hidden" id="order_id" value="{{$order_info['order_id']}}">
<table class="table table-bordered">
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
收货信息
<!-- 订单状态小于5 且 更新地址权限存在 显示按钮 -->
@if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms))
@if (isset($_REQUEST['tags']))
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@else
<a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a>
@endif
@endif
</th>
</tr>
<tr>
<th>订单编号</th>
<th>会员账号</th>
<th>收货人</th>
<th>联系电话/手机</th>
<th>配送方式</th>
@if ($order_info['order_shipping_type'] == 2)
<th>自提地址</th>
@else
<th>收货地址</th>
@endif
<th>客户备注</th>
</tr>
<tr>
<td>
{{$order_info['order_sn']}}
</td>
<td>
@if ($user_mobile)
{{$user_mobile}}
@else
{{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}}
@endif
</td>
<td>{{$order_address_info['consignee']}}</td>
<td>{{$order_address_info['mobile']}}</td>
@if ($order_info['order_shipping_type'] == 2)
<td>客户自提</td>
<td>{{$order_address_info['address']}}</td>
@else
<td>快递送货</td>
<td>
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
</td>
@endif
<td>{{$order_info['order_remark']}}</td>
</tr>
</table>
</div>
<table class="table table-bordered order-express"> <table class="table table-bordered order-express">
<tr class="caption"> <tr class="caption">
<th colspan="3" style="text-align: center;"> <th colspan="3" style="text-align: center; background: #f9f9f9;">
发票信息 发票信息
<!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 --> <!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 -->
@if (in_array($order_info['status'], array(1, 2, 3, 4, 7, 8)) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms)) @if (in_array($order_info['status'], array(1, 2, 3, 4, 7, 8)) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
@if (isset($_REQUEST['tags'])) @if (isset($_REQUEST['tags']))
<a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@else @else
<a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif @endif
@endif @endif
</th> </th>
...@@ -258,9 +237,10 @@ ...@@ -258,9 +237,10 @@
<th>银行卡号</th> <th>银行卡号</th>
<th>开票状态</th> <th>开票状态</th>
</tr> </tr>
@if ($order_invoice_info['inv_type'] == 1) @if ($order_invoice_info['inv_type'] == 1)
<tr style="text-align: center;"> <tr style="text-align: center;">
<td colspan="20">不开发票</td> <td colspan="8">不开发票</td>
</tr> </tr>
@else @else
<tr> <tr>
...@@ -282,23 +262,52 @@ ...@@ -282,23 +262,52 @@
<td>{{$order_invoice_info['invoice_status_val']}}</td> <td>{{$order_invoice_info['invoice_status_val']}}</td>
</tr> </tr>
@endif @endif
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</div>
</div>
@if (!empty($order_info['order_source']) && preg_match('/adtag\=/', $order_info['order_source'])) @if (!empty($order_info['order_source']) && preg_match('/adtag\=/', $order_info['order_source']))
<div style="background: #fff;">
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<tr> <tr>
<td width="10%" style="color: #343434;">Adtag值：</td> <th width="10%">Adtag值：</th>
<td>{{$order_info['order_source']}}</td> <td>{{$order_info['order_source']}}</td>
</tr> </tr>
</table> </table>
</div>
@endif @endif
<?php
$shipping = App\Http\Controllers\getShipping($order_info['order_id']);
?>
@if (!empty($shipping))
<table class="table table-bordered table-hover">
<tr class="caption">
<th colspan="4" style="text-align: center; background: #f9f9f9;">
订单物流信息
</th>
</tr>
@foreach ($shipping as $s)
<tr>
<th width="10%">快递单号：</th>
<td>{{$s->shipping_no}}</td>
<th width="10%">配送方式：</th>
<td>
<?php
switch ($s->status) {
case 0:
case 1: echo '已配送'; break;
case 2: echo '已签收'; break;
default: echo '未配送'; break;
}
?>
</td>
</tr>
@endforeach
</table>
@endif
</div>
<div class="tabs-box goods-price"> <div class="tabs-box goods-price">
<table class="table"> <table class="table">
<thead> <thead>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment