From 3a29229098a687e32a07ee28949c7e97c631ea7b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 15 May 2024 09:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/merchant/merchant/index.vue | 3 ++-
 src/views/data/user/user/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/data/merchant/merchant/index.vue b/src/views/data/merchant/merchant/index.vue
index a1dc140..0246251 100644
--- a/src/views/data/merchant/merchant/index.vue
+++ b/src/views/data/merchant/merchant/index.vue
@@ -114,7 +114,8 @@
                             <dict-value :options="dictData.merchat_type" :value="row.type_id" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="商户名称" prop="mer_name" show-overflow-tooltip />
+                    <el-table-column label="商户名称" prop="mer_name" show-overflow-tooltip width="200" />
+                    <el-table-column label="用户id" prop="uid" show-overflow-tooltip />
                     <el-table-column label="是否支持先货后款" prop="credit_buy" width="160">
                         <template #default="{ row }">
                             <dict-value :options="dictData.show_status" :value="row.credit_buy" />
diff --git a/src/views/data/user/user/index.vue b/src/views/data/user/user/index.vue
index 48b9621..93082d0 100644
--- a/src/views/data/user/user/index.vue
+++ b/src/views/data/user/user/index.vue
@@ -37,8 +37,8 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <!-- <el-table-column label="主键" prop="id" show-overflow-tooltip /> -->
-                    <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
+                    <el-table-column label="ID" prop="id" width="100" />
+                    <el-table-column label="头像" prop="avatar" width="60">
                         <template #default="{ row }">
                             <el-image :src="row.avatar" style="width: 50px;height: 50px" />
                         </template>