Commit 9f10f3dc by 朱继来

Merge branch 'zjl_order_20200923'

parents 8de4f3be b9d3a0c4
Showing with 2 additions and 2 deletions
......@@ -106,12 +106,12 @@
<td><?= $v['single_pre_price_format'] ?></td>
<td><?= $v['goods_amount_format'] ?></td>
<?php } else { ?>
<td><?= $v['goods_amount_format'] ?></td>
<td><?= $username != 'vpadmin@ichunt.com' ? $v['goods_amount_format'] : '' ?></td>
<?php } ?>
<td><?= $v['extra_price'] ?></td>
<td><?= $v['goods_discount_amount'] ?></td>
<td><?= number_format($v['goods_amount'] + $v['extra_price'] - $v['goods_discount_amount'], 2, '.', '') ?></td>
<td><?= $username != 'vpadmin@ichunt.com' ? number_format($v['goods_amount'] + $v['extra_price'] - $v['goods_discount_amount'], 2, '.', '') : '' ?></td>
<td><?= $v['delivery_time'] ?></td>
<?php if ($order_info['order_goods_type'] == 1) { ?>
......
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