Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Admin/HomeController.php

@@ -10,20 +10,20 @@ class HomeController extends CommonController
 
     public function index()
     {
-        $month = date("Y-m");
-        $order_items = OrderItems::whereHas("order")->whereRaw("DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}'")
-            ->where("total", ">", 0)->get();
-        $order_items_count = $order_items->count();
-        $total = $order_items->sum("total");
-        $orders_count = $order_items->groupBy("order_id")->count();
+//        $month = date("Y-m");
+//        $order_items = OrderItems::whereHas("order")->whereRaw("DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}'")
+//            ->where("total", ">", 0)->get();
+//        $order_items_count = $order_items->count();
+//        $total = $order_items->sum("total");
+//        $orders_count = $order_items->groupBy("order_id")->count();
+//
+//        foreach ($order_items as &$item) {
+//            $item = $item->calculateFee();
+//        }
+//        $total_paramedic = $order_items->sum("paramedic_total");
+//        $fee = $total - $total_paramedic;
+//        $laravel_duration = microtime(true) - LARAVEL_START;
 
-        foreach ($order_items as &$item) {
-            $item = $item->calculateFee();
-        }
-        $total_paramedic = $order_items->sum("paramedic_total");
-        $fee = $total - $total_paramedic;
-        $laravel_duration = microtime(true) - LARAVEL_START;
-
-        return view($this->bladePath . ".home", compact("orders_count", "order_items_count", "total", "total_paramedic", "fee", "laravel_duration"));
+        return view($this->bladePath . ".home");
     }
 }

app/Http/Controllers/Manager/OrdersController.php

@@ -50,7 +50,6 @@ class OrdersController extends CommonController
 
     public function getProjects()
     {
-        \Log::info("支付码不正确");
         $projects = (new Project())
             ->join("manager_project", 'project.id', '=', 'manager_project.project_id')
             ->join('managers', 'managers.id', '=', 'manager_project.manager_id')

resources/views/admin/home.blade.php

@@ -15,61 +15,61 @@
 @endpush
 
 @section("content")
-    <div class="row">
-        <div class="col-lg-3">
-            <div class="card text-white bg-info overflow-hidden">
-                <div class="card-body p-2">
-                    <div class="toll-free-box">
-                        <h4 class="text-right pr-2">
-                            <i class="mdi mdi-bed-empty"></i>
-                            <div class="font-12 font-weight-normal pb-1">本月护理人天数/订单数</div>
-                            {{ $order_items_count }} / {{ $orders_count }}
-                        </h4>
-                    </div>
-                </div> <!-- end card-body-->
-            </div>
-        </div> <!-- end col-->
+{{--    <div class="row">--}}
+{{--        <div class="col-lg-3">--}}
+{{--            <div class="card text-white bg-info overflow-hidden">--}}
+{{--                <div class="card-body p-2">--}}
+{{--                    <div class="toll-free-box">--}}
+{{--                        <h4 class="text-right pr-2">--}}
+{{--                            <i class="mdi mdi-bed-empty"></i>--}}
+{{--                            <div class="font-12 font-weight-normal pb-1">本月护理人天数/订单数</div>--}}
+{{--                            {{ $order_items_count }} / {{ $orders_count }}--}}
+{{--                        </h4>--}}
+{{--                    </div>--}}
+{{--                </div> <!-- end card-body-->--}}
+{{--            </div>--}}
+{{--        </div> <!-- end col-->--}}
 
-        <div class="col-lg-3">
-            <div class="card text-white bg-warning overflow-hidden">
-                <div class="card-body p-2">
-                    <div class="toll-free-box">
-                        <h4 class="text-right pr-2">
-                            <i class="mdi mdi-currency-cny"></i>
-                            <div class="font-12 font-weight-normal pb-1">本月应扣款</div>
-                            {{ $total }}
-                        </h4>
-                    </div>
-                </div> <!-- end card-body-->
-            </div>
-        </div> <!-- end col-->
+{{--        <div class="col-lg-3">--}}
+{{--            <div class="card text-white bg-warning overflow-hidden">--}}
+{{--                <div class="card-body p-2">--}}
+{{--                    <div class="toll-free-box">--}}
+{{--                        <h4 class="text-right pr-2">--}}
+{{--                            <i class="mdi mdi-currency-cny"></i>--}}
+{{--                            <div class="font-12 font-weight-normal pb-1">本月应扣款</div>--}}
+{{--                            {{ $total }}--}}
+{{--                        </h4>--}}
+{{--                    </div>--}}
+{{--                </div> <!-- end card-body-->--}}
+{{--            </div>--}}
+{{--        </div> <!-- end col-->--}}
 
-        <div class="col-lg-3">
-            <div class="card text-white bg-primary overflow-hidden">
-                <div class="card-body p-2">
-                    <div class="toll-free-box">
-                        <h4 class="text-right pr-2">
-                            <i class="mdi mdi-account-group"></i>
-                            <div class="font-12 font-weight-normal pb-1">本月应发护工酬劳</div>
-                            {{ $total_paramedic }}
-                        </h4>
-                    </div>
-                </div> <!-- end card-body-->
-            </div>
-        </div> <!-- end col-->
+{{--        <div class="col-lg-3">--}}
+{{--            <div class="card text-white bg-primary overflow-hidden">--}}
+{{--                <div class="card-body p-2">--}}
+{{--                    <div class="toll-free-box">--}}
+{{--                        <h4 class="text-right pr-2">--}}
+{{--                            <i class="mdi mdi-account-group"></i>--}}
+{{--                            <div class="font-12 font-weight-normal pb-1">本月应发护工酬劳</div>--}}
+{{--                            {{ $total_paramedic }}--}}
+{{--                        </h4>--}}
+{{--                    </div>--}}
+{{--                </div> <!-- end card-body-->--}}
+{{--            </div>--}}
+{{--        </div> <!-- end col-->--}}
 
-        <div class="col-lg-3">
-            <div class="card text-white bg-success overflow-hidden">
-                <div class="card-body p-2">
-                    <div class="toll-free-box">
-                        <h4 class="text-right pr-2">
-                            <i class="mdi mdi-pocket"></i>
-                            <div class="font-12 font-weight-normal pb-1">本月管理费</div>
-                            {{ $fee }}
-                        </h4>
-                    </div>
-                </div> <!-- end card-body-->
-            </div>
-        </div> <!-- end col-->
-    </div>
+{{--        <div class="col-lg-3">--}}
+{{--            <div class="card text-white bg-success overflow-hidden">--}}
+{{--                <div class="card-body p-2">--}}
+{{--                    <div class="toll-free-box">--}}
+{{--                        <h4 class="text-right pr-2">--}}
+{{--                            <i class="mdi mdi-pocket"></i>--}}
+{{--                            <div class="font-12 font-weight-normal pb-1">本月管理费</div>--}}
+{{--                            {{ $fee }}--}}
+{{--                        </h4>--}}
+{{--                    </div>--}}
+{{--                </div> <!-- end card-body-->--}}
+{{--            </div>--}}
+{{--        </div> <!-- end col-->--}}
+{{--    </div>--}}
 @endsection