From 050aec1db4d64f36d4082b1d3787e74c05ff5c80 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Sun, 1 Mar 2026 17:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=A9=9A=E7=A4=BC?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8F=90=E7=A4=BA=E5=86=85=E5=B5=8C=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在求婚弹窗底部（戒指列表与按钮之间）内嵌费用提示面板：
  ✅ 金币充足：绿色背景，显示最低费用和当前余额
  ⚠️ 金币不足：红色背景提示，说明可先求婚再准备金币

移除 doPropose() 里的 chatDialog.confirm 二次确认，
点击'确认求婚'按钮直接发送，流程更顺畅。
---
 .../chat/partials/marriage-modals.blade.php   | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/resources/views/chat/partials/marriage-modals.blade.php b/resources/views/chat/partials/marriage-modals.blade.php
index ac73ef7..6f1ccef 100644
--- a/resources/views/chat/partials/marriage-modals.blade.php
+++ b/resources/views/chat/partials/marriage-modals.blade.php
@@ -123,6 +123,37 @@
                         </template>
                     </div>
 
+                    {{-- ── 婚礼费用提示面板 ── --}}
+                    @php
+                        $minWedding = (int) \App\Models\WeddingTier::where('is_active', true)
+                            ->orderBy('amount')
+                            ->value('amount');
+                    @endphp
+                    @if ($minWedding > 0)
+                        <div style="margin-bottom:14px;">
+                            @php $canAfford = ($user->jjb >= $minWedding); @endphp
+                            <div
+                                style="border-radius:12px; padding:12px 14px; font-size:12px; line-height:1.7;
+                                    background:{{ $canAfford ? '#f0fdf4' : '#fef2f2' }};
+                                    border:1.5px solid {{ $canAfford ? '#bbf7d0' : '#fecaca' }};">
+                                <div
+                                    style="font-weight:700; color:{{ $canAfford ? '#15803d' : '#dc2626' }}; margin-bottom:4px;">
+                                    {{ $canAfford ? '✅ 您的金币可以举办婚礼' : '⚠️ 金币可能不足以举办婚礼' }}
+                                </div>
+                                <div style="color:#6b7280;">
+                                    结婚最低花费：<strong style="color:#f43f5e;">🪙 {{ number_format($minWedding) }}</strong>
+                                    金币
+                                </div>
+                                <div style="color:#{{ $canAfford ? '15803d' : 'dc2626' }};">
+                                    当前余额：<strong>🪙 {{ number_format($user->jjb) }}</strong> 金币
+                                </div>
+                                @if (!$canAfford)
+                                    <div style="color:#9ca3af; font-size:11px; margin-top:4px;">可先求婚，婚礼设置时再准备金币</div>
+                                @endif
+                            </div>
+                        </div>
+                    @endif
+
                     {{-- 确认按钮 --}}
                     <button x-on:click="doPropose()" :disabled="sending || !selectedRing || rings.length === 0"
                         style="width:100%; padding:14px; border:none; border-radius:14px; font-size:15px;
@@ -474,36 +505,7 @@
             async doPropose() {
                 if (this.sending || !this.selectedRing) return;
 
-                // ── 发送前：显示婚礼费用提示 + 金币检查 ──────────────────
-                const minCost = window.chatContext?.minWeddingCost ?? 0;
-                const userJjb = window.chatContext?.userJjb ?? 0;
-                const costStr = Number(minCost).toLocaleString();
-                const jjbStr = Number(userJjb).toLocaleString();
-
-                if (minCost > 0 && userJjb < minCost) {
-                    // 金币不足：直接拦截，引导赚金币
-                    await window.chatDialog?.alert(
-                        `💰 您的金币不足以举办婚礼！\n\n婚礼最低费用：🪙 ${costStr} 金币\n您当前余额：🪙 ${jjbStr} 金币\n\n请先通过钓鱼、聊天、签到等方式积累金币后再求婚哦～`,
-                        '金币不足',
-                        '#dc2626'
-                    );
-                    return;
-                }
-
-                // 金币充足：弹出费用说明 + 确认
-                const noticeLines = [
-                    `💍 确认向【${this.targetUsername}】发出求婚吗？`,
-                    '',
-                    `📋 婚礼费用说明：`,
-                    `  • 婚礼最低费用：🪙 ${costStr} 金币`,
-                    `  • 您当前金币：🪙 ${jjbStr} 金币`,
-                    '',
-                    `⚠️ 戒指一旦送出即消耗，对方拒绝则戒指遗失。`,
-                ].join('\n');
-
-                const confirmed = await window.chatDialog?.confirm(noticeLines, '确认求婚');
-                if (!confirmed) return;
-                // ─────────────────────────────────────────────────────────
+                // 费用信息已在弹窗内展示，此处无需二次确认弹窗
 
                 this.sending = true;
                 this.error = '';