pay/pay-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #30

Merged
zsq merged 33 commits from develop into main 2026-03-31 17:43:07 +08:00
Conversation 0 Commits 33 Files Changed 13 +23 -24
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17e2fca04b - Show all commits

47
src/common/components/layout/MyPageContainer.tsx
View File

@ -1,10 +1,10 @@
import { useMyState } from '@/common';
import { CloseOutlined, ReloadOutlined } from '@ant-design/icons'; import { CloseOutlined, ReloadOutlined } from '@ant-design/icons';
import { PageContainer, PageContainerProps } from '@ant-design/pro-components'; import { PageContainer, PageContainerProps } from '@ant-design/pro-components';
import { history, useLocation } from '@umijs/max'; import { history, useLocation } from '@umijs/max';
import type { MenuProps } from 'antd'; import type { MenuProps } from 'antd';
import { Dropdown, message, Space, Tabs } from 'antd'; import { Dropdown, message, Space, Tabs } from 'antd';
import React, { useCallback, useEffect, useRef, useState } from 'react'; import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useMyState } from '@/common';
import AvatarProps from './AvatarProps'; import AvatarProps from './AvatarProps';
import './MyPageContainer.scss'; import './MyPageContainer.scss';
@ -362,26 +362,26 @@ export function MyPageContainer({
); );
}; };
if (!enableTabs || tabs.length === 0) { // if (!enableTabs || tabs.length === 0) {
return ( // return (
<PageContainer // <PageContainer
fixedHeader // fixedHeader
// header={{ // // header={{
// title: title, // // title: title,
// style: { backgroundColor: '#FFF' }, // // style: { backgroundColor: '#FFF' },
// }} // // }}
token={{ // token={{
paddingBlockPageContainerContent: 0, // paddingBlockPageContainerContent: 0,
paddingInlinePageContainerContent: 0, // paddingInlinePageContainerContent: 0,
}} // }}
{...rest} // {...rest}
> // >
<Space direction="vertical" size="middle" style={{ width: '100%' }}> // <Space direction="vertical" size="middle" style={{ width: '100%' }}>
{children} // {children}
</Space> // </Space>
</PageContainer> // </PageContainer>
); // );
} // }
return ( return (
<PageContainer <PageContainer
@ -408,11 +408,10 @@ export function MyPageContainer({
marginTop: 6, marginTop: 6,
marginBottom: 0, marginBottom: 0,
}} }}
className="tabs-header-only"
/> />
</div> </div>
{/* 右侧：用户信息 */} {/* 右侧：用户信息 */}
<div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}> <div style={{ display: 'flex', alignItems: 'center', gap: '12px', marginLeft: '24px' }}>
<Dropdown menu={{ items: userMenuItems }} placement="bottomRight"> <Dropdown menu={{ items: userMenuItems }} placement="bottomRight">
<div style={{ cursor: 'pointer', display: 'flex', alignItems: 'center' }}> <div style={{ cursor: 'pointer', display: 'flex', alignItems: 'center' }}>
<AvatarProps user={snap.session.user} /> <AvatarProps user={snap.session.user} />
@ -421,7 +420,7 @@ export function MyPageContainer({
</div> </div>
</div> </div>
), ),
style: { backgroundColor: '#FFF' }, style: { backgroundColor: '#FFF', padding: '0 24px !important' },
}} }}
token={{ token={{
paddingBlockPageContainerContent: 0, paddingBlockPageContainerContent: 0,