Compare commits
2 Commits
e58a2fd915
...
8b902be603
| Author | SHA1 | Date | |
|---|---|---|---|
| 8b902be603 | |||
| 37ab933849 |
@@ -460,7 +460,7 @@ const UserTicketList = () => {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await rollbackUserTicketAfterOrderCancel(order, beforeTicket);
|
await rollbackUserTicketAfterOrderCancel(order, beforeTicket);
|
||||||
Taro.showToast({ title: '订单已取消,水票已退回', icon: 'success' });
|
Taro.showToast({ title: '订单已取消,水票已退回', icon: 'none' });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('取消订单后退回水票失败:', e);
|
console.error('取消订单后退回水票失败:', e);
|
||||||
await Taro.showModal({
|
await Taro.showModal({
|
||||||
|
|||||||
@@ -918,17 +918,17 @@ const OrderConfirm = () => {
|
|||||||
if (noTicketPromptedRef.current) return
|
if (noTicketPromptedRef.current) return
|
||||||
noTicketPromptedRef.current = true
|
noTicketPromptedRef.current = true
|
||||||
|
|
||||||
;(async () => {
|
// ;(async () => {
|
||||||
const r = await Taro.showModal({
|
// const r = await Taro.showModal({
|
||||||
title: '暂无可用水票',
|
// title: '暂无可用水票',
|
||||||
content: '您当前没有可用水票,购买后再来下单更方便。',
|
// content: '您当前没有可用水票,购买后再来下单更方便。',
|
||||||
confirmText: '去购买',
|
// confirmText: '去购买',
|
||||||
cancelText: '暂不'
|
// cancelText: '暂不'
|
||||||
})
|
// })
|
||||||
if (r.confirm) {
|
// if (r.confirm) {
|
||||||
await goBuyTickets()
|
// await goBuyTickets()
|
||||||
}
|
// }
|
||||||
})()
|
// })()
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [noUsableTickets, isEditMode])
|
}, [noUsableTickets, isEditMode])
|
||||||
|
|
||||||
@@ -1109,7 +1109,7 @@ const OrderConfirm = () => {
|
|||||||
setTicketPopupVisible(true)
|
setTicketPopupVisible(true)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{noUsableTickets && (
|
{(noUsableTickets && !isEditMode) && (
|
||||||
<Cell
|
<Cell
|
||||||
title={<Text className="text-gray-500">还没有购买水票</Text>}
|
title={<Text className="text-gray-500">还没有购买水票</Text>}
|
||||||
description="购买水票后即可在这里直接下单送水"
|
description="购买水票后即可在这里直接下单送水"
|
||||||
@@ -1185,8 +1185,11 @@ const OrderConfirm = () => {
|
|||||||
<View className="py-10 text-center">
|
<View className="py-10 text-center">
|
||||||
<Empty description="暂无可用水票" />
|
<Empty description="暂无可用水票" />
|
||||||
<View className="mt-4 flex justify-center">
|
<View className="mt-4 flex justify-center">
|
||||||
<Button type="primary" onClick={goBuyTickets}>
|
<Button
|
||||||
确定下单
|
type="primary"
|
||||||
|
onClick={isEditMode ? () => setTicketPopupVisible(false) : goBuyTickets}
|
||||||
|
>
|
||||||
|
{isEditMode ? '确定修改' : '确定下单'}
|
||||||
</Button>
|
</Button>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
@@ -1268,9 +1271,9 @@ const OrderConfirm = () => {
|
|||||||
</View>
|
</View>
|
||||||
</div>
|
</div>
|
||||||
<div className={'buy-btn mx-4'}>
|
<div className={'buy-btn mx-4'}>
|
||||||
{noUsableTickets ? (
|
{noUsableTickets && !isEditMode ? (
|
||||||
<Button type="primary" size="large" onClick={goBuyTickets}>
|
<Button type="primary" size="large" onClick={goBuyTickets}>
|
||||||
确定下单
|
{isEditMode ? '确定修改' : '确定下单'}
|
||||||
</Button>
|
</Button>
|
||||||
) : (
|
) : (
|
||||||
<Button
|
<Button
|
||||||
@@ -1282,7 +1285,7 @@ const OrderConfirm = () => {
|
|||||||
!address?.id ||
|
!address?.id ||
|
||||||
!addressHasCoords ||
|
!addressHasCoords ||
|
||||||
(deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
|
(deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false) ||
|
||||||
availableTicketTotal <= 0 ||
|
(!isEditMode && availableTicketTotal <= 0) ||
|
||||||
!canStartOrder
|
!canStartOrder
|
||||||
}
|
}
|
||||||
onClick={onSubmit}
|
onClick={onSubmit}
|
||||||
@@ -1295,7 +1298,7 @@ const OrderConfirm = () => {
|
|||||||
? '地址缺少定位'
|
? '地址缺少定位'
|
||||||
: ((deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false)
|
: ((deliveryRangeCheckedAddressId === address?.id && inDeliveryRange === false)
|
||||||
? '不在配送范围'
|
? '不在配送范围'
|
||||||
: (submitLoading ? '提交中...' : '立即提交')
|
: (submitLoading ? '提交中...' : (isEditMode ? '确定修改' : '立即提交'))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user