This commit is contained in:
@@ -74,7 +74,7 @@ export default function OrderDetail() {
|
||||
<View className='section-title'>商品信息</View>
|
||||
<View className='info-row'>
|
||||
<Text className='label'>商品名称</Text>
|
||||
<Text className='value'>{order.config_name || order.course_title}</Text>
|
||||
<Text className='value'>{order.config_name || order.course_title || (order.activity_title ? `报名活动:${order.activity_title}` : '未知商品')}</Text>
|
||||
</View>
|
||||
<View className='info-row'>
|
||||
<Text className='label'>数量</Text>
|
||||
|
||||
@@ -40,7 +40,9 @@ export default function OrderList() {
|
||||
<View className='body'>
|
||||
<Image src={order.config_image || 'https://via.placeholder.com/80'} className='img' mode='aspectFill' />
|
||||
<View className='info'>
|
||||
<Text className='name'>{order.config_name}</Text>
|
||||
<Text className='name'>
|
||||
{order.config_name || order.course_title || (order.activity_title ? `报名活动:${order.activity_title}` : '未知商品')}
|
||||
</Text>
|
||||
<Text className='qty'>x {order.quantity}</Text>
|
||||
</View>
|
||||
<View className='price'>
|
||||
|
||||
@@ -145,7 +145,16 @@ const ActivityDetail = () => {
|
||||
|
||||
const isFull = activity.max_participants > 0 && (activity.current_signups || 0) >= activity.max_participants
|
||||
const isEnded = new Date(activity.end_time) < new Date()
|
||||
const canSignup = activity.is_active && !isFull && !isEnded && !activity.has_signed_up
|
||||
|
||||
const hasConfirmed = activity.has_signed_up
|
||||
const isPending = activity.my_signup_status === 'pending'
|
||||
const isPaid = activity.is_paid
|
||||
|
||||
const canSignup = activity.is_active && !isEnded &&
|
||||
(
|
||||
(!hasConfirmed && !isPending && !isFull) ||
|
||||
(isPending && isPaid)
|
||||
)
|
||||
|
||||
return (
|
||||
<View className='activity-detail-page'>
|
||||
@@ -223,9 +232,11 @@ const ActivityDetail = () => {
|
||||
onClick={handleSignup}
|
||||
>
|
||||
{submitting ? '提交中...' : (
|
||||
activity.has_signed_up ? '您已报名' : (
|
||||
isEnded ? '活动已结束' : (
|
||||
isFull ? '名额已满' : '立即报名'
|
||||
hasConfirmed ? '您已报名' : (
|
||||
isPending ? (isPaid ? '去支付' : '审核中') : (
|
||||
isEnded ? '活动已结束' : (
|
||||
isFull ? '名额已满' : '立即报名'
|
||||
)
|
||||
)
|
||||
)
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user