|
|
@ -35,8 +35,7 @@ const OrderConfirm = () => { |
|
|
|
setPayments(paymentList?.map((d, _) => { |
|
|
|
return { |
|
|
|
type: d.type, |
|
|
|
name: d.name, |
|
|
|
description: d.comments |
|
|
|
name: d.name |
|
|
|
} |
|
|
|
})) |
|
|
|
setPayment(paymentList[0]) |
|
|
@ -114,12 +113,13 @@ const OrderConfirm = () => { |
|
|
|
address && ( |
|
|
|
<Cell className={'address-bottom-line'} onClick={() => Taro.navigateTo({url: '/user/address/index'})}> |
|
|
|
<Space> |
|
|
|
<Location/> |
|
|
|
<Location className={'text-gray-500'}/> |
|
|
|
<View className={'flex flex-col w-full justify-between items-start'}> |
|
|
|
<Space className={'flex flex-row w-full font-medium'}> |
|
|
|
<View className={'flex-wrap text-nowrap whitespace-nowrap'}>送至</View> |
|
|
|
<View style={{width: '64%'}} |
|
|
|
className={'line-clamp-1 relative'}>{address.province} {address.city} {address.region} {address.address} |
|
|
|
<Space className={'flex flex-row w-full'}> |
|
|
|
<View className={'flex-wrap text-nowrap whitespace-nowrap text-gray-500'}>送至</View> |
|
|
|
<View className={'font-medium text-sm flex items-center w-full'}> |
|
|
|
<View style={{width: '64%'}}>{address.province} {address.city} {address.region} {address.address}</View> |
|
|
|
<ArrowRight className={'text-gray-500'} size={14} /> |
|
|
|
</View> |
|
|
|
</Space> |
|
|
|
<View className={'pt-1 pb-3 text-gray-500'}>{address.name} {address.phone}</View> |
|
|
@ -159,12 +159,12 @@ const OrderConfirm = () => { |
|
|
|
|
|
|
|
<CellGroup> |
|
|
|
<Cell title={`商品总价(共1件)`} extra={<View className={'font-medium'}>{'¥' + goods.price}</View>}/> |
|
|
|
{/*<Cell title={'优惠券'} extra={(*/} |
|
|
|
{/* <View className={'flex justify-between items-center'}>*/} |
|
|
|
{/* <View className={'text-red-500 text-sm mr-1'}>-¥0.00</View>*/} |
|
|
|
{/* <ArrowRight className={'text-gray-400'} size={14}/>*/} |
|
|
|
{/* </View>*/} |
|
|
|
{/*)}/>*/} |
|
|
|
<Cell title={'优惠券'} extra={( |
|
|
|
<View className={'flex justify-between items-center'}> |
|
|
|
<View className={'text-red-500 text-sm mr-1'}>-¥0.00</View> |
|
|
|
<ArrowRight className={'text-gray-400'} size={14}/> |
|
|
|
</View> |
|
|
|
)}/> |
|
|
|
{/*<Cell title={'配送费'} extra={'¥' + 10}/>*/} |
|
|
|
<Cell title={'订单备注'} extra={( |
|
|
|
<Input placeholder={'选填,请先和商家协商一致'} style={{padding: '0'}}/> |
|
|
|