From a5bf63e386f68e6bddcc3eb3ba5d64cb202c6d2f Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 11 Jan 2023 18:07:15 +0800
Subject: [PATCH] chore

---
 modules/User/views/user/components/profile.vue | 12 +++++++++---
 modules/User/views/user/index.vue              |  8 ++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/User/views/user/components/profile.vue b/modules/User/views/user/components/profile.vue
index 6fd12a3..07ad5ef 100644
--- a/modules/User/views/user/components/profile.vue
+++ b/modules/User/views/user/components/profile.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, unref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useCreate } from '/admin/composables/curd/useCreate'
 import http from '/admin/support/http'
 import { Code } from '/admin/enum/app'
@@ -74,15 +74,21 @@ const profile = ref<profile>(
     password: '',
   }),
 )
+const { form, loading, submitForm, afterCreate } = useCreate('user/online', null, profile)
 
-onMounted(() => {
+const getUserInfo = () => {
+  loading.value = true
   http.get('user/online').then(r => {
     profile.value.username = r.data.data.username
     profile.value.avatar = r.data.data.avatar
     profile.value.email = r.data.data.email
+    loading.value = false
   })
+}
+
+onMounted(() => {
+  getUserInfo()
 })
-const { form, loading, submitForm, afterCreate } = useCreate('user/online', null, profile)
 
 const userStore = useUserStore()
 const uploadAvatar = (response, uploadFile) => {
diff --git a/modules/User/views/user/index.vue b/modules/User/views/user/index.vue
index 7d43e30..850a00b 100644
--- a/modules/User/views/user/index.vue
+++ b/modules/User/views/user/index.vue
@@ -18,8 +18,12 @@
       <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
         <Operate :show="open" />
         <el-table :data="tableData" class="mt-3" v-loading="loading">
-          <el-table-column prop="username" label="用户名" width="180" />
-          <el-table-column prop="avatar" label="头像" />
+          <el-table-column prop="username" label="用户名" width="150" />
+          <el-table-column prop="avatar" label="头像">
+            <template #default="scope">
+              <el-avatar :src="scope.row.avatar" />
+            </template>
+          </el-table-column>
           <el-table-column prop="email" label="邮箱" />
           <el-table-column prop="status" label="状态">
             <template #default="scope">