From dc635de2e9e273866c4cddbf6e7516650daea378 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Fri, 26 Dec 2025 13:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E5=88=99=E7=BB=99=E5=88=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bundle/order/after-sales/after-sales.vue | 4 ++-- .../order/douyin/douyin-order-detail.vue | 4 ++-- src/bundle/order/platform/order-detail.vue | 11 ++++----- src/bundle/order/tea-room/order-detail.vue | 16 +++++++------ src/bundle/tea-room/choose-room-reserve.vue | 4 ++-- src/bundle/tea-room/choose-room.vue | 4 ++-- src/bundle/tea-room/detail.vue | 19 +++++++-------- src/bundle/tea-room/room.vue | 23 ++++++++++++++++--- src/pages/cashier/cashier.vue | 8 +++---- .../share/tea-room/share-order-detail.vue | 4 ++-- 10 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/bundle/order/after-sales/after-sales.vue b/src/bundle/order/after-sales/after-sales.vue index 0c7734f..d5d2a14 100644 --- a/src/bundle/order/after-sales/after-sales.vue +++ b/src/bundle/order/after-sales/after-sales.vue @@ -398,8 +398,8 @@ handleInitComboDetails: async () => { const res = await getTeaRoomPackageOrderDetail({ id: orderId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude') + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, }) comboOrder.value = res.details }, diff --git a/src/bundle/order/douyin/douyin-order-detail.vue b/src/bundle/order/douyin/douyin-order-detail.vue index a2a7d88..5740569 100644 --- a/src/bundle/order/douyin/douyin-order-detail.vue +++ b/src/bundle/order/douyin/douyin-order-detail.vue @@ -127,8 +127,8 @@ handleInit: async () => { const res = await getTeaRoomPackageOrderDetail({ id: orderId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude') + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, }) order.value = res.details title.value = DouYinOrderStatusTextValue[order.value.user_group.status].title || '订单详情' diff --git a/src/bundle/order/platform/order-detail.vue b/src/bundle/order/platform/order-detail.vue index c7e6be2..b3148dc 100644 --- a/src/bundle/order/platform/order-detail.vue +++ b/src/bundle/order/platform/order-detail.vue @@ -149,8 +149,8 @@ - 申请退款 - 立即预定 + 申请退款 + @@ -256,8 +256,8 @@ handleInit: async () => { const res = await getTeaRoomPackageOrderDetail({ id: orderId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude') + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, }) order.value = res.details title.value = GroupComboOrderStatusTextValue[order.value.user_group.status].title || '订单详情' @@ -310,10 +310,9 @@ } }).then((res) => { if (res.action == 'confirm') { - let res = handleRefundOrderHooks(order.value.id, PayOrderType.ComboRefund) + let res = handleRefundOrderHooks(order.value.user_group.id, PayOrderType.ComboRefund) if (res) { OrderDetail.handleInit() - uni.$emit('refreshComboOrderList') } } }).catch(() => { diff --git a/src/bundle/order/tea-room/order-detail.vue b/src/bundle/order/tea-room/order-detail.vue index be42614..b71f120 100644 --- a/src/bundle/order/tea-room/order-detail.vue +++ b/src/bundle/order/tea-room/order-detail.vue @@ -182,7 +182,7 @@ 点击开锁 大门锁 - 手动输入 1052 32# + {{ order.is_lockpwd == 1 ? `手动输入 ${order.gate_key}` : '正在生成密码' }} @@ -191,7 +191,7 @@ 点击开锁 房间锁 - 手动输入 1052 32# + {{ order.is_lockpwd == 1 ? `手动输入 ${order.room_key}` : '正在生成密码' }} @@ -398,7 +398,11 @@ start_time: '', end_time: '', renew_price: 0 - } + }, + is_lockpwd: 0, + gate_key: '', + room_key: '' + }) // 一键续订的时间 @@ -660,12 +664,10 @@ console.log('开始转让订单4', res) uni.removeStorageSync('transferOrder') toast.success('订单接收成功') - router.switchTab('/pages/my/my', 500) + router.redirectTo('/bundle/order/tea-room/order-list', 500) }) } - }).catch(() => { - // 点击取消按钮回调事件 - }) + }).catch(() => {}) }, /** diff --git a/src/bundle/tea-room/choose-room-reserve.vue b/src/bundle/tea-room/choose-room-reserve.vue index 5b99c04..1529774 100644 --- a/src/bundle/tea-room/choose-room-reserve.vue +++ b/src/bundle/tea-room/choose-room-reserve.vue @@ -271,8 +271,8 @@ const res = await getTeaRoomDetail({ id: storeId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude'), + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, room_id: id.value, user_id: userInfo.value.id || 0 }) diff --git a/src/bundle/tea-room/choose-room.vue b/src/bundle/tea-room/choose-room.vue index 0921c28..aa26f91 100644 --- a/src/bundle/tea-room/choose-room.vue +++ b/src/bundle/tea-room/choose-room.vue @@ -147,8 +147,8 @@ handleInit: async () => { const res = await getTeaRoomPackageOrderDetail({ id: groupCouponId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude') + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, }) order.value = res.details console.log("🚀 ~ order.value:", order.value) diff --git a/src/bundle/tea-room/detail.vue b/src/bundle/tea-room/detail.vue index b6f170a..031f68d 100644 --- a/src/bundle/tea-room/detail.vue +++ b/src/bundle/tea-room/detail.vue @@ -285,7 +285,7 @@ import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea' import { getNext7Days, getTeaRoomBalance, createTeaRoomOrder } from '@/api/tea-room' import { CouponType } from '@/utils/coupon' - import { router, toTimes, toPlus, toMinus, randomLabelColor } from '@/utils/tools' + import { router, randomLabelColor } from '@/utils/tools' import type { IUserInfoVo } from '@/api/types/login' import { useUserStore } from '@/store' import { getTeaRoomDetail, createTeaRoomPackageOrder, getTeaRoomPackageDetail, calculateTeaRoomPrice } from '@/api/tea-room' @@ -385,6 +385,7 @@ id.value = Number(args.id) // 在茶室下这个id是包间ID，在团购下是套餐ID teaRoomPrice.value = Number(args.price) || 0 pageType.value = args.type || '' + console.log("🚀 ~ pageType.value:", pageType.value) if (args.type == ReserveServiceCategory.GroupBuying) { isGroupBuying.value = true @@ -412,8 +413,8 @@ const res = await getTeaRoomDetail({ id: storeId.value, - latitude: uni.getStorageSync('latitude'), - longitude: uni.getStorageSync('longitude'), + latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE, + longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE, user_id: userInfo.value.id || 0, room_id: id.value }) @@ -498,9 +499,7 @@ uni.$off('chooseCoupon'); uni.$on('chooseCoupon', params => { - console.log(12312312) uni.$off('chooseCoupon') - console.log("🚀 ~ type:", type) if (type === CouponType.Discount) { selectedCoupon.value = {id: params.coupon.id, name: `${params.coupon.name}减${params.coupon.coupon_price}` } bill.value.coupon = params.coupon.coupon_price @@ -517,8 +516,6 @@ // 获取预定了几个小时 const count = bill.value.service.num - console.log("🚀 ~ bill.value:", bill.value) - console.log("🚀 ~ selectCouponId:", selectCouponId.value) router.navigateTo(`/bundle/coupon/coupon?id=${id.value}&numbers=${count}&type=${type}&storeId=${storeId.value}&couponId=${selectCouponId.value}&groupCouponId=${selectGroupCouponId.value}`) }, @@ -570,13 +567,13 @@ uni.$off("payment") isSubmitting.value = false if (params.result) { + //支付成功提示 uni.redirectTo({ - url: `/pages/notice/reserve?type=${OrderType.TeaRoomOrder}&orderId=${params.orderId}&isGroupBuying=${isGroupBuying.value ? 1 : 0}` + url: `/pages/notice/reserve?type=${OrderType.TeaRoomOrder}&orderId=${params.orderId}&isGroupBuying=${isGroupBuying.value ? 1 : 0}&storeId=${storeId.value}&storeType=${teaRoom.value.operation_type}` }) } else { - if (isGroupBuying.value) { - router.redirectTo(`/bundle/order/platform/order-list`) - } else { + // 支付失败跳转订单列表 + if (!isGroupBuying.value) { router.redirectTo(`/bundle/order/tea-room/order-list?isGroupBuying=${isGroupBuying.value ? 1 : 0}`) } } diff --git a/src/bundle/tea-room/room.vue b/src/bundle/tea-room/room.vue index 7689616..9d394b4 100644 --- a/src/bundle/tea-room/room.vue +++ b/src/bundle/tea-room/room.vue @@ -9,7 +9,15 @@