暂无可用套餐时取消加载中 & 登录页加返回首页 & 加联系专属客服 & 修改白名单上限10个

This commit is contained in:
Eamon-meng
2026-04-21 16:42:37 +08:00
parent a0b0956677
commit eb4c2d2d5f
9 changed files with 146 additions and 132 deletions

View File

@@ -6,7 +6,7 @@ import {Card, CardContent} from '@/components/ui/card'
import {Form, FormField} from '@/components/ui/form' import {Form, FormField} from '@/components/ui/form'
import {Label} from '@/components/ui/label' import {Label} from '@/components/ui/label'
import {Tabs, TabsList, TabsTrigger} from '@/components/ui/tabs' import {Tabs, TabsList, TabsTrigger} from '@/components/ui/tabs'
import {EyeClosedIcon, EyeIcon} from 'lucide-react' import {EyeClosedIcon, EyeIcon, HomeIcon} from 'lucide-react'
import {useState, ReactNode, useEffect, Suspense} from 'react' import {useState, ReactNode, useEffect, Suspense} from 'react'
import zod from 'zod' import zod from 'zod'
import {useForm, useFormContext, useWatch} from 'react-hook-form' import {useForm, useFormContext, useWatch} from 'react-hook-form'
@@ -16,6 +16,7 @@ import {useRouter} from 'next/navigation'
import {login, LoginMode} from '@/actions/auth' import {login, LoginMode} from '@/actions/auth'
import {useProfileStore} from '@/components/stores/profile' import {useProfileStore} from '@/components/stores/profile'
import dynamic from 'next/dynamic' import dynamic from 'next/dynamic'
import Link from 'next/link'
const smsSchema = zod.object({ const smsSchema = zod.object({
username: zod.string().length(11, '请输入正确的手机号码'), username: zod.string().length(11, '请输入正确的手机号码'),
@@ -88,6 +89,16 @@ export default function LoginCard() {
const [showPwd, setShowPwd] = useState(false) const [showPwd, setShowPwd] = useState(false)
return ( return (
<div className="relative flex flex-col items-center">
<div className="relative w-96 mx-4">
<Link
href="/"
className="absolute -top-8 right-0 inline-flex items-center text-sm transition-colors"
>
<HomeIcon size={18} className="mr-1"/>
</Link>
</div>
<Card className="w-96 mx-4 shadow-lg relative z-20 py-8"> <Card className="w-96 mx-4 shadow-lg relative z-20 py-8">
<CardContent className="px-8"> <CardContent className="px-8">
{/* 登录方式切换 */} {/* 登录方式切换 */}
@@ -193,6 +204,7 @@ export default function LoginCard() {
</Form> </Form>
</CardContent> </CardContent>
</Card> </Card>
</div>
) )
} }

View File

@@ -6,7 +6,7 @@ import {RealnameAuthDialog} from '@/components/composites/dialogs/realname-auth-
import UserCenter from '@/components/composites/user-center' import UserCenter from '@/components/composites/user-center'
import {Button} from '@/components/ui/button' import {Button} from '@/components/ui/button'
import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from '@/components/ui/tooltip' import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from '@/components/ui/tooltip'
import {Archive, ArchiveRestore, Eye, HardDriveUpload, IdCard, LockKeyhole, Package, PanelLeftCloseIcon, PanelLeftOpenIcon, ShoppingCart, UserRound, UserRoundPen, Wallet} from 'lucide-react' import {Archive, ArchiveRestore, Eye, HardDriveUpload, IdCard, LockKeyhole, MessageCircleMoreIcon, Package, PanelLeftCloseIcon, PanelLeftOpenIcon, ShoppingCart, UserRound, UserRoundPen, Wallet} from 'lucide-react'
import {merge} from '@/lib/utils' import {merge} from '@/lib/utils'
import logoAvatar from '@/assets/logo-avatar.svg' import logoAvatar from '@/assets/logo-avatar.svg'
import logoText from '@/assets/logo-text.svg' import logoText from '@/assets/logo-text.svg'
@@ -126,6 +126,16 @@ export function Header() {
<IdCard size={16}/> <IdCard size={16}/>
<span></span> <span></span>
</Link> </Link>
<div className="max-md:hidden h-5 w-px bg-gray-300 mx-2"/>
<a
href="https://wpa1.qq.com/K0s0cvwf?_type=wpa&qidian=true"
target="_blank"
rel="noopener noreferrer"
className="max-md:hidden flex items-center gap-1.5 text-sm text-blue-600 hover:text-blue-800 transition-colors mr-2"
>
<MessageCircleMoreIcon size={16}/>
<span></span>
</a>
</div> </div>
<div className="flex-none flex items-center justify-end pr-4 max-md:hidden gap-3"> <div className="flex-none flex items-center justify-end pr-4 max-md:hidden gap-3">

View File

@@ -34,7 +34,7 @@ type SchemaType = z.infer<typeof schema>
export type WhitelistPageProps = {} export type WhitelistPageProps = {}
const MAX_WHITELIST_COUNT = 5 const MAX_WHITELIST_COUNT = 10
export default function WhitelistPage(props: WhitelistPageProps) { export default function WhitelistPage(props: WhitelistPageProps) {
const [wait, setWait] = useState(false) const [wait, setWait] = useState(false)

View File

@@ -379,12 +379,10 @@ function SelectResource() {
</div> </div>
) : !profile ? ( ) : !profile ? (
<div className="p-4 flex gap-1 items-center"> <div className="p-4 flex gap-1 items-center">
{/* <Loader className="animate-spin" size={20}/> */}
<span className="text-gray-600"><Link href="/login" className="text-blue-600 hover:text-blue-700 font-medium"></Link></span> <span className="text-gray-600"><Link href="/login" className="text-blue-600 hover:text-blue-700 font-medium"></Link></span>
</div> </div>
) : resources.length === 0 ? ( ) : resources.length === 0 ? (
<div className="p-4 flex gap-1 items-center"> <div className="p-4 flex gap-1 items-center">
<Loader className="animate-spin" size={20}/>
<span></span> <span></span>
</div> </div>
) : ( ) : (

View File

@@ -30,7 +30,6 @@ export default function Purchase() {
const res = profile const res = profile
? await listProduct({}) ? await listProduct({})
: await listProductHome({}) : await listProductHome({})
console.log(res, 'res')
if (res.success) { if (res.success) {
setProductList(res.data) setProductList(res.data)

View File

@@ -167,14 +167,14 @@ export default function Center({skuData}: {
<NumberStepperField <NumberStepperField
name="daily_limit" name="daily_limit"
label="每日提取上限" label="每日提取上限"
min={currentCountMin || 100} min={currentCountMin}
step={100} step={100}
/> />
) : ( ) : (
<NumberStepperField <NumberStepperField
name="quota" name="quota"
label="IP 购买数量" label="IP 购买数量"
min={currentCountMin || 500} min={currentCountMin}
step={100} step={100}
/> />
)} )}

View File

@@ -11,9 +11,9 @@ import {PurchaseSidePanel} from '../shared/side-panel'
const schema = z.object({ const schema = z.object({
type: z.enum(['1', '2']).default('2'), type: z.enum(['1', '2']).default('2'),
live: z.string(), live: z.string(),
quota: z.number().min(500, '购买数量不能少于 500 个'), quota: z.number().min(1, '购买数量不能少于 1 个'),
expire: z.string(), expire: z.string(),
daily_limit: z.number().min(100, '每日限额不能少于 100 个'), daily_limit: z.number().min(1, '每日限额不能少于 1 个'),
pay_type: z.enum(['wechat', 'alipay', 'balance']), pay_type: z.enum(['wechat', 'alipay', 'balance']),
}) })
export type Schema = z.infer<typeof schema> export type Schema = z.infer<typeof schema>
@@ -37,8 +37,8 @@ export default function LongForm({skuList}: {skuList: ProductItem['skus']}) {
type: defaultMode, type: defaultMode,
live: defaultLive, live: defaultLive,
expire: defaultExpire, expire: defaultExpire,
quota: defaultMode === '2' ? Math.max(defaultCountMin, 500) : 500, quota: defaultCountMin,
daily_limit: defaultMode === '1' ? Math.max(defaultCountMin, 100) : 100, daily_limit: defaultCountMin,
pay_type: 'balance', // 余额支付 pay_type: 'balance', // 余额支付
}, },
}) })

View File

@@ -16,7 +16,6 @@ export default function Center({
}: { }: {
skuData: PurchaseSkuData skuData: PurchaseSkuData
}) { }) {
// const {setValue} = useFormContext<Schema>()
const {setValue, getValues} = useFormContext<Schema>() const {setValue, getValues} = useFormContext<Schema>()
const type = useWatch<Schema>({name: 'type'}) as Schema['type'] const type = useWatch<Schema>({name: 'type'}) as Schema['type']
const live = useWatch<Schema>({name: 'live'}) as Schema['live'] const live = useWatch<Schema>({name: 'live'}) as Schema['live']
@@ -34,18 +33,13 @@ export default function Center({
const expireValue = type === '1' ? expire : '0' const expireValue = type === '1' ? expire : '0'
return getPurchaseSkuCountMin(skuData, {mode: type, live, expire: expireValue}) return getPurchaseSkuCountMin(skuData, {mode: type, live, expire: expireValue})
}, [type, live, expire, skuData]) }, [type, live, expire, skuData])
useEffect(() => { useEffect(() => {
if (type === '1') { if (currentCountMin <= 0) return
const current = getValues('daily_limit') const targetField = type === '1' ? 'daily_limit' : 'quota'
if (current < currentCountMin) { const currentValue = getValues(targetField)
setValue('daily_limit', currentCountMin) if (currentValue < currentCountMin) {
} setValue(targetField, currentCountMin, {shouldValidate: true})
}
else {
const current = getValues('quota')
if (current < currentCountMin) {
setValue('quota', currentCountMin)
}
} }
}, [currentCountMin, type, setValue, getValues]) }, [currentCountMin, type, setValue, getValues])
useEffect(() => { useEffect(() => {
@@ -171,14 +165,14 @@ export default function Center({
<NumberStepperField <NumberStepperField
name="daily_limit" name="daily_limit"
label="每日提取上限" label="每日提取上限"
min={currentCountMin || 2000} min={currentCountMin}
step={1000} step={1000}
/> />
) : ( ) : (
<NumberStepperField <NumberStepperField
name="quota" name="quota"
label="IP 购买数量" label="IP 购买数量"
min={currentCountMin || 10000} min={currentCountMin}
step={5000} step={5000}
/> />
)} )}

View File

@@ -11,9 +11,9 @@ import {PurchaseSidePanel} from '../shared/side-panel'
const schema = z.object({ const schema = z.object({
type: z.enum(['1', '2']).default('2'), type: z.enum(['1', '2']).default('2'),
live: z.string(), live: z.string(),
quota: z.number().min(10000, '购买数量不能少于 10000 个'), quota: z.number(),
expire: z.string(), expire: z.string(),
daily_limit: z.number().min(2000, '每日限额不能少于 2000 个'), daily_limit: z.number(),
pay_type: z.enum(['wechat', 'alipay', 'balance']).default('balance'), pay_type: z.enum(['wechat', 'alipay', 'balance']).default('balance'),
}) })
export type Schema = z.infer<typeof schema> export type Schema = z.infer<typeof schema>
@@ -30,14 +30,15 @@ export default function ShortForm({skuList}: {skuList: ProductItem['skus']}) {
live: defaultLive, live: defaultLive,
expire: defaultExpire, expire: defaultExpire,
}) })
const form = useForm<Schema>({ const form = useForm<Schema>({
resolver: zodResolver(schema), resolver: zodResolver(schema),
defaultValues: { defaultValues: {
type: defaultMode, type: defaultMode,
live: defaultLive, live: defaultLive,
expire: defaultExpire, expire: defaultExpire,
quota: defaultMode === '2' ? defaultCountMin || 10000 : 10000, quota: defaultCountMin,
daily_limit: defaultMode === '1' ? defaultCountMin || 2000 : 2000, daily_limit: defaultCountMin,
pay_type: 'balance', // 余额支付 pay_type: 'balance', // 余额支付
}, },
}) })