From a06369d427594bf8dada7ae9c4bc6a8f52eb563a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 8 Oct 2023 07:30:14 +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 86323f970b0a8eb466a3865ecc9d9f32f2df82eb)
---
 .../combination/combinationRecord.ts          |  5 ----
 .../promotion/combination/record/index.vue    | 30 ++++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/api/mall/promotion/combination/combinationRecord.ts b/src/api/mall/promotion/combination/combinationRecord.ts
index c86dd0c1..bf8c3668 100644
--- a/src/api/mall/promotion/combination/combinationRecord.ts
+++ b/src/api/mall/promotion/combination/combinationRecord.ts
@@ -26,8 +26,3 @@ export const getCombinationRecordPage = async (params) => {
 export const getCombinationRecordSummary = async () => {
   return await request.get({ url: '/promotion/combination-record/get-summary' })
 }
-
-// 获得拼团记录分页 tab count
-export const getCombinationRecordCount = async () => {
-  return await request.get({ url: '/promotion/combination-record/get-count' })
-}
diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue
index 2f9b1ee4..e55286af 100644
--- a/src/views/mall/promotion/combination/record/index.vue
+++ b/src/views/mall/promotion/combination/record/index.vue
@@ -65,8 +65,9 @@
       </ContentWrap>
     </el-col>
   </el-row>
+
+  <!-- 搜索工作栏 -->
   <ContentWrap>
-    <!-- 搜索工作栏 -->
     <el-form
       ref="queryFormRef"
       :inline="true"
@@ -109,12 +110,13 @@
       </el-form-item>
     </el-form>
   </ContentWrap>
+
+  <!-- 分页列表数据展示 -->
   <ContentWrap>
-    <!--   分页列表数据展示   -->
     <el-table v-loading="loading" :data="pageList">
       <el-table-column align="center" label="编号" prop="id" />
-      <!-- TODO 是否需要做一个点击用户头像跳转或查看用户信息的功能  -->
       <el-table-column align="center" label="头像" prop="avatar" />
+      <el-table-column align="center" label="昵称" prop="nickname" />
       <el-table-column align="center" label="开团团长" prop="headId">
         <template #default="{ row }: { row: CombinationRecordApi.CombinationRecordVO }">
           {{
@@ -147,6 +149,13 @@
       </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"
+        label="参团时间"
+        prop="createTime"
+        width="180"
+      />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -162,6 +171,7 @@
           />
         </template>
       </el-table-column>
+      <!-- TODO puhui999：这里加个查看拼团？点击后，查看完整的拼团列表？ -->
       <el-table-column align="center" fixed="right" label="操作">
         <template #default></template>
       </el-table-column>
@@ -175,7 +185,6 @@
     />
   </ContentWrap>
 </template>
-
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
@@ -183,6 +192,7 @@ import { createImageViewer } from '@/components/ImageViewer'
 import * as CombinationRecordApi from '@/api/mall/promotion/combination/combinationRecord'
 
 defineOptions({ name: 'CombinationRecord' })
+
 const queryParams = ref({
   dateType: 0, // 日期类型
   status: undefined, // 拼团状态
@@ -216,6 +226,7 @@ const getSummary = async () => {
   recordSummary.value = await CombinationRecordApi.getCombinationRecordSummary()
 }
 // 日期快捷选项
+// TODO @puhui999：不用 dateType，而是 shortcuts 选择后，设置到对应的 date 就 ok 啦。直接通过它查询。然后，看看怎么把 shortcuts 变成一个公共变量，类似 defaultProps 一样
 const shortcuts = ref([
   {
     text: '今天',
@@ -246,7 +257,7 @@ const shortcuts = ref([
     }
   },
   {
-    text: '最近30天',
+    text: '最近 30 天',
     type: 'last30Days',
     value: () => {
       const date = new Date()
@@ -276,14 +287,6 @@ const shortcuts = ref([
   }
 ])
 
-/** 获得每个 Tab 的数量 */
-const getTabsCount = async () => {
-  const res = await CombinationRecordApi.getCombinationRecordCount()
-  shortcuts.value.forEach((tab) => {
-    tab.text += `(${res[tab.type]})`
-  })
-}
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNo = 1
@@ -306,7 +309,6 @@ const imagePreview = (imgUrl: string) => {
 /** 初始化 **/
 onMounted(async () => {
   await getSummary()
-  await getTabsCount()
   await getList()
 })
 </script>