diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 28fc751..6da2c6f 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/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"); } } diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index fb18f35..7a8a79f 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/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') diff --git a/resources/views/admin/home.blade.php b/resources/views/admin/home.blade.php index e31b831..c2bcce0 100644 --- a/resources/views/admin/home.blade.php +++ b/resources/views/admin/home.blade.php @@ -15,61 +15,61 @@ @endpush @section("content") -
-
-
-
-
-

- -
本月护理人天数/订单数
- {{ $order_items_count }} / {{ $orders_count }} -

-
-
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--

--}} +{{-- --}} +{{--
本月护理人天数/订单数
--}} +{{-- {{ $order_items_count }} / {{ $orders_count }}--}} +{{--

--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} -
-
-
-
-

- -
本月应扣款
- {{ $total }} -

-
-
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--

--}} +{{-- --}} +{{--
本月应扣款
--}} +{{-- {{ $total }}--}} +{{--

--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} -
-
-
-
-

- -
本月应发护工酬劳
- {{ $total_paramedic }} -

-
-
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--

--}} +{{-- --}} +{{--
本月应发护工酬劳
--}} +{{-- {{ $total_paramedic }}--}} +{{--

--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} -
-
-
-
-

- -
本月管理费
- {{ $fee }} -

-
-
-
-
-
+{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--

--}} +{{-- --}} +{{--
本月管理费
--}} +{{-- {{ $fee }}--}} +{{--

--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} @endsection