From 622bcc0b044d9b9346fda475934e7c5526529c65 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Fri, 17 Jul 2026 17:36:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E5=95=86=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=BC=BA=E7=9C=81=E6=98=BE=E7=A4=BA=20-=20=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E7=94=A8=E5=95=86=E6=88=B7=E5=8F=B7=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

列表/详情商户名统一 mchName || '-'，商户号仅副行/括号展示，避免翻译失败时看起来像名称也是商户号。
---
 .../payment/config/wx-verify/PlatformWxDomainVerifyList.vue | 2 +-
 .../src/views/payment/device/qrcode/DeviceQrCode.vue        | 2 +-
 .../src/views/payment/order/NormalOrderList.vue             | 6 +++---
 apps/daxpay-admin/src/views/payment/order/PayTradeList.vue  | 6 +++---
 .../src/views/payment/order/RefundOrderList.vue             | 6 +++---
 .../src/views/payment/risk/hit/PayRiskHitList.vue           | 2 +-
 .../views/system/sensitive-word/SensitiveWordHitList.vue    | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/daxpay-admin/src/views/payment/config/wx-verify/PlatformWxDomainVerifyList.vue b/apps/daxpay-admin/src/views/payment/config/wx-verify/PlatformWxDomainVerifyList.vue
index e1de61ebe..b7f35651b 100644
--- a/apps/daxpay-admin/src/views/payment/config/wx-verify/PlatformWxDomainVerifyList.vue
+++ b/apps/daxpay-admin/src/views/payment/config/wx-verify/PlatformWxDomainVerifyList.vue
@@ -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>
diff --git a/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue b/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue
index 8c7a86150..975d799b1 100644
--- a/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue
+++ b/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue
@@ -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>
diff --git a/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue b/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue
index acc83a299..0da0f8f00 100644
--- a/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue
+++ b/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue
@@ -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 || '-' }}
diff --git a/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue b/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue
index 7c543b34b..f26716142 100644
--- a/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue
+++ b/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue
@@ -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 || '-' }}
diff --git a/apps/daxpay-admin/src/views/payment/order/RefundOrderList.vue b/apps/daxpay-admin/src/views/payment/order/RefundOrderList.vue
index 8e6138680..db565e02b 100644
--- a/apps/daxpay-admin/src/views/payment/order/RefundOrderList.vue
+++ b/apps/daxpay-admin/src/views/payment/order/RefundOrderList.vue
@@ -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 || '-' }}
diff --git a/apps/daxpay-admin/src/views/payment/risk/hit/PayRiskHitList.vue b/apps/daxpay-admin/src/views/payment/risk/hit/PayRiskHitList.vue
index 4e636f9d4..21c28152f 100644
--- a/apps/daxpay-admin/src/views/payment/risk/hit/PayRiskHitList.vue
+++ b/apps/daxpay-admin/src/views/payment/risk/hit/PayRiskHitList.vue
@@ -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>
diff --git a/apps/daxpay-admin/src/views/system/sensitive-word/SensitiveWordHitList.vue b/apps/daxpay-admin/src/views/system/sensitive-word/SensitiveWordHitList.vue
index 8267e70e0..142dfa91f 100644
--- a/apps/daxpay-admin/src/views/system/sensitive-word/SensitiveWordHitList.vue
+++ b/apps/daxpay-admin/src/views/system/sensitive-word/SensitiveWordHitList.vue
@@ -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>