From 98d1455efaa4cd3d5d3213e047ccc0ac187ba05c Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期一, 03 八月 2026 17:30:53 +0800
Subject: [PATCH] feat(admin): 添加政策文章管理和商户功能增强
---
talent-card-admin/src/views/MerchantView.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/talent-card-admin/src/views/MerchantView.vue b/talent-card-admin/src/views/MerchantView.vue
index 1bc82dc..de59679 100644
--- a/talent-card-admin/src/views/MerchantView.vue
+++ b/talent-card-admin/src/views/MerchantView.vue
@@ -15,7 +15,7 @@
const merchants = ref<Merchant[]>([])
const selectedCreateType = ref('餐饮服务')
-const createMerchantTypes = ['餐饮服务', '电影院', '大剧院', '酒店服务']
+const createMerchantTypes = ['餐饮服务', '电影院', '大剧院', '酒店服务', '景区服务']
const merchantTypes = [
'餐饮服务',
'电影院',
@@ -83,6 +83,10 @@
function displayDash(value?: string | number) {
if (value === undefined || value === null || value === '') return '-'
return value
+}
+
+function formatDisplayTime(value?: string) {
+ return value ? value.replace('T', ' ') : '-'
}
async function loadData() {
@@ -215,7 +219,7 @@
<el-form class="merchant-filter-form" :model="filters" label-width="74px">
<el-form-item label="商家">
- <el-input v-model="filters.keyword" placeholder="请输入商家名称" clearable />
+ <el-input v-model="filters.keyword" placeholder="请输入商家名称，支持模糊查询" clearable @keyup.enter="search" />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="filters.contactMobile" placeholder="请输入商家联系电话" clearable />
@@ -284,7 +288,9 @@
<el-table-column prop="reservationCount" label="预约总数" width="76" align="center">
<template #default="{ row }">{{ displayDash(row.reservationCount) }}</template>
</el-table-column>
- <el-table-column prop="createdAt" label="创建时间" width="120" align="center" />
+ <el-table-column label="创建时间" width="140" align="center">
+ <template #default="{ row }">{{ formatDisplayTime(row.createdAt) }}</template>
+ </el-table-column>
<el-table-column label="是否推荐" width="82" align="center">
<template #default="{ row }">{{ recommendText(row.isRecommend) }}</template>
</el-table-column>
--
Gitblit v1.7.1