Merge origin/fix-0806-real-name into release-1.3.1 [ai-coding] [武世龙]

ai-coding

2026-08-13 b07cfacdcdb46dbd39ac00ecfb4793dc135db17f

Merge origin/fix-0806-real-name into release-1.3.1
[ai-coding] [武世龙]

 .kiro/k8s/generated-files.json

New file
@@ -0,0 +1,5 @@
[
  ".kiro/lark-doc-implement",
  ".kiro/lark-wiki-dev",
  ".kiro/lark-wiki-dev_084245"
]

 .kiro/lark-doc-implement/specs/design.md

 .kiro/lark-doc-implement/specs/requirements.md

 .kiro/lark-doc-implement/specs/summary.md

 .kiro/lark-doc-implement/specs/tasks.md

 .kiro/lark-doc-implement/tests/test-cases.md

 .kiro/lark-doc-implement/tests/test-report.md

 .kiro/lark-wiki-dev/specs/design.md

 .kiro/lark-wiki-dev/specs/requirements.md

 .kiro/lark-wiki-dev/specs/summary.md

 .kiro/lark-wiki-dev/specs/tasks.md

 .kiro/lark-wiki-dev/tests/TC-001-1-page-load.png

 .kiro/lark-wiki-dev/tests/TC-002-1-kpi-cards.png

 .kiro/lark-wiki-dev/tests/TC-003-1-status-weather-clock.png

 .kiro/lark-wiki-dev/tests/TC-004-1-map.png

 .kiro/lark-wiki-dev/tests/TC-005-1-layer-control.png

 .kiro/lark-wiki-dev/tests/TC-006-1-legend.png

 .kiro/lark-wiki-dev/tests/TC-007-1-layout-1280x720.png

 .kiro/lark-wiki-dev/tests/TC-007-2-layout-1920x1080.png

 .kiro/lark-wiki-dev/tests/TC-008-1-network.png

 .kiro/lark-wiki-dev/tests/e2e-test.cjs

 .kiro/lark-wiki-dev/tests/test-cases.md

 .kiro/lark-wiki-dev/tests/test-report.md

 .kiro/lark-wiki-dev/tests/test-results.json

 .kiro/lark-wiki-dev_084245/specs/requirements.md

copy from .kiro/specs/lark-wiki-dev/requirements.md
copy to .kiro/lark-wiki-dev_084245/specs/requirements.md

 .kiro/specs/lark-wiki-dev_084245/requirements.md

File was deleted

 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/detail.vue

