From 721fc5c0266d3a45762ea96d622fdfeedbd16486 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 11 Oct 2023 11:04:03 +0800
Subject: [PATCH] =?UTF-8?q?code=20review=EF=BC=9A=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 855b37c1ab2eb1191b668afc2f0dc37082713822)
---
 .../record/CombinationRecordListDialog.vue    | 43 +++++--------------
 .../promotion/combination/record/index.vue    | 22 ++++++----
 2 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/src/views/mall/promotion/combination/record/CombinationRecordListDialog.vue b/src/views/mall/promotion/combination/record/CombinationRecordListDialog.vue
index 1d58c76d..2fbde9ea 100644
--- a/src/views/mall/promotion/combination/record/CombinationRecordListDialog.vue
+++ b/src/views/mall/promotion/combination/record/CombinationRecordListDialog.vue
@@ -1,41 +1,20 @@
 <template>
-  <Dialog v-model="dialogVisible" title="拼团列表">
+  <Dialog v-model="dialogVisible" title="拼团列表" width="950">
     <!-- 列表 -->
     <ContentWrap>
       <el-table v-loading="loading" :data="list">
-        <el-table-column align="center" label="编号" prop="id" />
-        <el-table-column align="center" label="头像" prop="avatar" />
-        <el-table-column align="center" label="昵称" prop="nickname" />
-        <el-table-column align="center" label="开团团长" prop="headId">
+        <el-table-column align="center" label="编号" prop="id" min-width="50" />
+        <el-table-column align="center" label="头像" prop="avatar" min-width="80">
+          <template #default="scope">
+            <el-avatar :src="scope.row.avatar" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="昵称" prop="nickname" min-width="100" />
+        <el-table-column align="center" label="开团团长" prop="headId" min-width="100">
           <template #default="{ row }: { row: CombinationRecordApi.CombinationRecordVO }">
-            {{ row.headId ? list.find((item) => item.id === row.headId)?.nickname : row.nickname }}
+            <el-tag> {{ row.headId === 0 ? '团长' : '团员' }} </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          :formatter="dateFormatter"
-          align="center"
-          label="开团时间"
-          prop="startTime"
-          width="180"
-        />
-        <el-table-column
-          align="center"
-          label="拼团商品"
-          prop="type"
-          show-overflow-tooltip
-          width="300"
-        >
-          <template #defaul="{ row }">
-            <el-image
-              :src="row.picUrl"
-              class="mr-5px h-30px w-30px align-middle"
-              @click="imagePreview(row.picUrl)"
-            />
-            <span class="align-middle">{{ row.spuName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="几人团" prop="userSize" />
-        <el-table-column align="center" label="参与人数" prop="userCount" />
         <el-table-column
           :formatter="dateFormatter"
           align="center"
@@ -50,7 +29,7 @@
           prop="endTime"
           width="180"
         />
-        <el-table-column align="center" label="拼团状态" prop="status">
+        <el-table-column align="center" label="拼团状态" prop="status" min-width="150">
           <template #default="scope">
             <dict-tag
               :type="DICT_TYPE.PROMOTION_COMBINATION_RECORD_STATUS"
diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue
index 740af96b..cc7a3b26 100644
--- a/src/views/mall/promotion/combination/record/index.vue
+++ b/src/views/mall/promotion/combination/record/index.vue
@@ -114,10 +114,14 @@
   <!-- 分页列表数据展示 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="pageList">
-      <el-table-column align="center" label="编号" prop="id" />
-      <el-table-column align="center" label="头像" prop="avatar" />
-      <el-table-column align="center" label="昵称" prop="nickname" />
-      <el-table-column align="center" label="开团团长" prop="headId">
+      <el-table-column align="center" label="编号" prop="id" min-width="50" />
+      <el-table-column align="center" label="头像" prop="avatar" min-width="80">
+        <template #default="scope">
+          <el-avatar :src="scope.row.avatar" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="昵称" prop="nickname" min-width="100" />
+      <el-table-column align="center" label="开团团长" prop="headId" min-width="100">
         <template #default="{ row }: { row: CombinationRecordApi.CombinationRecordVO }">
           {{
             row.headId ? pageList.find((item) => item.id === row.headId)?.nickname : row.nickname
@@ -136,7 +140,7 @@
         label="拼团商品"
         prop="type"
         show-overflow-tooltip
-        width="300"
+        min-width="300"
       >
         <template #defaul="{ row }">
           <el-image
@@ -147,8 +151,8 @@
           <span class="align-middle">{{ row.spuName }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="几人团" prop="userSize" />
-      <el-table-column align="center" label="参与人数" prop="userCount" />
+      <el-table-column align="center" label="几人团" prop="userSize" min-width="100" />
+      <el-table-column align="center" label="参与人数" prop="userCount" min-width="100" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -163,7 +167,7 @@
         prop="endTime"
         width="180"
       />
-      <el-table-column align="center" label="拼团状态" prop="status">
+      <el-table-column align="center" label="拼团状态" prop="status" min-width="150">
         <template #default="scope">
           <dict-tag
             :type="DICT_TYPE.PROMOTION_COMBINATION_RECORD_STATUS"
@@ -203,7 +207,7 @@ import { dateFormatter, defaultShortcuts } from '@/utils/formatTime'
 import { createImageViewer } from '@/components/ImageViewer'
 import * as CombinationRecordApi from '@/api/mall/promotion/combination/combinationRecord'
 
-defineOptions({ name: 'CombinationRecord' })
+defineOptions({ name: 'PromotionCombinationRecord' })
 
 const queryParams = ref({
   status: undefined, // 拼团状态