From 37b1595709865609c66134c4e6ee10d87e9711a4 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Sun, 1 Mar 2026 20:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=AE=B6=E4=B9=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9A=E2=91=A0=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=97=B6?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84=E5=B1=80?=
 =?UTF-8?q?=E5=B9=B6=E6=98=BE=E7=A4=BAFAB=20=E2=91=A1FAB=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=81=A2=E5=A4=8D=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=20=E2=91=A2=E8=A7=A3=E5=86=B3=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2/=E9=94=99=E8=BF=87WebSocket=E8=80=8C=E7=9C=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=B8=8B=E6=B3=A8=E5=85=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/partials/baccarat-panel.blade.php    | 56 ++++++++++++++++---
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/resources/views/chat/partials/baccarat-panel.blade.php b/resources/views/chat/partials/baccarat-panel.blade.php
index f02f066..9825bf6 100644
--- a/resources/views/chat/partials/baccarat-panel.blade.php
+++ b/resources/views/chat/partials/baccarat-panel.blade.php
@@ -241,13 +241,20 @@
 {{-- ─── 骰子悬浮入口（游戏开启时常驻） ─── --}}
 <div id="baccarat-fab" x-data="{ visible: false }" x-show="visible" x-cloak
     style="position:fixed; bottom:90px; right:18px; z-index:9900;">
-    <button x-on:click="document.getElementById('baccarat-panel')._x_dataStack[0].show = true"
+    <button
+        x-on:click="() => {
+                const p = Alpine.$data(document.getElementById('baccarat-panel'));
+                p.show = true;
+                if (p.phase === 'betting' && p.countdown > 0 && !p.countdownTimer) {
+                    p.startCountdown();
+                }
+            }"
         style="width:52px; height:52px; border-radius:50%; border:none; cursor:pointer;
                background:linear-gradient(135deg,#7c3aed,#4f46e5);
                box-shadow:0 4px 20px rgba(124,58,237,.5);
                font-size:22px; display:flex; align-items:center; justify-content:center;
                animation:pulse-fab 2s infinite;"
-        title="百家乐">🎲</button>
+        title="百家乐下注中">🎲</button>
 </div>
 
 <style>
@@ -502,13 +509,48 @@
         if (panel) Alpine.$data(panel).showResult(e.detail);
     });
 
-    /** 页面加载时初始化历史记录 */
+    /** 页面加载时：检查是否有进行中的局，有则自动恢复面板 */
     document.addEventListener('DOMContentLoaded', async () => {
         try {
-            const res = await fetch('/baccarat/history');
-            const data = await res.json();
+            // 先加载历史趋势
+            const histRes = await fetch('/baccarat/history');
+            const histData = await histRes.json();
             const panel = document.getElementById('baccarat-panel');
-            if (panel) Alpine.$data(panel).history = (data.history || []).reverse();
-        } catch {}
+            if (panel) {
+                Alpine.$data(panel).history = (histData.history || []).reverse();
+            }
+
+            // 再检查是否有正在进行的局
+            const curRes = await fetch('/baccarat/current');
+            const curData = await curRes.json();
+
+            if (curData.round && panel) {
+                const round = curData.round;
+                const seconds = round.seconds_left || 0;
+                const panelData = Alpine.$data(panel);
+
+                if (seconds > 0) {
+                    // 有进行中的局且还在押注时间内 → 恢复押注面板
+                    panelData.phase = 'betting';
+                    panelData.roundId = round.id;
+                    panelData.totalSeconds = 60; // 服务端配置的窗口
+                    panelData.countdown = seconds;
+                    panelData.totalBetBig = round.total_bet_big;
+                    panelData.totalBetSmall = round.total_bet_small;
+                    panelData.totalBetTriple = round.total_bet_triple;
+
+                    if (round.my_bet) {
+                        panelData.myBet = true;
+                        panelData.myBetType = round.my_bet.bet_type;
+                        panelData.myBetAmount = round.my_bet.amount;
+                    }
+
+                    // 只显示悬浮按钮，不自动弹出全屏（避免打扰刚进入的用户）
+                    panelData.updateFab(true);
+                }
+            }
+        } catch (e) {
+            console.warn('[百家乐] 初始化失败', e);
+        }
     });
 </script>