diff --git a/pages-game/game/minesweeper/play.vue b/pages-game/game/minesweeper/play.vue
index 911bfcd..7d8327b 100644
--- a/pages-game/game/minesweeper/play.vue
+++ b/pages-game/game/minesweeper/play.vue
@@ -232,6 +232,7 @@
     </view>
 
     <!-- 结算弹窗 -->
+<<<<<<< HEAD
     <view v-if="shouldShowResultModal" class="modal-overlay">
       <view class="modal-content glass-card">
         <text class="modal-emoji">{{ gameState.winnerId === myUserId ? '🏆' : '💀' }}</text>
@@ -241,6 +242,14 @@
         </view>
         <view
           class="btn-primary"
+=======
+    <view v-if="gameState && !gameState.gameStarted && gameState.winnerId" class="modal-overlay">
+      <view class="modal-content glass-card">
+        <text class="modal-emoji">{{ gameState.winnerId === 'draw' ? '🤝' : (gameState.winnerId === myUserId ? '🏆' : '💀') }}</text>
+        <text class="modal-title">{{ gameState.winnerId === 'draw' ? '平局' : (gameState.winnerId === myUserId ? '胜利！' : '很遗憾失败了') }}</text>
+        <view 
+          class="btn-primary" 
+>>>>>>> c028a29943b7b201a73114cb14a1109deb3af339
           :class="{ disabled: isRefreshing }"
           @tap="refreshAndPlayAgain"
         >
@@ -661,6 +670,13 @@ export default {
         } else {
           uni.vibrateShort({ type: 'fail' });
         }
+<<<<<<< HEAD
+=======
+        let endMsg = '';
+        if (data.winnerId === 'draw') endMsg = '平局：无人幸存';
+        else endMsg = `战局结束：${data.winnerId === this.myUserId ? '您获得了胜利！' : '很遗憾失败了'}`;
+        this.addLog('system', endMsg);
+>>>>>>> c028a29943b7b201a73114cb14a1109deb3af339
       }
     },
     handleEvent(event) {