From 57ea9f829c5090de207e5572b553fa7f0da04211 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Tue, 22 Sep 2020 18:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/v3/OrderReportController.php  |  2 +-
 app/Admin/Extensions/OrderReportPage.php      | 46 +++++++------------
 app/Admin/routes.php                          |  2 +-
 resources/views/order_report.php              | 19 ++++++--
 4 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/app/Admin/Controllers/v3/OrderReportController.php b/app/Admin/Controllers/v3/OrderReportController.php
index 73ab17e..4f51091 100644
--- a/app/Admin/Controllers/v3/OrderReportController.php
+++ b/app/Admin/Controllers/v3/OrderReportController.php
@@ -33,7 +33,7 @@ class OrderReportController extends AdminController
             $grid->column('new_user_total_money','平台新用户补贴总额');
             $grid->column('store_user_total_money','店铺用户每日首单补贴');
             $grid->column('new_add_user','新增用户数');
-            $grid->column('user_total','现存总用户');
+            $grid->column('user_total','现存用户总数');
         });
     }
 
diff --git a/app/Admin/Extensions/OrderReportPage.php b/app/Admin/Extensions/OrderReportPage.php
index f9f35cf..a4dbc73 100644
--- a/app/Admin/Extensions/OrderReportPage.php
+++ b/app/Admin/Extensions/OrderReportPage.php
@@ -63,51 +63,37 @@ class OrderReportPage extends LazyRenderable
         // 订单总额
         $orderReport = $orderMain->get()->toArray();
         // 总补贴金额
-        $storeNewUser = $storeNewUser->get();
+        $storeNewUsers = $storeNewUser->get()->toArray();
         // 总用户
-        $userTotal = $newUser->get();
+        $userTotal = $newUser->get()->toArray();
 
         $query = [
-            'order_total_num' => $orderReport['total_num'],
-            'order_total_money' => $orderReport['total_money'],
+            'order_total_num' => !empty($orderReport[0]['total_num'])?$orderReport[0]['total_num']:0,
+            'order_total_money' => !empty($orderReport[0]['total_money'])?$orderReport[0]['total_money']:0,
 
-            'new_user_total_money' => $storeNewUser['new_user_total'],
-            'store_user_total_money' => $storeNewUser['store_total'],
-            'new_add_user' => $userTotal['new_add_total'],
+            'new_user_total_money' => !empty($storeNewUsers[0]['new_user_total'])?$storeNewUsers[0]['new_user_total']:0,
+            'store_user_total_money' => !empty($storeNewUsers[0]['store_total'])?$storeNewUsers[0]['store_total']:0,
+            'new_add_user' => !empty($storeNewUsers[0]['new_add_total'])?$storeNewUsers[0]['new_add_total']:0,
 
-            'user_total' => $newUser['total'],
+            'user_total' => !empty($userTotal[0]['total'])?$userTotal[0]['total']:0,
         ];
         
         if ($query) {
             // $marketList = MarketModel::getMarket();
-            $result = [];
-            $orderReport = json_encode($orderReport);
-            $showRefund = json_encode($result);
-           
+            
             Admin::script(
                 <<<JS
-            var order_report =  JSON.stringify($orderReport)
-            var show_refund =  JSON.stringify($showRefund)
+           
             var app = new Vue({
                 el:"#order_report",
                 data:{
                    
-                    show_refund: JSON.parse(show_refund),
-
-                    order_total_num:$orderReport.total_num,
-                    order_total_money:$orderReport.total_money,
-                    dialogFormVisible: false,
-                    // order_total_money:123,
-
-                    refund_2:"退款",
-                    refund_3:"已同意退款",
-                    refund_goods_name:"",
-                 
-                    order_goods_id:null,
-                    order_child_id:null,
-                    show_refund_2:true,
-                    show_refund_3:false,
-                   
+                    order_total_num:"{$query['order_total_num']}",
+                    order_total_money:"{$query['order_total_money']}",
+                    new_user_total_money:"{$query['new_user_total_money']}",
+                    store_user_total_money:"{$query['store_user_total_money']}",
+                    new_add_user:"{$query['new_add_user']}",
+                    user_total:"{$query['user_total']}",
                 },
                 methods: {
                    
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 36eca6d..cba728f 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -84,6 +84,6 @@ Route::group([
 
     // 订单统计
     $router->any('/order_report', 'v3\OrderReportController@index');
-    // $router->any('/order_statistics', 'v3\OrderReportController');
+    $router->resource('/order_statistics', 'v3\OrderReportController');
 });
 
diff --git a/resources/views/order_report.php b/resources/views/order_report.php
index 1416ceb..8126a98 100644
--- a/resources/views/order_report.php
+++ b/resources/views/order_report.php
@@ -16,18 +16,27 @@
     </div>
     <!-- 搜索 end -->
     <!-- 订单数据 -->
-    <div>
+    <div style="margin-top: 20px;">
+        <div>
+            <p>订单总额（元）: {{order_total_money}}</p>
+        </div>
+        <div>
+            <p>平台新用户补贴总额（元）: {{new_user_total_money}}</p>
+        </div>
         <div>
-            <p>订单总额（元）</p>
-            <p>{{order_total_money}}</p>
+            <p>店铺用户每日首单补贴（元）: {{store_user_total_money}}</p>
         </div>
     </div>
     <!-- 订单数据 end -->
     <!-- 用户数据 -->
     <div>
     <div>
-        <p>现存用户（位）</p>
-        <p>1000</p>
+        <div>
+            <p>现存用户总数（位）: {{user_total}}</p>
+        </div>
+        <div>
+            <p>新增用户数（位）: {{new_add_user}}</p>
+        </div>
     </div>
     <!-- 用户数据 end -->