Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 709bc2c1 by 朱继来
Options

Merge branch 'zjl_order_gift_20210107'

parents 784c7247 0e942c37
Expand all
Inline Side-by-side
Showing with 65 additions and 33 deletions
app/Http/Controllers/OrderController.php
...@@ -1716,9 +1716,10 @@ Class OrderController extends Controller ...@@ -1716,9 +1716,10 @@ Class OrderController extends Controller
'order_shipping_inside' => $temp['data']['order_shipping_inside'], 'order_shipping_inside' => $temp['data']['order_shipping_inside'],
'actionLog' => $actionLog, 'actionLog' => $actionLog,
'erpPayLog' => $erpPayLog, 'erpPayLog' => $erpPayLog,
'order_refund_info' => $temp['data']['order_refund_info'], // 'order_refund_info' => $temp['data']['order_refund_info'],
'order_refund_items' => $temp['data']['order_refund_items'], // 'order_refund_items' => $temp['data']['order_refund_items'],
'order_extra' => $temp['data']['order_extra'], 'order_extra' => $temp['data']['order_extra'],
'order_gift' => $temp['data']['order_gift'],
]; ];
// 自营物流信息 // 自营物流信息
......
public/css/detail.css
...@@ -119,7 +119,7 @@ li { ...@@ -119,7 +119,7 @@ li {
} }
/* 后台新增订单 start */ /* 后台新增订单 start */
.user-info, .address-content, .invoice-content, .order-info, .client-info { .user-info, .address-content, .invoice-content, .order-info, .client-info, .order-gift-info {
display: none; display: none;
} }
......
resources/views/addOrder/content.blade.php
...@@ -461,6 +461,27 @@ ...@@ -461,6 +461,27 @@
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea> <textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div> </div>
</div> </div>
<div class="order-gift-info">
<div class="ibox-title">
<h3>赠品信息</h3>
</div>
<div class="ibox-content">
<table class="table table-bordered table-hover gift-table">
<thead>
<tr>
<th width="10%">活动ID</th>
<th width="20%">赠品图片</th>
<th width="20%">赠品名称</th>
<th width="20%">赠品数量</th>
<th width="30%">赠品说明</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
<div class="order-info"> <div class="order-info">
<div class="ibox-title"> <div class="ibox-title">
......
resources/views/detail/detail_base_info.blade.php
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
@endif --> @endif -->
<th width="5%">订单编号</th> <th width="5%">订单编号</th>
@if ($order_info['order_goods_type'] == 1)
<th width="13%">ERP单号</th>
@endif
<th>订单状态</th> <th>订单状态</th>
<th>用户账号</th> <th>用户账号</th>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
...@@ -42,6 +45,9 @@ ...@@ -42,6 +45,9 @@
<tr> <tr>
<td>{{ $order_info['order_sn'] }}</td> <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>{{ 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') @if ($username != 'vpadmin@ichunt.com')
......
resources/views/detail/detail_items_info.php
...@@ -211,39 +211,43 @@ ...@@ -211,39 +211,43 @@
<?php } ?> <?php } ?>
</tfoot> </tfoot>
</table> </table>
</div>
<!-- 退款已处理 --> <!-- 赠品信息 -->
<?php if ($order_refund_info['status'] == 10 && $order_price_info['refund_price'] != 0) { ?> <?php if (!empty($order_gift)) { ?>
<hr> <hr>
<table class="table"> <table class="table table-bordered">
<thead> <thead>
<tr class="caption"> <tr class="caption">
<th>退款型号</th> <th>赠品活动ID</th>
<th>退款数量</th> <th>赠品图片</th>
<th>价格</th> <th>赠品名称</th>
<th>小计</th> <th>数量</th>
</tr> </tr>
</thead> </thead>
<tbody>
<tbody> <?php foreach ($order_gift as $k=>$v) { ?>
<?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 } ?>
<tr> <tr>
<td>手动差价</td> <td><?= $v['gift_info']['activity_id'] ?></td>
<td></td> <td>
<td></td> <div class="layer-photos-demo">
<td><?= '-' . $order_refund_info['price_fall'] ?></td> <a><img src="<?= $v['gift_info']['pic'] ?>" width="20" height="20"></a>
</div>
</td>
<td><?= $v['gift_info']['item_name'] ?></td>
<td><?= $v['gift_info']['num'] ?></td>
</tr> </tr>
</tbody> <?php } ?>
</table> </tbody>
<?php } ?>
</div> <script>
layer.photos({
photos: '.layer-photos-demo'
,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
</script>
</table>
<?php } ?>
<div class="order-total" style="margin-top: 30px;"> <div class="order-total" style="margin-top: 30px;">
<div> <div>
......
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