lanhu/web
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

推送远程分支前的排查和修复代码

Browse Source
This commit is contained in:
Eamon-meng
2025-12-20 15:08:12 +08:00
parent e23f89cde6
commit 5b1207783b
12 changed files with 143 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/components/composites/purchase/long/right.tsx
View File

@@ -18,12 +18,7 @@ import {useFormContext, useWatch} from 'react-hook-form'
import {Schema} from '@/components/composites/purchase/long/form'
import {Card} from '@/components/ui/card'
import {getPrice, CreateResourceReq} from '@/actions/resource'
interface PriceData {
price: string
discounted_price?: string
discounted?: number
}
import {ExtraResp} from '@/lib/api'
export default function Right() {
const {control} = useFormContext<Schema>()
@@ -33,7 +28,7 @@ export default function Right() {
const quota = useWatch({control, name: 'quota'})
const expire = useWatch({control, name: 'expire'})
const dailyLimit = useWatch({control, name: 'daily_limit'})
const [priceData, setPriceData] = useState<PriceData>({
const [priceData, setPriceData] = useState<ExtraResp<typeof getPrice>>({
price: '0.00',
discounted_price: '0.00',
discounted: 0,
@@ -41,29 +36,27 @@ export default function Right() {
useEffect(() => {
const price = async () => {
const params: CreateResourceReq = {
type: 2,
long: {
live: Number(live),
mode: Number(mode),
quota: Number(mode) === 1 ? Number(dailyLimit) : Number(quota),
expire: Number(mode) === 1 ? Number(expire) : undefined,
},
}
try {
const priceValue = await getPrice(params)
if (priceValue.success && priceValue.data?.price) {
const data: PriceData = priceValue.data
setPriceData({
price: data.price,
discounted_price: data.discounted_price ?? data.price ?? '',
discounted: data.discounted,
})
const resp = await getPrice({
type: 2,
long: {
live: Number(live),
mode: Number(mode),
quota: mode === '1' ? Number(dailyLimit) : Number(quota),
expire: mode === '1' ? Number(expire) : undefined,
},
})
if (!resp.success) {
throw new Error('获取价格失败')
}
setPriceData({
price: resp.data.price,
discounted_price: resp.data.discounted_price ?? resp.data.price ?? '',
discounted: resp.data.discounted,
})
}
catch (error) {
console.error('获取价格失败:', error)
setPriceData({
price: '0.00',
discounted_price: '0.00',

45
src/components/composites/purchase/short/right.tsx
View File

@@ -17,12 +17,7 @@ import Pay from '@/components/composites/purchase/pay'
import {useFormContext, useWatch} from 'react-hook-form'
import {Card} from '@/components/ui/card'
import {CreateResourceReq, getPrice} from '@/actions/resource'
interface PriceData {
price: string
discounted_price?: string
discounted?: number
}
import {ExtraResp} from '@/lib/api'
export default function Right() {
const {control} = useFormContext<Schema>()
@@ -32,7 +27,7 @@ export default function Right() {
const expire = useWatch({control, name: 'expire'})
const quota = useWatch({control, name: 'quota'})
const dailyLimit = useWatch({control, name: 'daily_limit'})
const [priceData, setPriceData] = useState<PriceData>({
const [priceData, setPriceData] = useState<ExtraResp<typeof getPrice>>({
price: '0.00',
discounted_price: '0.00',
discounted: 0,
@@ -40,26 +35,26 @@ export default function Right() {
useEffect(() => {
const price = async () => {
const params: CreateResourceReq = {
type: 1,
short: {
live: Number(live),
mode: Number(mode),
quota: Number(mode) === 1 ? Number(dailyLimit) : Number(quota),
expire: Number(mode) === 1 ? Number(expire) : undefined,
},
}
try {
const priceResponse = await getPrice(params)
if (priceResponse.success && priceResponse.data) {
const data: PriceData = priceResponse.data
setPriceData({
price: data.price,
discounted_price: data.discounted_price ?? data.price ?? '',
discounted: data.discounted,
})
const priceResponse = await getPrice({
type: 1,
short: {
live: Number(live),
mode: Number(mode),
quota: mode === '1' ? Number(dailyLimit) : Number(quota),
expire: mode === '1' ? Number(expire) : undefined,
},
})
if (!priceResponse.success) {
throw new Error('获取价格失败')
}
const data = priceResponse.data
setPriceData({
price: data.price,
discounted_price: data.discounted_price ?? data.price ?? '',
discounted: data.discounted,
})
}
catch (error) {
console.error('获取价格失败:', error)