From 1e5d11929e84683a3f2ee48ad59d4f271500a829 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Sun, 1 Mar 2026 18:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=93=E5=A9=9A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8F=8A=E5=85=AC=E5=B1=8F=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20undefined=20=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E9=BD=90=E5=90=8E=E7=AB=AF=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=20user.username/partner.username?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/partials/marriage-modals.blade.php   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/views/chat/partials/marriage-modals.blade.php b/resources/views/chat/partials/marriage-modals.blade.php
index 3630a94..48e4306 100644
--- a/resources/views/chat/partials/marriage-modals.blade.php
+++ b/resources/views/chat/partials/marriage-modals.blade.php
@@ -167,8 +167,12 @@
                         <button x-on:click="doPropose()"
                             :disabled="sending || !selectedRing || rings.length === 0 || !canAfford"
                             style="flex:1; padding:10px 0; border-radius:8px; font-size:13px; font-weight:bold; border:none; transition:all .2s;"
-                            :style="(sending || !selectedRing || rings.length === 0 || !canAfford) ? { background: '#f1f5f9',
-                                color: '#94a3b8', cursor: 'not-allowed', boxShadow: 'none' } : {
+                            :style="(sending || !selectedRing || rings.length === 0 || !canAfford) ? {
+                                background: '#f1f5f9',
+                                color: '#94a3b8',
+                                cursor: 'not-allowed',
+                                boxShadow: 'none'
+                            } : {
                                 background: 'linear-gradient(135deg,#be185d,#f43f5e,#ec4899)',
                                 color: '#fff',
                                 cursor: 'pointer',
@@ -661,11 +665,13 @@
 
             open(detail) {
                 this.marriageId = detail.marriage_id;
-                this.announcement = `${detail.groom_name} 与 ${detail.bride_name} 喜结连理！`;
+                const groomName = detail.user?.username ?? detail.groom_name ?? '??';
+                const brideName = detail.partner?.username ?? detail.bride_name ?? '??';
+                this.announcement = `${groomName} 与 ${brideName} 喜结连理！`;
                 this.subText = detail.message || '愿百年好合，白头偕老！';
                 // 仅当前用户是新婚双方之一时显示举办婚礼按钮
                 const me = window.chatContext.username;
-                this.isNewlywed = (detail.groom_name === me || detail.bride_name === me);
+                this.isNewlywed = (groomName === me || brideName === me);
                 this.show = true;
                 // 播放烟花特效
                 if (window.EffectManager) {
@@ -974,13 +980,11 @@
 
     /** 结婚/离婚全局公告：在聊天消息区追加一条系统消息 */
     window.addEventListener('chat:marriage-accepted', (e) => {
-        const {
-            groom_name,
-            bride_name,
-            message
-        } = e.detail;
+        const detail = e.detail;
+        const groomName = detail.user?.username ?? detail.groom_name ?? '??';
+        const brideName = detail.partner?.username ?? detail.bride_name ?? '??';
         if (typeof appendSystemMessage === 'function') {
-            appendSystemMessage(`💑 ${groom_name} 与 ${bride_name} 喜结连理！${message || ''}`);
+            appendSystemMessage(`💑 ${groomName} 与 ${brideName} 喜结连理！`);
         }
     });
     window.addEventListener('chat:marriage-divorced', (e) => {