Просмотр исходного кода

Merge branch 'master' of git.huaml.com:zhh/huahuibao

shizhongqi 11 месяцев назад
Родитель
Сommit
6412d942e5
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      app-hd/controllers/ConsoleController.php

+ 7 - 7
app-hd/controllers/ConsoleController.php

@@ -38,12 +38,12 @@ class ConsoleController extends BaseController
         $totalVisit = $main->totalVisit ?? 0;
         $totalOrder = $main->finishOrder ?? 0;
         $overview = [
-            ['name' => "花材数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
-            ['name' => "花材值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
-            ['name' => "总赊账", "url" => '/admin/custom/showTotalBalance', 'value' => 0, 'type' => 1],
-            ['name' => "花束", "url" => '/admin/stat/stock', 'value' => 10, 'type' => 1],
-            ['name' => "总客户", "url" => '/admin/home/member', 'value' => $totalCustom, 'type' => 4],
-            ['name' => "订单", "url" => '/admin/home/order', 'value' => $totalOrder, 'type' => 4],
+            ['name' => "库存数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
+            ['name' => "库存值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
+            ['name' => "花束", "url" => '/admin/custom/showTotalBalance', 'value' => 0, 'type' => 1],
+            ['name' => "总客户", "url" => '/admin/stat/stock', 'value' => 10, 'type' => 1],
+            ['name' => "总订单", "url" => '/admin/home/member', 'value' => $totalCustom, 'type' => 4],
+            ['name' => "总赊账", "url" => '/admin/home/order', 'value' => $totalOrder, 'type' => 4],
         ];
         util::success(['overview' => $overview]);
     }
@@ -99,7 +99,7 @@ class ConsoleController extends BaseController
         util::success([
             'asset' => $this->main,
             'notice' => $notice,
-            'warning'=> $warning,
+            'warning' => $warning,
             'todayData' => ['visit' => $visitCustom, 'income' => $todaySale, 'order' => $orderNum, 'wastage' => $wastage, 'bouquet' => $hsNum],
             'incomeStat' => [],
             'menu' => $menu,