Merge branch 'feature_v2.4.0' into fix-0716-blue-dev

zjk

2026-07-29 429208957f30ab9eedc5533a81aaa284048d09f5

 src/robotaxi/pages/begin-route/components/begin-route-view.tsx

@@ -63,23 +63,21 @@
    backIcon,
    onPersonalCenterEntry,
    onServiceEntry,
    onCouponEntry,
    personalCenter,
    contactService,
    coupon,
  } = useBeginRouteViewContext();

  return (
    <>
      <View onClick={toBack} className='select-city'>
        <Image className='select-city-icon' src={backIcon} />
      <View onClick={toBack} className='back-icon-box'>
        <Image className='back-icon' src={backIcon} />
      </View>
      <View className='map-entry'>
        <Image onClick={onPersonalCenterEntry} className='map-entry-icon' src={personalCenter} />
        <View className='split-line'></View>
        <Image onClick={onServiceEntry} className='map-entry-icon' src={contactService} />
        {/* <View className='split-line'></View>
        <Image onClick={onCouponEntry} className='map-entry-icon' src={coupon} /> */}
         <View className="map-entry-box">
            <Image onClick={onPersonalCenterEntry} className='map-entry-icon' src={personalCenter} />
            <View className='split-line'></View>
            <Image onClick={onServiceEntry} className='map-entry-icon' src={contactService} />
         </View>
      </View>
    </>
  );
@@ -109,6 +107,40 @@
  return (
    <View className='container'>
      <View className='container-inner'>
      {(canToggleRouteSelect ||  showWalkNavigationButton) && (
          <View
            className='select-route-box'
            style={{
              opacity: originBoxHidden ? 0 : originOpacity,
              transition: 'opacity 0.2s ease-out',
              pointerEvents: originBoxHidden ? 'none' : 'auto'
            }}
          >
            {
              showWalkNavigationButton && (
                <Image
                  onClick={handleWalkNavigation}
                  style={{ marginBottom: canToggleRouteSelect ? '8px' : '0px' }}
                  className='walk-icon'
                  src={walkIcon}
                />
              )
            }
            {
              canToggleRouteSelect && (
                <View className='route-icon-box'>
                  {
                    isRouteSelectExpanded ? (
                      <Image onClick={onSelectRouteClick} className='select-route-icon' src={packUpIcon} />
                    ) : (
                      <Image onClick={onSelectRouteClick} className='select-route-icon' src={selectRouteIcon} />
                    )
                  }
                </View>
              )
            }
          </View>
        )}
        {shouldShowOrigin && (
          <View
            className='origin-box'
@@ -118,24 +150,7 @@
              pointerEvents: originBoxHidden ? 'none' : 'auto'
            }}
          >
            {showWalkNavigationButton && (
              <Image
                onClick={handleWalkNavigation}
                style={{ marginBottom: '8px' }}
                className='origin-icon'
                src={walkIcon}
              />
            )}
            <Image onClick={toOrigin} className='origin-icon' src={originIcon} />
            {canToggleRouteSelect && (
              <View>
                {isRouteSelectExpanded ? (
                  <Image onClick={onSelectRouteClick} className='select-route-icon' src={packUpIcon} />
                ) : (
                  <Image onClick={onSelectRouteClick} className='select-route-icon' src={selectRouteIcon} />
                )}
              </View>
            )}
          </View>
        )}
        <View catchMove onClick={(event) => event.stopPropagation()}>