Refactor:3 #52

Merged
FatttSnake merged 3 commits from FatttSnake into dev 2024-05-10 02:32:02 +08:00
4 changed files with 44 additions and 16 deletions

View File

@@ -32,6 +32,7 @@
gap: 4px;
opacity: 0;
transition: all 0.2s;
z-index: 100;
> *:hover {
color: constants.$font-secondary-color;

View File

@@ -75,10 +75,9 @@ const StoreCard = ({
}
if (platform === 'ANDROID') {
void modal.confirm({
centered: true,
icon: <Icon style={{ color: COLOR_MAIN }} component={IconOxygenInfo} />,
title: 'Android 端',
centered: true,
maskClosable: true,
content: (
<FlexBox className={'android-qrcode'}>
<AntdQRCode
@@ -147,10 +146,9 @@ const StoreCard = ({
const handleOnAndroidBtnClick = (e: MouseEvent<HTMLDivElement>) => {
e.stopPropagation()
void modal.confirm({
centered: true,
icon: <Icon style={{ color: COLOR_MAIN }} component={IconOxygenInfo} />,
title: 'Android 端',
centered: true,
maskClosable: true,
content: (
<FlexBox className={'android-qrcode'}>
<AntdQRCode

View File

@@ -126,6 +126,15 @@ service.interceptors.response.use(
(error.code === 'ECONNABORTED' && error.message.includes('timeout'))
) {
void message.error({ content: '请求超时,请稍后重试', key: 'TIMEOUT' })
} else if (error.code === 'ERR_NETWORK') {
void message.error({
content: (
<>
<strong></strong>
</>
),
key: 'NETWORK_ERROR'
})
} else {
void message.error({
content: (

View File

@@ -37,10 +37,15 @@ export const navigateToView = (
version?: string,
options?: NavigateOptions
) => {
navigate(
`/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
options
const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
}
export const navigateToSource = (
@@ -51,10 +56,14 @@ export const navigateToSource = (
version?: string,
options?: NavigateOptions
) => {
navigate(
`/source/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
options
const url = new URL(
`/source/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
}
export const navigateToRedirect = (
@@ -104,10 +113,12 @@ export const navigateToEdit = (
platform: Platform,
options?: NavigateOptions
) => {
navigate(
`/edit/${toolId}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`,
options
)
const url = new URL(`/edit/${toolId}`, window.location.href)
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
navigate(`${url.pathname}${url.search}`, options)
}
export const navigateToUser = (navigate: NavigateFunction, options?: NavigateOptions) => {
@@ -123,5 +134,14 @@ export const getViewPath = (
toolId: string,
platform: Platform,
version?: string
) =>
`/view/${username}/${toolId}${version ? `/${version}` : ''}${platform !== import.meta.env.VITE_PLATFORM ? `?platform=${platform}` : ''}`
) => {
const url = new URL(
`/view/${username}/${toolId}${version ? `/${version}` : ''}`,
window.location.href
)
if (platform !== import.meta.env.VITE_PLATFORM) {
url.searchParams.append('platform', platform)
}
return `${url.pathname}${url.search}`
}