Commit 9978c4f5 by 朱继来

竞调账号调整详情页展示

parent 8e660aac
...@@ -267,11 +267,11 @@ ...@@ -267,11 +267,11 @@
@include('detail.detail_shipping_info') @include('detail.detail_shipping_info')
@endif @endif
@if (!empty($actionLog)) @if (!empty($actionLog) && $username != 'vpadmin@ichunt.com')
@include('detail.detail_action_log') @include('detail.detail_action_log')
@endif @endif
@if (!empty($erpPayLog)) @if (!empty($erpPayLog) && $username != 'vpadmin@ichunt.com')
@include('detail.detail_erp_paid_log') @include('detail.detail_erp_paid_log')
@endif @endif
@endif @endif
......
...@@ -24,15 +24,19 @@ ...@@ -24,15 +24,19 @@
<th width="5%">订单编号</th> <th width="5%">订单编号</th>
<th>订单状态</th> <th>订单状态</th>
<th>用户账号</th> <th>用户账号</th>
@if ($username != 'vpadmin@ichunt.com')
<th>支付方式</th> <th>支付方式</th>
@endif
<th>支付状态</th> <th>支付状态</th>
<th>支付类型</th> <th>支付类型</th>
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<th>发货方式</th> <th>发货方式</th>
@endif @endif
@if ($username != 'vpadmin@ichunt.com')
<th>发货状态</th> <th>发货状态</th>
<th>物流单号</th> <th>物流单号</th>
<th>京东订单编号</th> <th>京东订单编号</th>
@endif
<th>自动确认收货时间</th> <th>自动确认收货时间</th>
</tr> </tr>
...@@ -40,6 +44,7 @@ ...@@ -40,6 +44,7 @@
<td>{{ $order_info['order_sn'] }}</td> <td>{{ $order_info['order_sn'] }}</td>
<td>{{ Config('params.order_status')[$order_info['status']] }}</td> <td>{{ Config('params.order_status')[$order_info['status']] }}</td>
<td>{{ isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'] }}</td> <td>{{ isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'] }}</td>
@if ($username != 'vpadmin@ichunt.com')
<td> <td>
<?php <?php
if ($order_info['order_pay_type'] == 2) { // 预付款 if ($order_info['order_pay_type'] == 2) { // 预付款
...@@ -59,6 +64,7 @@ ...@@ -59,6 +64,7 @@
} }
?> ?>
</td> </td>
@endif
<td> <td>
<?php <?php
if ($order_info['order_pay_type'] == 2) { if ($order_info['order_pay_type'] == 2) {
...@@ -106,6 +112,7 @@ ...@@ -106,6 +112,7 @@
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<td>{{ $order_temp_info['zy_delivery_type'] == 1 ? '现货发货' : '拼单发货' }}</td> <td>{{ $order_temp_info['zy_delivery_type'] == 1 ? '现货发货' : '拼单发货' }}</td>
@endif @endif
@if ($username != 'vpadmin@ichunt.com')
<td> <td>
<?php <?php
if ($order_shipping_info) { if ($order_shipping_info) {
...@@ -122,6 +129,7 @@ ...@@ -122,6 +129,7 @@
</td> </td>
<td>{{ $order_shipping_info ? $order_shipping_info['shipping_no'] : '无' }}</td> <td>{{ $order_shipping_info ? $order_shipping_info['shipping_no'] : '无' }}</td>
<td>{{ $order_temp_info['jd_order_id'] }}</td> <td>{{ $order_temp_info['jd_order_id'] }}</td>
@endif
<td>7天</td> <td>7天</td>
...@@ -129,9 +137,9 @@ ...@@ -129,9 +137,9 @@
@if ($order_info['order_type_extend']) @if ($order_info['order_type_extend'])
<td> <td>
<?php <?php
switch ($order_info['order_type_extend']) { // switch ($order_info['order_type_extend']) {
case 1: echo '团购订单'; break; // case 1: echo '团购订单'; break;
} // }
?> ?>
</td> </td>
@endif @endif
......
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