diff --git a/resources/views/admin/game-history/lottery-issue.blade.php b/resources/views/admin/game-history/lottery-issue.blade.php index b79ab44..6471bbb 100644 --- a/resources/views/admin/game-history/lottery-issue.blade.php +++ b/resources/views/admin/game-history/lottery-issue.blade.php @@ -86,7 +86,7 @@ {{ $won ? '+' . number_format($ticket->payout) : '0' }} - @if ($issue->status === 'drawn') + @if ($issue->status === 'settled') @if ($won) diff --git a/resources/views/chat/partials/scripts.blade.php b/resources/views/chat/partials/scripts.blade.php index bebd795..bfc04e4 100644 --- a/resources/views/chat/partials/scripts.blade.php +++ b/resources/views/chat/partials/scripts.blade.php @@ -358,9 +358,19 @@ if (info.type === 'emotion') return `${fromHtml}${info.word}对${toHtml}${verb}:`; return `${fromHtml}${info.word}${toHtml},${verb}:`; }; - // 用户名(单击切换发言对象,双击查看资料;系统用户仅显示文本) + // 判断 【】 内的内容是否是游戏/活动标签而非真实用户名 + // 规则:命中已知游戏前缀,或内容含空格(如「双色球 第012期 开奖」) + const isGameLabel = (name) => { + const gamePrefixes = ['五子棋', '双色球', '钓鱼', '老虎机', '百家乐', '赛马']; + if (gamePrefixes.some(p => name.startsWith(p))) return true; + // 含空格 → 一定不是用户名(用户名不允许含空格) + if (name.includes(' ')) return true; + return false; + }; + + // 用户名(单击切换发言对象,双击查看资料;系统用户或游戏标签仅显示文本) const clickableUser = (uName, color) => { - if (systemUsers.includes(uName)) { + if (systemUsers.includes(uName) || isGameLabel(uName)) { return `${uName}`; } return `${uName}`; @@ -410,11 +420,16 @@ `
${parsedContent} (${timeStr})
`; timeStrOverride = true; } else if (msg.from_user === '系统传音') { - // 自动升级播报 / 赠礼通知:金色左边框,轻量提示样式,不喧宾夺主 + // 自动升级播报 / 赠礼通知 / 彩票购买广播:金色左边框,轻量提示样式,不喧宾夺主 + // 解析内容中 【用户名】 片段,使其支持单击(切换发言对象)和双击(查看名片) div.style.cssText = 'background: #fffbeb; border-left: 3px solid #d97706; border-radius: 4px; padding: 4px 10px; margin: 2px 0;'; + let sysTranContent = msg.content; + sysTranContent = sysTranContent.replace(/【([^】]+)】/g, function(match, uName) { + return '【' + clickableUser(uName, '#000099') + '】'; + }); html = - `🌟 ${msg.content}`; + `🌟 ${sysTranContent}`; } else if (msg.from_user === '系统' && msg.to_user && msg.to_user !== '大家') { // 系统私人通知(自动存点等):无头像,绿色左边框简洁条形样式 div.style.cssText =