Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/API/H5/FenzhenController.php

@@ -138,18 +138,18 @@ class FenzhenController extends Controller
             $push_end = true;
             $item_count = $item['count'];
             $in_time = date('H:i', $last_time);
-            $time_line = array_merge(array_splice($time_line, 0, count($time_line) - 1), [
+              $time_line = array_merge(array_splice($time_line, 0, count($time_line) - 1), [
-              [
+                [
-                "desc" => "预计 $in_time 进入队列",
+                  "desc" => "预计 $in_time 进入队列",
-                "more" => 0,
+                  "more" => 0,
-                "name" => $item['name'],
+                  "name" => $item['name'],
-                "status" => 1,
+                  "status" => 1,
-                'count' => -1,
+                  'count' => -1,
-                "time" => "$in_time",
+                  "time" => "$in_time",
-                "tip" => "剩余{$item_count}项正在排队中，"
+                  "tip" => "剩余{$item_count}项正在排队中，"
-              ]
+                ]
-            ], [$time_line[count($time_line) - 1]]);
+              ], [$time_line[count($time_line) - 1]]);
-            $last_time = $last_time + (60 * 5);
+              $last_time = $last_time + (60 * 5);
           }
         }
         if ($push_end) {