diff --git a/frontend/src/features/mohong/views/MohongDetailView.vue b/frontend/src/features/mohong/views/MohongDetailView.vue index 24d1eb4..ef54504 100644 --- a/frontend/src/features/mohong/views/MohongDetailView.vue +++ b/frontend/src/features/mohong/views/MohongDetailView.vue @@ -11,6 +11,7 @@ import { } from '@/features/mohong/api/mohong' import MohongCartPanel from '@/features/mohong/components/MohongCartPanel.vue' import { useMohongCart } from '@/features/mohong/composables/useMohongCart' +import PayWaySelectDialog from '@/features/orders/components/PayWaySelectDialog.vue' import type { PaymentPayWay } from '@/features/orders/api/orders' import { useOrderPaymentCashier } from '@/features/orders/composables/useOrderPaymentCashier' import { useSessionStore } from '@/stores/session' @@ -260,25 +261,11 @@ async function handleBuy() { :start-cashier="(payment, onPaid) => cashier.openPaymentCashier(payment, onPaid)" /> - -

选择渠道后将生成对应的支付二维码

-
- - -
-
+ /> - -
- - -
-
+ /> @@ -543,31 +531,7 @@ async function handleSupportClick() { font-size: 12px; } -.pay-way-options { - display: grid; - gap: 10px; -} -.pay-way-option { - display: grid; - gap: 4px; - padding: 14px 16px; - border: 1px solid #e5e7eb; - border-radius: 12px; - background: #fff; - text-align: left; - cursor: pointer; -} -.pay-way-option:hover { - border-color: #ff6a00; -} -.pay-way-option strong { - color: #0f172a; - font-size: 15px; -} -.pay-way-option small { - color: #94a3b8; - font-size: 12px; -} + @media (max-width: 900px) { .shop-layout { diff --git a/frontend/src/features/mohong/views/MohongOrderDetailView.vue b/frontend/src/features/mohong/views/MohongOrderDetailView.vue index 39b5145..d5a20da 100644 --- a/frontend/src/features/mohong/views/MohongOrderDetailView.vue +++ b/frontend/src/features/mohong/views/MohongOrderDetailView.vue @@ -10,6 +10,7 @@ import { startMohongPayment, type MohongOrder, } from '@/features/mohong/api/mohong' +import PayWaySelectDialog from '@/features/orders/components/PayWaySelectDialog.vue' import type { PaymentPayWay } from '@/features/orders/api/orders' import { useOrderPaymentCashier } from '@/features/orders/composables/useOrderPaymentCashier' import { formatCent } from '@/shared/utils/money' @@ -214,24 +215,11 @@ async function copyText() { - -
- - -
-
+ /> +import type { PaymentPayWay } from '@/features/orders/api/orders' + +defineProps<{ + modelValue: boolean +}>() + +const emit = defineEmits<{ + 'update:modelValue': [value: boolean] + choose: [payWay: PaymentPayWay] + closed: [] +}>() + +function choose(payWay: PaymentPayWay) { + emit('choose', payWay) + emit('update:modelValue', false) +} + + + + + + +