From 3ee076d0d9b57e45ae12ba54bf98bba32a839c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=AE=E6=A2=A6?= <ls909275705@gmail.com>
Date: Wed, 23 Aug 2023 13:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f17bb9a7eb6cd8e000d05038488f7034b244a3bc)
---
 .../{account-info.vue => AccountInfo.vue}     |  0
 .../{card-title.vue => CardTitle.vue}         |  0
 .../{point-list.vue => PointList.vue}         |  0
 .../{sign-list.vue => SignList.vue}           |  0
 .../member/user/components/UserBasicInfo.vue  |  7 +++++++
 src/views/member/user/detail/index.vue        | 19 ++++++++-----------
 6 files changed, 15 insertions(+), 11 deletions(-)
 rename src/views/member/user/components/{account-info.vue => AccountInfo.vue} (100%)
 rename src/views/member/user/components/{card-title.vue => CardTitle.vue} (100%)
 rename src/views/member/user/components/{point-list.vue => PointList.vue} (100%)
 rename src/views/member/user/components/{sign-list.vue => SignList.vue} (100%)
 create mode 100644 src/views/member/user/components/UserBasicInfo.vue

diff --git a/src/views/member/user/components/account-info.vue b/src/views/member/user/components/AccountInfo.vue
similarity index 100%
rename from src/views/member/user/components/account-info.vue
rename to src/views/member/user/components/AccountInfo.vue
diff --git a/src/views/member/user/components/card-title.vue b/src/views/member/user/components/CardTitle.vue
similarity index 100%
rename from src/views/member/user/components/card-title.vue
rename to src/views/member/user/components/CardTitle.vue
diff --git a/src/views/member/user/components/point-list.vue b/src/views/member/user/components/PointList.vue
similarity index 100%
rename from src/views/member/user/components/point-list.vue
rename to src/views/member/user/components/PointList.vue
diff --git a/src/views/member/user/components/sign-list.vue b/src/views/member/user/components/SignList.vue
similarity index 100%
rename from src/views/member/user/components/sign-list.vue
rename to src/views/member/user/components/SignList.vue
diff --git a/src/views/member/user/components/UserBasicInfo.vue b/src/views/member/user/components/UserBasicInfo.vue
new file mode 100644
index 00000000..c6449d3a
--- /dev/null
+++ b/src/views/member/user/components/UserBasicInfo.vue
@@ -0,0 +1,7 @@
+<script setup lang="ts"></script>
+
+<template>
+  <span>基础信息</span>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue
index 38c8712c..569277d4 100644
--- a/src/views/member/user/detail/index.vue
+++ b/src/views/member/user/detail/index.vue
@@ -142,28 +142,25 @@
       </el-card>
     </el-row>
   </div>
-
   <!-- 表单弹窗：添加/修改 -->
-  <UserForm ref="formRef" @success="getUserData(user.id)" />
+  <UserForm ref="formRef" v-if="user.id" @success="getUserData(user.id)" />
 </template>
 <script setup lang="ts">
-// TODO @梦：组件对应的 vue，都大写
-import PointList from '@/views/member/user/components/point-list.vue'
-import SignList from '@/views/member/user/components/sign-list.vue'
-import CardTitle from '@/views/member/user/components/card-title.vue'
-// TODO @梦：参考别的模块，UserApi 这样去引用
-import { getUser, UserBaseInfoVO } from '@/api/member/user'
+import PointList from '@/views/member/user/components/PointList.vue'
+import SignList from '@/views/member/user/components/SignList.vue'
+import CardTitle from '@/views/member/user/components/CardTitle.vue'
+import * as UserApi from '@/api/member/user'
 import { formatDate } from '@/utils/formatTime'
 import { DICT_TYPE } from '@/utils/dict'
 import UserForm from '@/views/member/user/UserForm.vue'
 // TODO @梦：把用户信息，也抽成一个组件，类似 AccountInfo
-import AccountInfo from '@/views/member/user/components/account-info.vue'
+import AccountInfo from '@/views/member/user/components/AccountInfo.vue'
 
 defineOptions({ name: 'MemberDetail' })
 
 const activeName = ref('point') // 账户明细 选中的 tabs
 const loading = ref(true) // 加载中
-let user = ref<UserBaseInfoVO>({
+let user = ref<UserApi.UserBaseInfoVO>({
   areaId: undefined,
   avatar: undefined,
   birthday: undefined,
@@ -185,7 +182,7 @@ let user = ref<UserBaseInfoVO>({
 const getUserData = async (id: number) => {
   loading.value = true
   try {
-    user.value = await getUser(id)
+    user.value = await UserApi.getUser(id)
   } finally {
     loading.value = false
   }