修复文件上传和下单支付流程
This commit is contained in:
@@ -241,8 +241,8 @@ async function submitOrder() {
|
||||
ordering.value = true
|
||||
try {
|
||||
const order = await createOrder(listing.value.id)
|
||||
ElMessage.success('订单已创建,请完成支付')
|
||||
await router.push(`/orders/${order.id}`)
|
||||
ElMessage.success('订单已创建,正在打开支付')
|
||||
await router.push({ path: `/orders/${order.id}`, query: { pay: '1' } })
|
||||
} catch (error) {
|
||||
ElMessage.error(readError(error, '下单失败'))
|
||||
} finally {
|
||||
|
||||
@@ -231,9 +231,9 @@ async function submitOrder() {
|
||||
if (!listing.value) return
|
||||
ordering.value = true
|
||||
try {
|
||||
await createOrder(listing.value.id)
|
||||
showToast({ message: '订单已创建,请完成支付', icon: 'passed' })
|
||||
await router.push(`/m/orders`)
|
||||
const order = await createOrder(listing.value.id)
|
||||
showToast({ message: '订单已创建,正在打开支付', icon: 'passed' })
|
||||
await router.push({ path: `/m/orders/${order.id}`, query: { pay: '1' } })
|
||||
} catch (error) {
|
||||
showToast({ message: readError(error, '下单失败'), icon: 'cross' })
|
||||
} finally {
|
||||
|
||||
@@ -90,6 +90,7 @@ const activeNames = ref<string[]>([])
|
||||
const showDisputePopup = ref(false)
|
||||
const showCounterPopup = ref(false)
|
||||
const showRejectPopup = ref(false)
|
||||
let autoPayHandled = false
|
||||
|
||||
const isOwner = computed(() => order.value?.owner_id === session.userId)
|
||||
const isRenter = computed(() => order.value?.renter_id === session.userId)
|
||||
@@ -139,6 +140,16 @@ async function loadOrder() {
|
||||
handoffRecords.value = await fetchHandoffRecords(String(route.params.id))
|
||||
hydrateResourceUsage()
|
||||
hydrateCounterForm()
|
||||
if (
|
||||
!autoPayHandled &&
|
||||
route.query.pay === '1' &&
|
||||
order.value?.status === 'pending_payment' &&
|
||||
order.value?.renter_id === session.userId
|
||||
) {
|
||||
autoPayHandled = true
|
||||
void router.replace({ path: route.path })
|
||||
void handlePay()
|
||||
}
|
||||
} catch {
|
||||
showToast({ message: '加载订单失败', icon: 'cross' })
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user