Merge branch 'fix-0731hhw' into 'feature_v2.4.0'

liaof

2026-07-31 150a944d95cc70dba1f8f2fc0cdeebdc6256317b

Merge branch 'fix-0731hhw' into 'feature_v2.4.0'

预计等待时间修改 (何宏文)

See merge request robotaxi1/xp-robotaxi-miniprogram!232

 src/robotaxi/pages/begin-route/components/calling-car-modules/trip-status-header.tsx

@@ -153,7 +153,8 @@
          <View className='calling-car-content'>
            <View className='calling-car-content-main'>
              <View className='calling-car-content-title calling-car-content-title--strong'>
                预计{displayedWaitMinutes ?? '-'}分钟内有车应答
                {/* 预计{displayedWaitMinutes ?? '-'}分钟内有车应答 */}
                预计{waitMinutes}分钟内有车应答
              </View>
              <View className='calling-car-content-desc'>
                正全力为您叫车中...
@@ -167,7 +168,8 @@
            </View>
            <View
              className='calling-car-cancel-btn'
              onClick={() => handleOpenCancelPopup?.({ durationDisplay, waitMinutes: displayedWaitMinutes })}
              // onClick={() => handleOpenCancelPopup?.({ durationDisplay, waitMinutes: displayedWaitMinutes })}
              onClick={() => handleOpenCancelPopup?.({ durationDisplay, waitMinutes })}
            >
              取消行程
            </View>

 src/robotaxi/pages/begin-route/hooks/use-order-cancel.ts

@@ -177,6 +177,7 @@
   */
  const handleOpenCancelPopupByTripStatus = (status: TripStatus, displayInfo?: any) => {
    const waitMinutes = Number(displayInfo?.waitMinutes);
    // if ([TripStatus.CallingCar, TripStatus.VehicleApproaching].includes(status) && Number.isFinite(waitMinutes)) {
    if (status === TripStatus.VehicleApproaching && Number.isFinite(waitMinutes)) {
      deps.setCancelPopupWaitMinutes(waitMinutes);
    } else {