Commit 0d2cbbe8 by 朱继来

Merge branch 'zjl_client_to_erp_20181228' into development

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