调试接口
This commit is contained in:
@ -86,7 +86,15 @@
|
||||
</wd-popup>
|
||||
|
||||
<view>
|
||||
<navbar :title="title" custom-class='!bg-[#F6F7F8]'></navbar>
|
||||
<navbar :title="title" custom-class='!bg-[#F6F7F8]' v-if="!shareSource"></navbar>
|
||||
<wd-navbar v-if="shareSource == 'TransferOrder'" safeAreaInsetTop custom-class='!bg-[#F6F7F8]' :bordered="false" placeholder left-text="返回" left-arrow>
|
||||
<template #capsule>
|
||||
<view class="flex items-center">
|
||||
<wd-navbar-capsule @back="router.navigateBack" @back-home="router.reLaunch('/pages/index/index')" />
|
||||
<view class="ml-20rpx">{{title}}</view>
|
||||
</view>
|
||||
</template>
|
||||
</wd-navbar>
|
||||
</view>
|
||||
|
||||
<!-- 描述信息 -->
|
||||
@ -114,8 +122,8 @@
|
||||
</view>
|
||||
<view class="flex-1">
|
||||
<view class="flex justify-between items-center" @click="OrderDetail.handleToStore">
|
||||
<view class="flex items-center font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx">
|
||||
<view class="line-1 w-300rpx">
|
||||
<view class="flex items-center font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx line-1 w-300rpx">
|
||||
<view class="line-1">
|
||||
{{ order.room_msg.title }}
|
||||
</view>
|
||||
<wd-icon name="chevron-right" size="32rpx"></wd-icon>
|
||||
@ -388,8 +396,8 @@
|
||||
}
|
||||
})
|
||||
|
||||
// 一键续订的金额
|
||||
const totalReserveMoney = ref<number>(0)
|
||||
// 一键续订的时间
|
||||
const renewHour = ref<number>(0)
|
||||
|
||||
// 获取当前年月日,格式:YYYY-MM-DD
|
||||
const now = new Date();
|
||||
@ -403,23 +411,31 @@
|
||||
|
||||
onLoad((args) => {
|
||||
shareSource.value = args.shareSource || ''
|
||||
if (args.orderId) {
|
||||
orderId.value = args.orderId
|
||||
orderId.value = args.orderId
|
||||
|
||||
// 这里写判断是因为要处理页面分享出去的时候有这个参数但是没有token会触发网络请求跳转到登录页,再加上页面登录权限路由
|
||||
// 就会出现2次跳转登录页,这个是正常加载订单详情
|
||||
if (args.orderId && shareSource.value != 'TransferOrder') {
|
||||
// 获取订单详情
|
||||
OrderDetail.handleInit()
|
||||
}
|
||||
|
||||
|
||||
// 这个是用户分享登录之后再次进入小程序加载事件
|
||||
const token = uni.getStorageSync('token')
|
||||
|
||||
if (token && shareSource.value === 'TransferOrder') {
|
||||
// 处理转让订单
|
||||
OrderDetail.handleInit()
|
||||
OrderDetail.handleTransferOrder()
|
||||
}
|
||||
|
||||
// 如果是从分享进入的未登录的情况下(TransferOrder),需要转让订单
|
||||
uni.$on('transferOrder', () => {
|
||||
uni.$on('transferOrder', (params) => {
|
||||
// 处理未登录的情况下
|
||||
orderId.value = params?.orderId
|
||||
shareSource.value = params?.shareSource
|
||||
uni.$off('transferOrder')
|
||||
|
||||
OrderDetail.handleInit()
|
||||
OrderDetail.handleTransferOrder()
|
||||
})
|
||||
})
|
||||
@ -443,10 +459,11 @@
|
||||
* 获取订单详情
|
||||
*/
|
||||
handleInit: async () => {
|
||||
// 这里单独处理下经纬度,因为分享的时候没有经纬度
|
||||
const res = await getTeaRoomOrderDetail({
|
||||
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
|
||||
console.log("🚀 ~ order.value :", order.value )
|
||||
@ -515,44 +532,42 @@
|
||||
* 确认一键续订
|
||||
*/
|
||||
handleRenewReserve: async () => {
|
||||
uni.showLoading({ title: '加载中...' })
|
||||
// uni.showLoading({ title: '加载中...' })
|
||||
|
||||
try {
|
||||
await renewTeaRoomOrder({
|
||||
id: orderId.value,
|
||||
start_time: reserveTime.value[2][0],
|
||||
end_time: reserveTime.value[2][reserveTime.value[2].length - 1],
|
||||
renew_hour: reserveTime.value[3],
|
||||
})
|
||||
// try {
|
||||
// await renewTeaRoomOrder({
|
||||
// id: orderId.value,
|
||||
// renew_hour: renewHour,
|
||||
// })
|
||||
|
||||
uni.$on('payment', params => {
|
||||
uni.$off("payment")
|
||||
if (params.result) {
|
||||
OrderDetail.handleInit()
|
||||
showRenewSuccessPopup.value = true
|
||||
} else {
|
||||
message.alert({
|
||||
title: '提示',
|
||||
msg: '您已取消续订',
|
||||
confirmButtonText: '确定',
|
||||
confirmButtonProps: {
|
||||
customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
// uni.$on('payment', params => {
|
||||
// uni.$off("payment")
|
||||
// if (params.result) {
|
||||
// OrderDetail.handleInit()
|
||||
// showRenewSuccessPopup.value = true
|
||||
// } else {
|
||||
// message.alert({
|
||||
// title: '提示',
|
||||
// msg: '您已取消续订',
|
||||
// confirmButtonText: '确定',
|
||||
// confirmButtonProps: {
|
||||
// customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
|
||||
uni.hideLoading()
|
||||
showRenewPopup.value = false
|
||||
// uni.hideLoading()
|
||||
// showRenewPopup.value = false
|
||||
|
||||
router.navigateTo(
|
||||
`/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&renew=renewTeaRoomOrder&orderId=${orderId.value}&teaRoomName=${order.value.store_msg.name}&storeId=${order.value.store_msg.id}`
|
||||
)
|
||||
} catch (err) {
|
||||
uni.hideLoading()
|
||||
toast.info('续订失败')
|
||||
return false
|
||||
}
|
||||
// router.navigateTo(
|
||||
// `/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&renew=renewTeaRoomOrder&orderId=${orderId.value}&teaRoomName=${order.value.store_msg.name}&storeId=${order.value.store_msg.id}`
|
||||
// )
|
||||
// } catch (err) {
|
||||
// uni.hideLoading()
|
||||
// toast.info('续订失败')
|
||||
// return false
|
||||
// }
|
||||
},
|
||||
|
||||
/**
|
||||
@ -587,9 +602,34 @@
|
||||
/**
|
||||
* 修改一键续订时间
|
||||
*/
|
||||
handleChooseRenewTime: (item) => {
|
||||
console.log("🚀 ~ item:", item)
|
||||
handleChooseRenewTime: async (item) => {
|
||||
uni.showLoading({ title: '加载中...', mask: true })
|
||||
|
||||
try {
|
||||
const res = await renewTeaRoomOrder({
|
||||
id: orderId.value,
|
||||
renew_hour: item.value,
|
||||
})
|
||||
|
||||
// 支付后的处理
|
||||
uni.$on('payment', params => {
|
||||
uni.$off("payment")
|
||||
if (params.result) {
|
||||
toast.info('续订成功')
|
||||
} else {
|
||||
toast.info('续订失败')
|
||||
}
|
||||
OrderDetail.handleInit()
|
||||
})
|
||||
|
||||
uni.hideLoading()
|
||||
router.navigateTo(
|
||||
`/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&renew=renewOrder&renewPrice=${res.price}&orderId=${res.order_id}&name=${order.value.store_msg.name}&storeId=${order.value.store_msg.id}`
|
||||
)
|
||||
} catch(e) {
|
||||
uni.hideLoading()
|
||||
return false
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
@ -615,9 +655,9 @@
|
||||
|
||||
transferOrder(orderId.value).then(res => {
|
||||
console.log('开始转让订单4', res)
|
||||
|
||||
uni.removeStorageSync('transferOrder')
|
||||
toast.success('订单接收成功')
|
||||
router.redirectTo('/bundle/order/tea-room/order-list', 500)
|
||||
router.switchTab('/pages/my/my', 500)
|
||||
})
|
||||
}
|
||||
}).catch(() => {
|
||||
|
||||
Reference in New Issue
Block a user