@@ -219,6 +219,12 @@
                  }}</span>
                </div>
              </n-gi>
              <n-gi v-if="type !== 'cruise'">
                <div class="info-item">
                  <span class="label">用户姓名：</span><span class="value">{{ model.realName || '-'
                  }}</span>
                </div>
              </n-gi>
              <n-gi>
                <div class="info-item">
                  <span class="label">起点：</span><span class="value">{{ model.startPointName || model.startAddress || '-'

 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'),

 src/views/userContent/whitelistManagement/whitelist/detail.vue

@@ -41,6 +41,7 @@
// 基础信息数据
const basicInfoData = ref({
  userName: '',
  realName: '',
  whitelistAccount: '',
  status: '',
  isPriorityDispatch: '',
@@ -85,6 +86,7 @@
    if (code === 200 && data) {
      basicInfoData.value = {
        userName: data.nickName || '',
        realName: data.realName || '',
        whitelistAccount: data.account || '',
        status: data.status ? '正常' : '冻结',
        isPriorityDispatch: data.isPriorityDispatch ? '是' : '否',
@@ -685,6 +687,13 @@
    resizable: true,
  },
  {
    title: '下单用户姓名',
    key: 'realName',
    width: 120,
    resizable: true,
    render: row => <span>{row.realName || '-'}</span>,
  },
  {
    title: '起点',
    key: 'startPointName',
    width: 160,
@@ -904,9 +913,15 @@
              <span class="info-value">{{ basicInfoData.userName || '-' }}</span>
            </div>
            <div class="info-item">
              <span class="info-label">用户姓名：</span>
              <span class="info-value">{{ basicInfoData.realName || '-' }}</span>
            </div>
            <div class="info-item">
              <span class="info-label">白名单账号：</span>
              <span class="info-value">{{ basicInfoData.whitelistAccount || '-' }}</span>
            </div>
          </div>
          <div class="info-row">
            <div class="info-item">
              <span class="info-label">状态：</span>
              <span class="info-value">
@@ -915,8 +930,6 @@
                </NTag>
              </span>
            </div>
          </div>
          <div class="info-row">
            <div class="info-item">
              <span class="info-label">是否优先派单：</span>
              <span class="info-value">{{ basicInfoData.isPriorityDispatch || '-' }}</span>
@@ -925,12 +938,12 @@
              <span class="info-label">有效期：</span>
              <span class="info-value">{{ basicInfoData.expireDate || '-' }}</span>
            </div>
          </div>
          <div class="info-row">
            <div class="info-item">
              <span class="info-label">最大下单数量：</span>
              <span class="info-value">{{ basicInfoData.maxOrderCount || '-' }}</span>
            </div>
          </div>
          <div class="info-row">
            <div class="info-item">
              <span class="info-label">创建人：</span>
              <span class="info-value">{{ basicInfoData.creator || '-' }}</span>
@@ -939,7 +952,6 @@
              <span class="info-label">创建时间：</span>
              <span class="info-value">{{ basicInfoData.createTime || '-' }}</span>
            </div>
            <div class="info-item" />
          </div>
        </div>
      </div>
@@ -1039,7 +1051,7 @@
              <NDataTable
                v-model:checked-row-keys="selectedOrderRowKeys" :columns="orderColumns" :data="orderRecords"
                :row-props="getOrderRowProps" :row-class-name="getOrderRowClassName"
                :row-key="(row) => row.id" class="flex-1" flex-height striped :scroll-x="1620" :bordered="false"
                :row-key="(row) => row.id" class="flex-1" flex-height striped :scroll-x="1740" :bordered="false"
              >
                <template #empty>
                  <div class="flex-center">

 src/views/userContent/whitelistManagement/whitelist/index.vue

@@ -38,6 +38,7 @@
  whitelistSource: null, // 来源
  status: null, // 冻结状态
  nickName: '', // 用户名称
  realName: '', // 用户姓名（小鹏员工真实姓名）
  isPriorityDispatch: null, // 优先派单
  expireTimeRange: null as [number, number] | null, // 有效期
  minMaxOrderNum: '', // 最大下单数量最小值
@@ -214,6 +215,11 @@
    render: () => <n-input v-model:value={model.value.nickName} placeholder="请输入" clearable />,
  },
  {
    label: '用户姓名',
    path: 'realName',
    render: () => <n-input v-model:value={model.value.realName} placeholder="请输入" clearable />,
  },
  {
    label: '优先派单',
    path: 'isPriorityDispatch',
    render: () => (
@@ -346,6 +352,15 @@
    ellipsis: true,
    resizable: true,
    width: 180,
  },
  {
    title: '用户姓名',
    align: 'left',
    key: 'realName',
    ellipsis: true,
    resizable: true,
    width: 180,
    render: row => <span>{row.realName || '-'}</span>,
  },
  {
    title: '白名单账号',
@@ -522,6 +537,7 @@
    whitelistSource: model.value.whitelistSource ?? undefined,
    status: model.value.status ?? undefined,
    nickName: model.value.nickName?.trim() || undefined,
    realName: model.value.realName?.trim() || undefined,
    isPriorityDispatch: model.value.isPriorityDispatch ?? undefined,
    maxOrderNumMin: model.value.minMaxOrderNum ? Number(model.value.minMaxOrderNum) : undefined,
    maxOrderNumMax: model.value.maxMaxOrderNum ? Number(model.value.maxMaxOrderNum) : undefined,
@@ -868,7 +884,7 @@
          :loading="loading"
          :row-props="getRowProps"
          :row-class-name="getRowClassName"
          :scroll-x="1490"
          :scroll-x="1670"
          :row-key="(row: any) => row.id"
          flex-height
          :bordered="false"