From 307338fa7dfd74b9eecac4b1b3005a6698afd11c Mon Sep 17 00:00:00 2001 From: testadmin Date: Tue, 5 May 2026 23:01:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A1=E6=97=B6/=E5=BC=80=E7=89=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=A7=BB=E5=88=B0=E5=8F=B3=E4=BE=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=EF=BC=88=E9=99=90=E7=BA=A2=E5=8C=BA=E6=97=81=E8=BE=B9?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - tab_b.html: limit-box 和 result-area 并排布局 - CSS: 隐藏原始大 overlay，结果在右侧面板显示 - JS: countDown/showPng 同步更新到 #resultAreaTimer/#resultAreaImg --- app/handle/view/index/tab_b.html | 49 +++++++++++++++------------- public/static/handle/css/common.css | 50 +++++++++++++++++++++-------- public/static/handle/js/handle_b.js | 9 +++++- 3 files changed, 72 insertions(+), 36 deletions(-) diff --git a/app/handle/view/index/tab_b.html b/app/handle/view/index/tab_b.html index 823fdf5..8ca3d90 100644 --- a/app/handle/view/index/tab_b.html +++ b/app/handle/view/index/tab_b.html @@ -117,31 +117,36 @@ -
-
-
- {:lang('banker')}\{:lang('player')} +
+
+
+
+ {:lang('banker')}\{:lang('player')} +
+
+   +
-
-   +
+
+ {:lang('tie')} +
+
+   +
+
+
+
+ {:lang('pair')} +
+
+   +
-
-
- {:lang('tie')} -
-
-   -
-
-
-
- {:lang('pair')} -
-
-   -
- +
+
+
diff --git a/public/static/handle/css/common.css b/public/static/handle/css/common.css index c4ea88d..eec29b7 100644 --- a/public/static/handle/css/common.css +++ b/public/static/handle/css/common.css @@ -453,10 +453,43 @@ margin-left: 0; +.bottom-row{ + display: flex; + width: 100%; + gap: 4px; +} .table-data .limit-box{ - width: 95%; + flex: 1; padding: 0 2.5%; } +.result-area{ + width: 35%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-height: 10vh; +} +.result-area-timer{ + font-size: 2.5vw; + font-weight: bold; + color: #fff; + text-align: center; + background: rgba(0,0,0,0.5); + border-radius: 50%; + width: 5vw; + height: 5vw; + line-height: 5vw; + margin-bottom: 4px; + display: none; +} +.result-area-img{ + text-align: center; +} +.result-area-img img{ + max-width: 100%; + max-height: 12vh; +} .table-data .lan-box{ @@ -676,7 +709,7 @@ margin-left: 0; .countdown{ z-index: 999; position:fixed; - display: none; + display: none !important; bottom: 22vh; right: 1vw; left: auto; @@ -784,18 +817,9 @@ margin-left: 0; } -/*结果弹窗*/ +/*结果弹窗 - 隐藏原始大 overlay，结果在右侧面板 .result-area 显示*/ .result-box{ - position: fixed; - z-index: 1000; - bottom: 2vh; - right: 1vw; - left: auto; - width: 12vw; -} -.result-box img{ - max-width: 100%; - height: auto; + display: none !important; } .result-box.blink{ diff --git a/public/static/handle/js/handle_b.js b/public/static/handle/js/handle_b.js index 5865bbc..528d292 100644 --- a/public/static/handle/js/handle_b.js +++ b/public/static/handle/js/handle_b.js @@ -715,7 +715,11 @@ function showPng(opening, pair,isVoice){ if(isVoice){ audioMp3(mp3List).Play(); } - + var imgSrc = $('#openingPng').attr('src'); + if(imgSrc){ + $("#resultAreaTimer").hide(); + $("#resultAreaImg").html(''); + } } function showPngDt (opening,isVoice){ @@ -800,6 +804,8 @@ function countDown(time) { $(".countdown .num").html(time) $(".countdown").css({"opacity":1,"display":"block"}); $(".countdown .grab-count").addClass("count-active"); + $("#resultAreaTimer").html(time).show(); + $("#resultAreaImg").empty(); if(time == 10){ mp3List = ['time_tip_10.mp3']; audioMp3(mp3List).Play(); @@ -813,6 +819,7 @@ function countDown(time) { audioMp3(mp3List).Play(); $(".countdown").css({"opacity":0,"display":"none"}); $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); return; } }