Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 9b53e312 by 朱继来
Options

Merge branch 'zjl_iteration_20181127'

parents 98e4faa4 50c0314e
Inline Side-by-side
Showing with 12 additions and 10 deletions
resources/views/erpOrder/content.blade.php
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
@if (empty($list)) @if (empty($list))
<tr> <tr>
<td colspan="10">没有查询到相关记录~</td> <td colspan="11" class="text-center">没有查询到相关记录~</td>
</tr> </tr>
@else @else
<tbody> <tbody>
......
resources/views/selfOrder/content.blade.php
...@@ -363,15 +363,17 @@ ...@@ -363,15 +363,17 @@
</table> </table>
</div> </div>
<div class="row-fluid pagination"> <div class="row-fluid pagination">
<span class="show-list-info"> @if ($username != 'vpadmin@ichunt.com')
共{{$count ? $count : 0}}单， <span class="show-list-info">
{{$paid_order_count}}单已付款（包含预付款）， 共{{$count ? $count : 0}}单，
下单用户数为{{$user_count}}人， {{$paid_order_count}}单已付款（包含预付款），
付款用户数为{{$paid_user_count}}人， 下单用户数为{{$user_count}}人，
应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 付款用户数为{{$paid_user_count}}人，
实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}， 应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}，
${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}} 实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，
</span> ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}
</span>
@endif
<?php echo $page; ?> <?php echo $page; ?>
</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