fix: task 6 review round 1
This commit is contained in:
@@ -36,7 +36,7 @@ export default function CheckoutPage() {
|
||||
}
|
||||
Taro.showModal({
|
||||
title: '确认下单',
|
||||
content: `确认后将从设计清单生成订单,并寄送至:\n${address.region ? address.region.join(' ') : ''} ${address.detail}`,
|
||||
content: `确认后将从设计清单生成订单,并寄送至:\n${formatAddress(address.region, address.detail)}`,
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
designToOrder(design.id)
|
||||
@@ -57,6 +57,10 @@ export default function CheckoutPage() {
|
||||
|
||||
const hasStickers = design && design.designData && design.designData.stickers && design.designData.stickers.length > 0
|
||||
const hasLegacyImage = design && design.designData ? design.designData.imageSrc : undefined
|
||||
const formatAddress = (region: string[] | undefined, detail: string) => {
|
||||
const regionText = region ? region.join(' ') : ''
|
||||
return regionText ? `${regionText} ${detail}` : detail
|
||||
}
|
||||
|
||||
if (!design) {
|
||||
return (
|
||||
@@ -158,7 +162,7 @@ export default function CheckoutPage() {
|
||||
<Text className='addr-phone'>{address.phone}</Text>
|
||||
</View>
|
||||
<Text className='addr-detail'>
|
||||
{address.region ? address.region.join(' ') : ''} {address.detail}
|
||||
{formatAddress(address.region, address.detail)}
|
||||
</Text>
|
||||
</View>
|
||||
) : (
|
||||
@@ -201,7 +205,7 @@ export default function CheckoutPage() {
|
||||
{addr.isDefault && <Text className='addr-picker-default'>默认</Text>}
|
||||
</View>
|
||||
<Text className='addr-picker-detail'>
|
||||
{addr.region ? addr.region.join(' ') : ''} {addr.detail}
|
||||
{formatAddress(addr.region, addr.detail)}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user