fix(admin): 商户名称缺省显示 - 不再用商户号兜底

列表/详情商户名统一 mchName || '-',商户号仅副行/括号展示,避免翻译失败时看起来像名称也是商户号。
This commit is contained in:
DaxPay Dev
2026-07-17 17:36:21 +08:00
parent be9c63ba85
commit 622bcc0b04
7 changed files with 13 additions and 13 deletions

View File

@@ -235,7 +235,7 @@
<template #default="{ row }">
<template v-if="row.platform">-</template>
<div v-else class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>

View File

@@ -341,7 +341,7 @@
<vxe-column field="mchName" :title="$t('payment.device.qrcode.field.merchant')" :min-width="160">
<template #default="{ row }">
<div v-if="row.mchNo" class="flex flex-col">
<span>{{ row.mchName || row.mchNo }}</span>
<span>{{ row.mchName || '-' }}</span>
<span class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
<a-tag v-else color="default">{{ $t('payment.device.qrcode.unbound') }}</a-tag>

View File

@@ -420,7 +420,7 @@
<vxe-column field="mchName" :title="$t('payment.order.field.merchant')" :min-width="160">
<template #default="{ row }">
<div class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>
@@ -500,8 +500,8 @@
<a-divider orientation="left" plain>{{ $t('payment.order.normal.detail') }}</a-divider>
<a-descriptions :column="2" size="small" bordered>
<a-descriptions-item :label="$t('payment.order.field.merchant')">
{{ detail.mchName || detail.mchNo || '-' }}
<span v-if="detail.mchName && detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
{{ detail.mchName || '-' }}
<span v-if="detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
</a-descriptions-item>
<a-descriptions-item :label="$t('payment.order.field.bizOrderNo')">
{{ detail.bizOrderNo || '-' }}

View File

@@ -261,7 +261,7 @@
<vxe-column field="mchName" :title="$t('payment.order.field.merchant')" :min-width="160">
<template #default="{ row }">
<div class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>
@@ -345,8 +345,8 @@
<a-divider orientation="left" plain>{{ $t('payment.order.trade.detail') }}</a-divider>
<a-descriptions :column="2" size="small" bordered>
<a-descriptions-item :label="$t('payment.order.field.merchant')">
{{ detail.mchName || detail.mchNo || '-' }}
<span v-if="detail.mchName && detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
{{ detail.mchName || '-' }}
<span v-if="detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
</a-descriptions-item>
<a-descriptions-item :label="$t('payment.order.field.tradeNo')">
{{ detail.tradeNo || '-' }}

View File

@@ -207,7 +207,7 @@
<vxe-column field="mchName" :title="$t('payment.order.field.merchant')" :min-width="160">
<template #default="{ row }">
<div class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>
@@ -285,8 +285,8 @@
<a-spin :spinning="drawerLoading">
<a-descriptions :column="2" size="small" bordered>
<a-descriptions-item :label="$t('payment.order.field.merchant')">
{{ detail.mchName || detail.mchNo || '-' }}
<span v-if="detail.mchName && detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
{{ detail.mchName || '-' }}
<span v-if="detail.mchNo" class="text-muted-foreground"> ({{ detail.mchNo }})</span>
</a-descriptions-item>
<a-descriptions-item :label="$t('payment.order.field.refundNo')">
{{ detail.refundNo || '-' }}

View File

@@ -169,7 +169,7 @@
<vxe-column field="mchName" :title="$t('payment.risk.hit.field.merchant')" :min-width="160">
<template #default="{ row }">
<div class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>

View File

@@ -178,7 +178,7 @@
<vxe-column field="mchName" :title="$t('system.sensitiveWord.hit.field.merchant')" :min-width="160">
<template #default="{ row }">
<div class="flex flex-col">
<span>{{ row.mchName || row.mchNo || '-' }}</span>
<span>{{ row.mchName || '-' }}</span>
<span v-if="row.mchNo" class="text-xs text-muted-foreground">{{ row.mchNo }}</span>
</div>
</template>