diff --git a/src/pages-order/order/components/OrderQrcode/index.vue b/src/pages-order/order/components/OrderQrcode/index.vue index 12c2831..12d19e4 100644 --- a/src/pages-order/order/components/OrderQrcode/index.vue +++ b/src/pages-order/order/components/OrderQrcode/index.vue @@ -1,22 +1,50 @@ - + diff --git a/src/pages-order/order/components/OrderQrcode/styles/index.scss b/src/pages-order/order/components/OrderQrcode/styles/index.scss new file mode 100644 index 0000000..57425d5 --- /dev/null +++ b/src/pages-order/order/components/OrderQrcode/styles/index.scss @@ -0,0 +1,9 @@ +.refund-popup { + border-radius: 15px 15px 0 0; + padding-bottom: 40px; +} + +.close { + top: 14px; + right: 12px; +} diff --git a/src/pages-order/order/components/VoucherList/index.vue b/src/pages-order/order/components/VoucherList/index.vue index f36ecc8..2ef1b41 100644 --- a/src/pages-order/order/components/VoucherList/index.vue +++ b/src/pages-order/order/components/VoucherList/index.vue @@ -4,19 +4,39 @@ 核销凭证列表 - + - 森系天幕租赁(3h) + {{ item.name }} - 总计2份 - 剩2份可用 + 总计{{ item.count }}{{item.unit}} + 剩{{ item.count - item.writeOffCount }}{{item.unit}}可用 - + 出示凭证 - - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/pages-order/order/detail.vue b/src/pages-order/order/detail.vue index d26fea4..ab4d53f 100644 --- a/src/pages-order/order/detail.vue +++ b/src/pages-order/order/detail.vue @@ -2,39 +2,26 @@ - + - - - + - + - + + + + @@ -57,8 +44,27 @@ import RefundPopup from "@/components/RefundPopup/index.vue"; const refundVisible = ref(false); const orderData = ref({}); +const visbleQrcode = ref(false); +const selectedVoucher = ref(null); +const selectedVoucherIndex = ref(0); + onLoad(({ orderId }) => getOrderDetail(orderId)); +// 处理选中核销凭证事件 +const handleSelectedVoucher = (voucher, index) => { + console.log("选中的核销凭证:", voucher); + selectedVoucher.value = voucher; + selectedVoucherIndex.value = index; + visbleQrcode.value = true; +} + +// 关闭核销凭证二维码弹窗 +const handleClose = () => { + visbleQrcode.value = false; + selectedVoucher.value = null; + selectedVoucherIndex.value = 0; +}; + // 获取订单详情 const getOrderDetail = async (orderId) => { const res = await userOrderDetail({ orderId });