Merge branch 'zjl_new_client_20180701' into development

app/Http/Controllers/OrderController.php

@@ -328,12 +328,15 @@ Class OrderController extends Controller
         $page->setConfig('theme', '%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%');
         $show = $page->show();
 
-        $info['condition'] = $map; 
-        $info['sale_list'] = $sale_list; 
-        $info['list']      = $response['data']['data']; 
-        $info['pay_count'] = $response['data']['pay_count']; 
-        $info['count']     = $response['data']['count']; 
-        $info['page']      = $show; 
+        $info['condition']        = $map; 
+        $info['sale_list']        = $sale_list; 
+        $info['list']             = $response['data']['data']; 
+        $info['pay_count']        = $response['data']['pay_count']; 
+        $info['count']            = $response['data']['count']; 
+        $info['user_count']       = $response['data']['user_count']; 
+        $info['paid_user_count']  = $response['data']['paid_user_count']; 
+        $info['paid_order_count'] = $response['data']['paid_order_count']; 
+        $info['page']             = $show; 
 
         return $info;
     }

resources/views/orderlist/content.blade.php

@@ -379,8 +379,11 @@
         </div>
         <div class="row-fluid pagination">
             @if ($username != 'vpadmin@ichunt.com')
-                <span>
+                <span style="float: left; width: 55%;">
                     共{{$count ? $count : 0}}单，
+                    {{$paid_order_count}}单已付款（包含预付款），
+                    下单用户数为{{$user_count}}人，
+                    付款用户数为{{$paid_user_count}}人，
                     应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}，   ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 
                     实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
                     ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}