Merge branch 'dev' into develop

zjk

2026-03-05 891278cc9bb8b6ac40abc0d030b06a0ab4f60bd2

Merge branch 'dev' into develop

 src/app.config.ts

@@ -44,46 +44,46 @@
    },
  ];

  tabBar = {
    position: 'bottom',
    color: '#B2B2B2',
    selectedColor: '#000000',
    backgroundColor: '#fff',
    borderStyle: 'white',
    custom: false,
    list: [
      // {
      //   pagePath: 'pages/home/index',
      //   text: '发现',
      //   iconPath: './assets/tabbar/tab_icon_home.png',
      //   selectedIconPath: './assets/tabbar/tab_icon_home_act.png',
      // },
      {
        pagePath: 'pages/robotaxi/home/index',
        text: 'Robotaxi',
        iconPath: './assets/tabbar/tab_icon_drive.png',
        selectedIconPath: './assets/tabbar/tab_icon_drive_act.png',
      },
      {
        pagePath: 'pages/xpeng/index',
        text: '购车',
        iconPath: './assets/tabbar/tab_icon_buy.png',
        selectedIconPath: './assets/tabbar/tab_icon_buy_act.png',
      },
      {
        pagePath: 'pages/map/index',
        text: '充电',
        iconPath: './assets/tabbar/tab_icon_map.png',
        selectedIconPath: './assets/tabbar/tab_icon_map_act.png',
      },
      {
        pagePath: 'pages/user/index',
        text: '我的',
        iconPath: './assets/tabbar/tab_icon_mine.png',
        selectedIconPath: './assets/tabbar/tab_icon_mine_act.png',
      },
    ],
  };
  // tabBar = {
  //   position: 'bottom',
  //   color: '#B2B2B2',
  //   selectedColor: '#000000',
  //   backgroundColor: '#fff',
  //   borderStyle: 'white',
  //   custom: false,
  //   list: [
  //     // {
  //     //   pagePath: 'pages/home/index',
  //     //   text: '发现',
  //     //   iconPath: './assets/tabbar/tab_icon_home.png',
  //     //   selectedIconPath: './assets/tabbar/tab_icon_home_act.png',
  //     // },
  //     {
  //       pagePath: 'pages/robotaxi/home/index',
  //       text: 'Robotaxi',
  //       iconPath: './assets/tabbar/tab_icon_drive.png',
  //       selectedIconPath: './assets/tabbar/tab_icon_drive_act.png',
  //     },
  //     {
  //       pagePath: 'pages/xpeng/index',
  //       text: '购车',
  //       iconPath: './assets/tabbar/tab_icon_buy.png',
  //       selectedIconPath: './assets/tabbar/tab_icon_buy_act.png',
  //     },
  //     {
  //       pagePath: 'pages/map/index',
  //       text: '充电',
  //       iconPath: './assets/tabbar/tab_icon_map.png',
  //       selectedIconPath: './assets/tabbar/tab_icon_map_act.png',
  //     },
  //     {
  //       pagePath: 'pages/user/index',
  //       text: '我的',
  //       iconPath: './assets/tabbar/tab_icon_mine.png',
  //       selectedIconPath: './assets/tabbar/tab_icon_mine_act.png',
  //     },
  //   ],
  // };

  plugins = {
  };
@@ -127,9 +127,9 @@
  },
}

if (process.env.TARO_ENV !== 'jd') {
  config.tabBar = tabBar;
}
// if (process.env.TARO_ENV !== 'jd') {
//   config.tabBar = tabBar;
// }

if (process.env.TARO_ENV === 'alipay') {
  config.window.allowsBounceVertical = 'NO';

 src/robotaxi/pages/begin-route/components/cancel-popup.tsx

@@ -77,6 +77,12 @@
                </View>
                <View className='cancel-tip-box'>
                    <View className='cancel-tip-box-title'>{STATUS_MAP[cancelType].title}</View>
                    {
                        ((discountAmountValue > 0 && cancelType === 1) || cancelType !== 1) &&
                        <View className='cancel-tip-box-desc color1'>
                            本单限时优惠{discountAmountValue}元，重新叫车可能等待更久
                        </View>
                    }
                    <View className={`cancel-tip-box-desc ${cancelType === 4 && 'color1'}`}>{STATUS_MAP[cancelType].tip}</View>
                </View>
                {

 src/robotaxi/pages/begin-route/index.tsx

@@ -1077,7 +1077,7 @@
      clearOrderTripStorage();
      Taro.removeStorageSync('endSite');
    }
    Taro.switchTab({
    Taro.reLaunch({
      url: '/pages/robotaxi/home/index'
    })
  }

 src/robotaxi/pages/select-map-site/index.tsx

@@ -448,8 +448,8 @@
                  }
                  <ScrollView className="site-list" scrollY>
                    {
                      nearbySites.map((item, index) => (
                        <View onClick={() => changeChildrenSite(item)} key={index} className={`site-name ${selectedSite.name == item.name && 'site-active'}`}>{item.name}</View>
                      nearbySites.map(item => (
                        <View onClick={() => changeChildrenSite(item)} key={item.id} className={`site-name ${selectedSite.id == item.id && 'site-active'}`}>{item.name}</View>
                      ))
                    }
                  </ScrollView>

 src/robotaxi/pages/site-search/index.tsx

@@ -287,7 +287,7 @@
                    <View className='history-name'>{item.name || '_'}</View>
                    <View className='history-address-box'>
                      <View className='history-address'>{item.address || '-'}</View>
                      <View className='history-distance'>{item.distance}</View>
                      <View className='history-distance'>{item.distance}km</View>
                    </View>
                  </View>
                </View>