diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue index fca1762..f65bee4 100644 --- a/src/pages/order/order.vue +++ b/src/pages/order/order.vue @@ -11,6 +11,41 @@ - - - - - - + + + + + + @@ -35,7 +70,6 @@ - @@ -95,47 +129,6 @@ - - - - - - - - - - - - - - - - - 高德地图 - - - - 腾讯地图 - - - - 苹果地图 - - - - - - - - 取消 - - - - @@ -145,6 +138,7 @@ import { router } from '@/utils/tools' import { onPageScroll, onReachBottom } from '@dcloudio/uni-app' import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js" + import { TeaSpecialistManageOrderStatusText } from '@/utils/order' const OSS = inject('OSS') @@ -399,16 +393,16 @@ // 点击订单跳转到详情页 function handleOrderClick(order: any) { - console.log('点击订单', order) - if (order.status === 'pending') { - router.navigateTo(`/pages/order/pending-order-detail?id=${order.id}`) - } - else if (order.status === 'waiting' || order.status === 'waiting_arrived') { - router.navigateTo(`/pages/order/waiting-service-detail?id=${order.id}`) - } - else if (order.status === 'cancelled') { - router.navigateTo(`/pages/order/cancelled-order-detail?id=${order.id}`) - } + router.navigateTo(`/pages/order/detail?orderId=${order.id}`) + // if (order.status === 'pending') { + // router.navigateTo(`/pages/order/pending-order-detail?id=${order.id}`) + // } + // else if (order.status === 'waiting' || order.status === 'waiting_arrived') { + // router.navigateTo(`/pages/order/waiting-service-detail?id=${order.id}`) + // } + // else if (order.status === 'cancelled') { + // router.navigateTo(`/pages/order/cancelled-order-detail?id=${order.id}`) + // } } // 选择地图应用 diff --git a/src/pages/order/pending-order-detail.vue b/src/pages/order/pending-order-detail.vue index daea7df..67b3730 100644 --- a/src/pages/order/pending-order-detail.vue +++ b/src/pages/order/pending-order-detail.vue @@ -8,31 +8,124 @@ @@ -259,6 +268,9 @@ import { copy } from '@/utils/tools' const OSS = inject('OSS') +// 订单备注 +const showOrderMarksPopup = ref(false) + // 消息提示框 const message = useMessage('wd-message-box-slot') @@ -427,20 +439,10 @@ onUnload(() => { diff --git a/src/utils/order.ts b/src/utils/order.ts index 4e264cb..661089b 100644 --- a/src/utils/order.ts +++ b/src/utils/order.ts @@ -381,3 +381,44 @@ export const AdminOrderStatusValue: Record = { + [TeaSpecialistManageOrderStatus.PendingOrder]: { + title: '待接单' + }, + [TeaSpecialistManageOrderStatus.PendingService]: { + title: ' 待服务' + }, + [TeaSpecialistManageOrderStatus.Service]: { + title: '服务中' + }, + [TeaSpecialistManageOrderStatus.Finished]: { + title: '服务完成' + }, + [TeaSpecialistManageOrderStatus.Cancelled]: { + title: '订单取消' + }, +}