H5/xp-robotaxi-web.git

小鹏运营管理后台

parent: 682fe8fa | 补丁 | 提交 | ignore whitespace

Merge origin/feat-0804-bugfixw into feat/deploy-uat

ai-coding

2026-08-04 3248fc6f134369d106d97b3c80e4c34d5888dea9

Merge origin/feat-0804-bugfixw into feat/deploy-uat

# Conflicts:
#	locales/en_US.json
#	locales/zh_CN.json
#	src/views/transaction/order/orderManagement/index.vue

Co-Authored-By: 武世龙 <wusl13@xiaopeng.com>

3个文件已修改

	locales/en_US.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	locales/zh_CN.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/transaction/order/orderManagement/index.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 locales/en_US.json

@@ -391,7 +391,7 @@
    "pickupTime": "乘车时间",
    "userNickname": "下单用户昵称",
    "userPhone": "下单用户手机",
    "userRealName": "姓名",
    "userRealName": "用户姓名",
    "pickupLocation": "起点",
    "dropoffLocation": "终点",
    "selectedVehicleType": "选择车型",

 locales/zh_CN.json

@@ -391,7 +391,7 @@
    "pickupTime": "乘车时间",
    "userNickname": "下单用户昵称",
    "userPhone": "下单用户手机",
    "userRealName": "姓名",
    "userRealName": "用户姓名",
    "pickupLocation": "起点",
    "dropoffLocation": "终点",
    "selectedVehicleType": "选择车型",

 src/views/transaction/order/orderManagement/index.vue

@@ -326,6 +326,7 @@
    key: 'realName',
    width: 120,
    resizable: true,
    render: row => row.realName || '-',
  },
  {
    title: t('transaction.pickupLocation'),

			@@ -391,7 +391,7 @@
			"pickupTime": "乘车时间",
			"userNickname": "下单用户昵称",
			"userPhone": "下单用户手机",
			"userRealName": "姓名",
			"userRealName": "用户姓名",
			"pickupLocation": "起点",
			"dropoffLocation": "终点",
			"selectedVehicleType": "选择车型",

			@@ -326,6 +326,7 @@
			key: 'realName',
			width: 120,
			resizable: true,
			render: row => row.realName \|\| '-',
			},
			{
			title: t('transaction.pickupLocation'),