|
|
@@ -5,6 +5,7 @@ import Taro from '@tarojs/taro';
|
|
|
import { useQuery } from '@tanstack/react-query';
|
|
|
import { orderClient } from '@/api';
|
|
|
import { OrderStatus } from '@/types/order.types';
|
|
|
+import { getVehicleTypeText, getTravelModeText } from '@/types/route.types';
|
|
|
import { TabBarLayout } from '@/layouts/tab-bar-layout';
|
|
|
import { Navbar } from '@/components/ui/navbar';
|
|
|
|
|
|
@@ -35,7 +36,7 @@ const OrderCard = ({ order, onViewDetail }) => {
|
|
|
};
|
|
|
|
|
|
// 判断是否为包车订单
|
|
|
- const isCharterOrder = order.routeSnapshot?.vehicleType?.includes('包车') || order.routeSnapshot?.vehicleType?.includes('商务');
|
|
|
+ const isCharterOrder = order.routeSnapshot?.vehicleType === 'business' || order.routeSnapshot?.travelMode === 'charter';
|
|
|
|
|
|
return (
|
|
|
<View
|
|
|
@@ -120,7 +121,19 @@ const OrderCard = ({ order, onViewDetail }) => {
|
|
|
<Text className={`text-[26rpx] flex-1 ${
|
|
|
isCharterOrder ? 'text-white' : 'text-gray-900'
|
|
|
}`}>
|
|
|
- {order.routeSnapshot?.vehicleType || '未知车型'}
|
|
|
+ {getVehicleTypeText(order.routeSnapshot?.vehicleType)}
|
|
|
+ </Text>
|
|
|
+ </View>
|
|
|
+ <View className="flex mb-[16rpx] items-center">
|
|
|
+ <Text className={`text-[26rpx] w-[160rpx] flex-shrink-0 ${
|
|
|
+ isCharterOrder ? 'text-gray-300' : 'text-gray-600'
|
|
|
+ }`}>
|
|
|
+ 出行方式:
|
|
|
+ </Text>
|
|
|
+ <Text className={`text-[26rpx] flex-1 ${
|
|
|
+ isCharterOrder ? 'text-white' : 'text-gray-900'
|
|
|
+ }`}>
|
|
|
+ {getTravelModeText(order.routeSnapshot?.travelMode)}
|
|
|
</Text>
|
|
|
</View>
|
|
|
<View className="flex items-center">
|