diff --git a/frontend/src/views/user/Checkout.vue b/frontend/src/views/user/Checkout.vue index ed23c8c..9910c81 100644 --- a/frontend/src/views/user/Checkout.vue +++ b/frontend/src/views/user/Checkout.vue @@ -56,6 +56,12 @@ +
+ +

{{ paymentError }}

+ 返回订单 +
+

正在创建支付订单...

@@ -67,7 +73,7 @@ import { ref, onMounted, onUnmounted } from 'vue' import { useRoute, useRouter } from 'vue-router' import { ElMessage } from 'element-plus' -import { Loading } from '@element-plus/icons-vue' +import { Loading, CircleCloseFilled } from '@element-plus/icons-vue' import { orderApi } from '../../api' import QRCode from 'qrcode' @@ -75,6 +81,7 @@ const route = useRoute() const router = useRouter() const qrCanvas = ref() const paymentInfo = ref(null) +const paymentError = ref('') const remaining = ref(0) const totalTime = ref(0) let pollTimer: any = null @@ -97,8 +104,7 @@ async function createPayment() { startCountdown() startPolling() } catch (err: any) { - ElMessage.error(err.response?.data?.error || '创建支付失败') - router.push('/orders') + paymentError.value = err.response?.data?.error || '创建支付失败' } } @@ -325,5 +331,11 @@ onUnmounted(() => { color: rgba(255, 255, 255, 0.5); margin-top: 16px; } + + .error-text { + color: #f56c6c; + font-size: 15px; + margin: 16px 0; + } } diff --git a/frontend/src/views/user/OrderDetail.vue b/frontend/src/views/user/OrderDetail.vue index 30b5802..e410e4d 100644 --- a/frontend/src/views/user/OrderDetail.vue +++ b/frontend/src/views/user/OrderDetail.vue @@ -111,11 +111,7 @@ onMounted(async () => { }) function goPay() { - if (order.value?.payment_method === 'bepusdt') { - router.push(`/checkout/${order.value.id}`) - } else { - ElMessage.info('请联系客服完成支付') - } + router.push(`/checkout/${order.value.id}`) } async function applyRefund() { diff --git a/frontend/src/views/user/Orders.vue b/frontend/src/views/user/Orders.vue index 1e318fc..bd2525d 100644 --- a/frontend/src/views/user/Orders.vue +++ b/frontend/src/views/user/Orders.vue @@ -70,11 +70,7 @@ async function fetchOrders() { } function goPay(row: any) { - if (row.payment_method === 'bepusdt') { - router.push(`/checkout/${row.id}`) - } else { - ElMessage.info('请联系客服完成支付') - } + router.push(`/checkout/${row.id}`) } async function cancelOrder(id: number) {