From c5a63165aca6468157e0b4807d511e828de2076a Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期三, 16 九月 2026 16:07:33 +0800
Subject: [PATCH] 再次更新
---
talent-card-admin/src/views/MerchantView.vue | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/talent-card-admin/src/views/MerchantView.vue b/talent-card-admin/src/views/MerchantView.vue
index c9925f5..4d06d37 100644
--- a/talent-card-admin/src/views/MerchantView.vue
+++ b/talent-card-admin/src/views/MerchantView.vue
@@ -122,9 +122,37 @@
}
const productTabTypeCodes = new Set(['food', 'scenic', 'hotel', 'dental', 'medical'])
+const merchantTypeDisplayNames: Record<string, string> = {
+ food: '餐饮服务',
+ scenic: '景区服务',
+ hotel: '酒店服务',
+ apartment: '公寓租赁',
+ carWash: '自助洗车',
+ medical: '免费体检',
+ parking: '停车服务',
+ fuel: '加油服务',
+ children: '子女托管',
+ finance: '金融服务',
+ employment: '配偶推荐就业',
+ approval: '行政审批',
+ cinema: '观影服务',
+ housing: '购房优惠',
+ car: '购车服务',
+ appliance: '家电服务',
+ digital: '数码服务',
+ culture: '文化服务',
+ telecom: '电信服务',
+ dental: '口腔治疗保健',
+}
+
function resolveMerchantTypeCode(row: Merchant) {
const raw = String(row.merchantTypeCode || row.merchantType || '').trim()
return merchantTypeAliases[raw] || raw
+}
+
+function displayMerchantType(row: Merchant) {
+ const code = resolveMerchantTypeCode(row)
+ return merchantTypeDisplayNames[code] || displayDash(row.merchantType)
}
function parseMerchantRights(config: Merchant['merchantRightsConfig']) {
@@ -371,7 +399,7 @@
<template #default="{ row }">{{ displayDash(row.address) }}</template>
</el-table-column>
<el-table-column prop="merchantType" label="商家类型" width="112">
- <template #default="{ row }">{{ displayDash(row.merchantType) }}</template>
+ <template #default="{ row }">{{ displayMerchantType(row) }}</template>
</el-table-column>
<el-table-column prop="orderCount" label="订单总数" width="76" align="center">
<template #default="{ row }">{{ displayDash(row.orderCount) }}</template>
@@ -391,13 +419,21 @@
<el-table-column label="状态" width="68" align="center">
<template #default="{ row }">{{ statusText(row.status) }}</template>
</el-table-column>
- <el-table-column label="操作" width="174" fixed="right" align="center">
+ <el-table-column label="操作" width="220" fixed="right" align="center">
<template #default="{ row }">
- <el-button v-permission="'admin.merchants.disable'" link :type="row.status === 0 ? 'success' : 'danger'" @click="toggleStatus(row)">
- {{ row.status === 0 ? '启用' : '禁用' }}
- </el-button>
- <el-button v-if="supportsGroupBuying(row)" link type="primary" :icon="Goods" @click="openProducts(row)">团购管理</el-button>
- <el-button v-permission="'admin.merchants.edit'" link type="primary" :icon="Edit" @click="openEdit(row)">编辑</el-button>
+ <div class="merchant-action-cell">
+ <div>
+ <el-button v-permission="'admin.merchants.disable'" link :type="row.status === 0 ? 'success' : 'danger'" @click="toggleStatus(row)">
+ {{ row.status === 0 ? '启用' : '禁用' }}
+ </el-button>
+ </div>
+ <div>
+ <el-button v-permission="'admin.merchants.edit'" link type="primary" :icon="Edit" @click="openEdit(row)">编辑</el-button>
+ </div>
+ <div>
+ <el-button v-if="supportsGroupBuying(row)" link type="primary" :icon="Goods" @click="openProducts(row)">团购管理</el-button>
+ </div>
+ </div>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.7.1