Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx

@@ -5,6 +5,7 @@ import userEvent from '@testing-library/user-event';
 import { useState } from 'react';
 import { afterEach, expect, test, vi } from 'vitest';
 
+import type { AuthUser } from '../../services/authService';
 import { AuthUiContext } from '../auth/AuthUiContext';
 import {
   RpgEntryHomeView,
@@ -221,6 +222,7 @@ function renderProfileView(
   profileDashboardOverrides: Partial<
     NonNullable<RpgEntryHomeViewProps['profileDashboard']>
   > = {},
+  userOverrides: Partial<AuthUser> = {},
 ) {
   return render(
     <AuthUiContext.Provider
@@ -235,6 +237,7 @@ function renderProfileView(
           loginMethod: 'password',
           bindingStatus: 'active',
           wechatBound: false,
+          ...userOverrides,
         },
         canAccessProtectedData: true,
         openLoginModal: vi.fn(),
@@ -450,6 +453,18 @@ test('profile total play time card always uses hours', () => {
   expect(within(playTimeCard).queryByText('90分')).toBeNull();
 });
 
+test('desktop account entry uses saved avatar image when available', () => {
+  mockDesktopLayout();
+  const avatarUrl = 'data:image/png;base64,AAAA';
+
+  renderProfileView(vi.fn(), {}, { avatarUrl });
+
+  const accountEntry = screen.getByRole('button', { name: /测试玩家/u });
+  const avatarImage = accountEntry.querySelector('img');
+  expect(avatarImage?.getAttribute('src')).toBe(avatarUrl);
+  expect(within(accountEntry).queryByText('测')).toBeNull();
+});
+
 test('wallet ledger modal shows empty and error states', async () => {
   const user = userEvent.setup();
   mockGetRpgProfileWalletLedger.mockResolvedValueOnce({ entries: [] });
@@ -466,6 +481,18 @@ test('wallet ledger modal shows empty and error states', async () => {
   expect(screen.getByText('重新加载')).toBeTruthy();
 });
 
+test('opens reward code modal from profile action on mobile', async () => {
+  const user = userEvent.setup();
+
+  renderProfileView();
+  await user.click(screen.getByRole('button', { name: /兑换码/u }));
+
+  const modal = await screen.findByPlaceholderText('输入兑换码');
+  expect(modal).toBeTruthy();
+  expect(screen.getByRole('button', { name: '兑换' })).toBeTruthy();
+  expect(screen.getByLabelText('关闭兑换码')).toBeTruthy();
+});
+
 test('shows a reachable login entry in logged out mobile shell', async () => {
   const user = userEvent.setup();
   const openLoginModal = vi.fn();

src/components/rpg-entry/RpgEntryHomeView.tsx

@@ -1828,7 +1828,7 @@ function RewardCodeRedeemModal({
   onClose: () => void;
 }) {
   return (
-    <div className="platform-modal-backdrop fixed inset-0 z-50 flex items-center justify-center px-4 py-6">
+    <div className="platform-modal-backdrop fixed inset-0 z-[80] flex items-center justify-center px-4 py-6">
       <div className="platform-recharge-modal w-full max-w-sm overflow-hidden rounded-[1.4rem]">
         <div className="flex items-center justify-between border-b border-white/10 px-5 py-4">
           <div className="text-base font-black">兑换码</div>
@@ -3478,6 +3478,17 @@ export function RpgEntryHomeView({
       ) : null}
     </>
   );
+  const rewardCodeModal: ReactNode = isRewardCodeOpen ? (
+    <RewardCodeRedeemModal
+      value={rewardCodeInput}
+      isSubmitting={isSubmittingRewardCode}
+      error={rewardCodeError}
+      success={rewardCodeSuccess}
+      onChange={setRewardCodeInput}
+      onSubmit={submitRewardCode}
+      onClose={() => setIsRewardCodeOpen(false)}
+    />
+  ) : null;
 
   if (!isDesktopLayout) {
     return (
@@ -3501,10 +3512,9 @@ export function RpgEntryHomeView({
         </div>
 
         <div
-          className="mt-3 min-w-0 shrink-0 border-t pt-2"
+          className="platform-mobile-bottom-dock mt-3 min-w-0 shrink-0 border-t pt-2"
           style={{
             borderColor: 'var(--platform-line-soft)',
-            paddingBottom: 'calc(env(safe-area-inset-bottom) + 0.2rem)',
           }}
         >
           <div
@@ -3537,6 +3547,7 @@ export function RpgEntryHomeView({
             onSubmitRedeem={submitReferralInviteCode}
           />
         ) : null}
+        {rewardCodeModal}
         {isProfilePlayStatsOpen ? (
           <ProfilePlayedWorksModal
             stats={profilePlayStats}
@@ -3594,13 +3605,21 @@ export function RpgEntryHomeView({
                 className="platform-desktop-search flex items-center gap-3 px-3 py-2.5 text-left"
               >
                 <span
-                  className="flex h-11 w-11 items-center justify-center rounded-full text-base font-black text-white"
+                  className="flex h-11 w-11 items-center justify-center overflow-hidden rounded-full text-base font-black text-white"
                   style={{
                     background: 'var(--platform-profile-avatar-fill)',
                     boxShadow: 'var(--platform-profile-avatar-shadow)',
                   }}
                 >
-                  {avatarLabel}
+                  {avatarUrl ? (
+                    <img
+                      src={avatarUrl}
+                      alt=""
+                      className="h-full w-full object-cover"
+                    />
+                  ) : (
+                    avatarLabel
+                  )}
                 </span>
                 <span className="min-w-0">
                   <span className="block truncate text-sm font-semibold text-[var(--platform-text-strong)]">
@@ -3634,17 +3653,7 @@ export function RpgEntryHomeView({
           </div>
         </div>
       </div>
-      {isRewardCodeOpen ? (
-        <RewardCodeRedeemModal
-          value={rewardCodeInput}
-          isSubmitting={isSubmittingRewardCode}
-          error={rewardCodeError}
-          success={rewardCodeSuccess}
-          onChange={setRewardCodeInput}
-          onSubmit={submitRewardCode}
-          onClose={() => setIsRewardCodeOpen(false)}
-        />
-      ) : null}
+      {rewardCodeModal}
       {profilePopupPanel ? (
         <ProfileReferralModal
           panel={profilePopupPanel}