Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 0d2cbbe8 by 朱继来
Options

Merge branch 'zjl_client_to_erp_20181228' into development

parents c7206d59 f97b8d1d
Inline Side-by-side
Showing with 6 additions and 7 deletions
resources/views/amount/content.blade.php
...@@ -48,10 +48,7 @@ ...@@ -48,10 +48,7 @@
<td>{{$vo['order_sn']}}</td> <td>{{$vo['order_sn']}}</td>
<td> <td>
<?php <?php
// 全款 if ($vo['order_pay_type'] == 2) { // 预付款
if ($vo['order_pay_type'] == 1) {
echo date('Y-m-d H:i:s', $vo['pay_time']);
} else if ($vo['order_pay_type'] == 2) { // 预付款
$exp = explode(',', $vo['pay_time']); $exp = explode(',', $vo['pay_time']);
$pay_amount = explode(',', $vo['pay_amount']); $pay_amount = explode(',', $vo['pay_amount']);
...@@ -74,6 +71,8 @@ ...@@ -74,6 +71,8 @@
echo date('Y-m-d H:i:s', $exp[0]).' (尾款)<br>'.date('Y-m-d H:i:s', $exp[1]).' (首款)'; echo date('Y-m-d H:i:s', $exp[0]).' (尾款)<br>'.date('Y-m-d H:i:s', $exp[1]).' (首款)';
} }
} }
} else {
echo date('Y-m-d H:i:s', $vo['pay_time']);
} }
?> ?>
</td> </td>
...@@ -90,9 +89,7 @@ ...@@ -90,9 +89,7 @@
$currency = '$'; $currency = '$';
} }
if ($vo['order_pay_type'] == 1) { // 全款 if ($vo['order_pay_type'] == 2) { // 预付款
echo $currency.$vo['pay_amount'];
} else if ($vo['order_pay_type'] == 2) { // 预付款
$exp = explode(',', $vo['pay_amount']); $exp = explode(',', $vo['pay_amount']);
if (count($exp) == 1) { if (count($exp) == 1) {
...@@ -108,6 +105,8 @@ ...@@ -108,6 +105,8 @@
echo $currency.$exp[1].' (尾款)<br>'.$currency.$exp[0].' (首款)'; echo $currency.$exp[1].' (尾款)<br>'.$currency.$exp[0].' (首款)';
} }
} }
} else {
echo $currency.$vo['pay_amount'];
} }
?> ?>
</td> </td>
......
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