From 50a558bbcb9413080e1327d1b713c8b80f8e3fd1 Mon Sep 17 00:00:00 2001 From: li Date: Mon, 19 Jan 2026 23:27:49 +0800 Subject: [PATCH] add --- src/App.vue | 14 +++++++------- src/assets/js/waybill.js | 31 +++++++++++++++++++------------ src/views/play.vue | 25 ++++++++++++------------- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/App.vue b/src/App.vue index b8dbeb87..10bfbfc5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -656,7 +656,7 @@ export default { } .pop-bg { position: absolute; - z-index: 35; + z-index: 3999; transform: rotateX(0deg); left: 0; top: 0; @@ -670,7 +670,7 @@ export default { .setting-pop { position: absolute; transform: rotateX(0deg); - z-index: 1000; + z-index: 4000; right: 0; top: 0; bottom: 0; @@ -795,7 +795,7 @@ export default { .chips-pop { position: absolute; transform: rotateX(0deg); - z-index: 36; + z-index: 4001; left: 0; top: 0; bottom: 0; @@ -870,7 +870,7 @@ export default { .aplayer-pop { position: absolute; transform: rotateX(0deg); - z-index: 36; + z-index: 4001; left: 0; top: 0; bottom: 0; @@ -898,7 +898,7 @@ export default { .record-pop { position: absolute; transform: rotateX(0deg); - z-index: 36; + z-index: 4001; left: 0; top: 0; bottom: 0; @@ -928,7 +928,7 @@ export default { .system-pop { position: absolute; transform: rotateX(0deg); - z-index: 36; + z-index: 4001; left: 0; top: 0; bottom: 0; @@ -1043,7 +1043,7 @@ export default { .share-pop { position: absolute; transform: rotateX(0deg); - z-index: 36; + z-index: 4001; left: 0; top: 0; bottom: 0; diff --git a/src/assets/js/waybill.js b/src/assets/js/waybill.js index 68e76fc0..79c6fdc7 100644 --- a/src/assets/js/waybill.js +++ b/src/assets/js/waybill.js @@ -26,7 +26,7 @@ function autoask(newData) { const bigEyeRoad = newData.ludan_banker.waybill.bigEyeRoad const pathway = newData.ludan_banker.waybill.pathway const roach = newData.ludan_banker.waybill.roach - if (bigEyeRoad[0]) { + if (bigEyeRoad && bigEyeRoad.length > 0) { if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { askObg.BbigEyeRoadcolor = "red" } else { @@ -36,7 +36,7 @@ function autoask(newData) { } else { askObg.BbigEyeRoadisshow = false } - if (pathway[0]) { + if (pathway && pathway.length > 0) { if (pathway[pathway.length - 1].result == 1) { askObg.Bpathwaycolor = "red" } else { @@ -46,7 +46,7 @@ function autoask(newData) { } else { askObg.Bpathwayisshow = false } - if (roach[0]) { + if (roach && roach.length > 0) { if (roach[roach.length - 1].result == 1) { askObg.Broachcolor = "red" } else { @@ -62,7 +62,7 @@ function autoask(newData) { const bigEyeRoad = newData.ludan_player.waybill.bigEyeRoad const pathway = newData.ludan_player.waybill.pathway const roach = newData.ludan_player.waybill.roach - if (bigEyeRoad[0]) { + if (bigEyeRoad && bigEyeRoad.length > 0) { if (bigEyeRoad[bigEyeRoad.length - 1].result == 1) { askObg.PbigEyeRoadcolor = "red" } else { @@ -72,7 +72,7 @@ function autoask(newData) { } else { askObg.PbigEyeRoadisshow = false } - if (pathway[0]) { + if (pathway && pathway.length > 0) { if (pathway[pathway.length - 1].result == 1) { askObg.Ppathwaycolor = "red" } else { @@ -82,7 +82,7 @@ function autoask(newData) { } else { askObg.Ppathwayisshow = false } - if (roach[0]) { + if (roach && roach.length > 0) { if (roach[roach.length - 1].result == 1) { askObg.Proachcolor = "red" } else { @@ -656,8 +656,12 @@ function cutRoad( Tab = cols - 1 } } else { - // Keep space for integrated Ask Panel at bottom right - Tab = cols - 7 + // 下三路（大眼路/小路/曱甴路）- 使用横屏版本的逻辑 + if (ask && askroad) { + Tab = cols - 1 // 问路时：给新增点留空间 + } else { + Tab = cols - 2 // 正常时 + } } // 初始位置 if (billnumber == 1) { @@ -1242,10 +1246,13 @@ function CockrochPath(ctb, unit, start_x, x, y, type) { ctb.beginPath() ctb.lineCap = "round" ctb.lineWidth = radius * 0.3 //线条宽度 - if (type == 2) { - var color = "#1c1f89" - } else if (type == 1) { - var color = "#cf0012" + var color + if (type == 1) { + color = "#cf0012" + } else if (type == 2) { + color = "#1c1f89" + } else { + color = "#1c1f89" // 默认蓝色 } ctb.strokeStyle = color ctb.moveTo( diff --git a/src/views/play.vue b/src/views/play.vue index a221241f..592280bb 100644 --- a/src/views/play.vue +++ b/src/views/play.vue @@ -1415,18 +1415,17 @@ $gold: #c5a059; /* Status Overlay Styles */ .status-overlay { position: absolute; - top: 60px; /* Moved down to avoid row overlap, or move Left? Let's move LEFT of Camera */ - left: 50%; - transform: translateX(-50%); /* Removed translateZ to avoid potential clipping/context issues */ - z-index: 2005; /* Matches highest priority buttons */ + top: 10px; + right: 50px; /* Left of switch button (10px + 30px + 10px gap) */ + z-index: 3000; display: flex; - pointer-events: none; /* Allow clicks to pass through if needed, though buttons inside might need events. Actually, user might want to see it. It's display only. */ + pointer-events: none; align-items: center; justify-content: center; .status-circle { - width: 50px; - height: 50px; + width: 40px; /* Slightly smaller for corner */ + height: 40px; border-radius: 50%; background: rgba(0,0,0,0.6); display: flex; @@ -1434,22 +1433,22 @@ $gold: #c5a059; justify-content: center; color: #fff; font-weight: bold; - font-size: 16px; + font-size: 14px; border: 2px solid rgba(255, 255, 255, 0.2); backdrop-filter: blur(4px); - + &.dealing { background: rgba(46, 204, 113, 0.8); /* Green */ border-color: #2ecc71; - font-size: 14px; + font-size: 12px; } - + &.countdown { background: rgba(231, 76, 60, 0.8); /* Red/Orange for countdown */ border-color: #e74c3c; - font-size: 24px; + font-size: 20px; } - + &.wait { background: rgba(52, 152, 219, 0.8); border-color: #3498db;