Commit 6facfed5 by 朱继来

订单详情添加赠品展示

parent 10350010
......@@ -1697,9 +1697,10 @@ Class OrderController extends Controller
'order_shipping_inside' => $temp['data']['order_shipping_inside'],
'actionLog' => $actionLog,
'erpPayLog' => $erpPayLog,
'order_refund_info' => $temp['data']['order_refund_info'],
'order_refund_items' => $temp['data']['order_refund_items'],
// 'order_refund_info' => $temp['data']['order_refund_info'],
// 'order_refund_items' => $temp['data']['order_refund_items'],
'order_extra' => $temp['data']['order_extra'],
'order_gift' => $temp['data']['order_gift'],
];
// 自营物流信息
......
......@@ -22,6 +22,9 @@
@endif -->
<th width="5%">订单编号</th>
@if ($order_info['order_goods_type'] == 1)
<th width="13%">ERP单号</th>
@endif
<th>订单状态</th>
<th>用户账号</th>
@if ($username != 'vpadmin@ichunt.com')
......@@ -42,6 +45,9 @@
<tr>
<td>{{ $order_info['order_sn'] }}</td>
@if ($order_info['order_goods_type'] == 1)
<td>{{ $order_temp_info['erp_sn'] }}</td>
@endif
<td>{{ Config('params.order_status')[$order_info['status']] }}</td>
<td>{{ isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'] }}</td>
@if ($username != 'vpadmin@ichunt.com')
......
......@@ -212,34 +212,25 @@
</tfoot>
</table>
<!-- 退款已处理 -->
<?php if ($order_refund_info['status'] == 10 && $order_price_info['refund_price'] != 0) { ?>
<!-- 赠品信息 -->
<?php if (!empty($order_gift)) { ?>
<hr>
<table class="table">
<thead>
<tr class="caption">
<th>退款型号</th>
<th>退款数量</th>
<th>价格</th>
<th>小计</th>
<th>赠品活动ID</th>
<th>赠品图片</th>
<th>赠品名称</th>
<th>数量</th>
</tr>
</thead>
<tbody>
<?php foreach ($order_refund_items as $k=>$v) { ?>
<tr>
<td><?= $v['goods_name'] ?></td>
<td><?= $v['refund_num'] ?></td>
<td><?= $currency . $v['single_pre_price'] ?></td>
<td><?= $currency . number_format($v['refund_num'] * $v['single_pre_price'], 4) ?></td>
</tr>
<?php foreach ($order_gift as $k=>$v) { ?>
<tr>{{ $v['activity_id'] }}</tr>
<tr><img src="{{ $v['gift_info']['pic'] }}" width="30" height="30"></tr>
<tr>{{ $v['gift_info']['item_name'] }}</tr>
<tr>{{ $v['gift_info']['num'] }}</tr>
<?php } ?>
<tr>
<td>手动差价</td>
<td></td>
<td></td>
<td><?= '-' . $order_refund_info['price_fall'] ?></td>
</tr>
</tbody>
</table>
<?php } ?>
......
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