From 2ed2b815faedbdabbf139a7090fab9199de66723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Tue, 22 Aug 2023 18:27:08 +0800
Subject: [PATCH] no message

---
 public/config.js                              |   3 +
 src/components/xAvatar/index.vue              |   2 +-
 .../xUser/components/{logs.vue => table.vue}  |  15 +--
 src/components/xUser/index.vue                | 117 +++++++-----------
 src/views/user/index/index.vue                |   2 +-
 5 files changed, 58 insertions(+), 81 deletions(-)
 rename src/components/xUser/components/{logs.vue => table.vue} (87%)

diff --git a/public/config.js b/public/config.js
index bd45628..835ce60 100644
--- a/public/config.js
+++ b/public/config.js
@@ -13,4 +13,7 @@ const APP_CONFIG = {
     APP_LOGO: 'https://www.uugai.com/logoa/font/505/c.php?txtcolora=FFF',
     //接口地址
     API_URL: 'https://app.gter.net/admin',
+
+    // 微信扫码登录
+    MY_SHOW_LOGIN_OAUTH:true,
 }
\ No newline at end of file
diff --git a/src/components/xAvatar/index.vue b/src/components/xAvatar/index.vue
index 403a779..fc6bcb2 100644
--- a/src/components/xAvatar/index.vue
+++ b/src/components/xAvatar/index.vue
@@ -68,7 +68,7 @@
 	    border-radius: 50%;
 	    font-size: 12px;
 	    left: -10px;
-	    top: 120px;
+	    top: 100px;
 	    background-color: #9facc3;
 	    background-repeat: no-repeat;
 	    background-position: 50%;
diff --git a/src/components/xUser/components/logs.vue b/src/components/xUser/components/table.vue
similarity index 87%
rename from src/components/xUser/components/logs.vue
rename to src/components/xUser/components/table.vue
index 00c0ab8..3bf6e0c 100644
--- a/src/components/xUser/components/logs.vue
+++ b/src/components/xUser/components/table.vue
@@ -1,14 +1,11 @@
 <template>
-	<el-container>
-		<el-header>
-			ssss
-		</el-header>
-		<el-main class="nopadding"></el-main>
-		<el-footer>
-			ss
-		</el-footer>
-	</el-container>
 
+	<el-main class="nopadding">
+
+	</el-main>
+	<el-footer>
+		ss
+	</el-footer>
 	<!-- <el-card shadow="never" header="近7天操作记录">
 		<xTable ref="table" :data="data" height="auto" paginationLayout="total, prev, pager, next" hideDo>
 			<x-table-column label="序号" type="index"></x-table-column>
diff --git a/src/components/xUser/index.vue b/src/components/xUser/index.vue
index 51c513d..32d68e2 100644
--- a/src/components/xUser/index.vue
+++ b/src/components/xUser/index.vue
@@ -4,10 +4,21 @@
 			<el-container>
 				<el-header style="height: auto;display: block;">
 					<div class="user-info-top">
-
-						<x-upload v-model="user.avatar" :data={token:token} v-if="avatarupload" :api="avatarupload" width="100" height="100" icon="el-icon-avatar" ref="uploader" :onRemove="onRemove" class="xuavatar" round :cropper="true" :aspectRatio="1/1">
-						</x-upload>
-						<el-avatar :size="100" v-else :src="user.avatar"></el-avatar>
+						<x-upload 
+							v-if="avatarupload" 
+							v-model="user.avatar" 
+							:data={token:token} 
+							ref="uploader" 
+							:api="avatarupload" 
+							width="80" 
+							height="80" 
+							icon="el-icon-avatar" 
+							:onRemove="onRemove" 
+							class="xuavatar" 
+							round 
+							:cropper="true" 
+							:aspectRatio="1/1" />
+						<el-avatar :size="80" v-else :src="user.avatar"></el-avatar>
 						<h2 class="nickname">{{ user.nickname || user.username }}</h2>
 						<!-- <p><el-tag effect="dark" round size="large" disable-transitions>{{ user.role }}</el-tag></p> -->
 						<p>
@@ -24,11 +35,12 @@
 				</el-header>
 				<el-main class="nopadding">
 					<el-menu class="menu" :default-active="page">
-						<el-menu-item-group v-for="group in menu" :key="group.groupName" :title="group.groupName">
-							<el-menu-item v-for="item in group.list" :key="item.component" :index="item.component" @click="openPage">
+						<el-menu-item-group v-for="group in menu" :key="group.title" :title="group.title">
+							<el-menu-item v-for="item in group.list" :key="item.key" :index="item.key" @click="openPage(item)">
 								<el-icon v-if="item.icon"><component :is="item.icon"/></el-icon>
 								<template #title>
 									<span>{{item.title}}</span>
+									<el-badge :value="item.tag" :max="99" class="item"> </el-badge>
 								</template>
 							</el-menu-item>
 						</el-menu-item-group>
@@ -37,18 +49,27 @@
 			</el-container>
 		</el-aside>
 		<el-main style="padding: 0px;">
-			<Suspense>
-				<template #default>
-					<component :data="user" :is="page"/>
-				</template>
-				<template #fallback>
-					<el-skeleton :rows="3" />
-				</template>
-			</Suspense>
+			<el-container>
+				<el-header style="height: 50px;">
+					<div>
+						<p><el-button link v-copy="user.uid">UID: {{ user.uid }} </el-button> </p>
+						<p v-if="user.uin"><el-button link size="" v-copy="user.uin">UIN: {{ user.uin }}</el-button> </p>
+					</div>
+					<span v-if="user.mobile"> <p><el-button link v-copy="user.mobile">Mobile: {{ user.mobile }} </el-button> </p> </span>
+					<span v-if="user.email"> <p><el-button link v-copy="user.email">Email: {{ user.email }} </el-button> </p> </span>
+					<span>注册时间: <i v-time="user.regdate"></i></span>
+				</el-header>
+				<Suspense>
+					<template #default>
+						<component :data="user" :is="page"/>
+					</template>
+					<template #fallback>
+						<el-skeleton :rows="3" />
+					</template>
+				</Suspense>
+			</el-container>
 		</el-main>
 	</el-container>
-
-
 	<x-update v-if="updateKey" :name="updateKey" ref="xupdate" @success="handleSuccess" @closed="updateKey=''"></x-update>
 </template>
 
@@ -68,6 +89,13 @@
 		border-radius: 10px !important;	
 	}
 </style>
+<style scoped>
+
+	.el-badge {
+		position: absolute; height: 18px; line-height: 18px; font-size: 12px; color: #fff; right: 8px; border-radius: 18px;
+	}
+
+</style>
 
 <script>
 	import { defineAsyncComponent } from 'vue'
@@ -80,7 +108,7 @@
 			pushSettings: defineAsyncComponent(() => import('./components/pushSettings')),
 			password: defineAsyncComponent(() => import('./components/password')),
 			space: defineAsyncComponent(() => import('./components/space')),
-			logs: defineAsyncComponent(() => import('./components/logs')),
+			xtable: defineAsyncComponent(() => import('./components/table')),
 		},
 		props: {
 			modelValue: { type: Object, default: () => {} },
@@ -88,58 +116,7 @@
 		},
 		data() {
 			return {
-				menu: [
-					{
-						groupName: "基本设置",
-						list: [
-							{
-								icon: "el-icon-postcard",
-								title: "账号信息",
-								component: "account"
-							},
-							{
-								icon: "el-icon-operation",
-								title: "行为轨迹",
-								component: "seting"
-							},
-							{
-								icon: "el-icon-lock",
-								title: "密码",
-								component: "password"
-							},
-							{
-								icon: "el-icon-bell",
-								title: "通知设置",
-								component: "pushSettings"
-							}
-						]
-					},
-					{
-						groupName: "数据管理",
-						list: [
-							{
-								icon: "el-icon-coin",
-								title: "存储空间信息",
-								component: "space"
-							},
-							{
-								icon: "el-icon-clock",
-								title: "Offer",
-								component: "logs"
-							},
-							{
-								icon: "el-icon-clock",
-								title: "租房",
-								component: "logs"
-							},
-							{
-								icon: "el-icon-clock",
-								title: "我的附件",
-								component: "logs"
-							}
-						]
-					},
-				],
+				menu: [],
 				user: {},
 				userData: this.modelValue,
 				token: '',
@@ -184,7 +161,7 @@
 				return false;
 			},
 			openPage(item){
-				this.page = item.index
+				this.page = item.component
 			}
 		}
 	}
diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue
index 6a23147..030b0ba 100644
--- a/src/views/user/index/index.vue
+++ b/src/views/user/index/index.vue
@@ -320,7 +320,7 @@
 	    border-radius: 50%;
 	    font-size: 12px;
 	    left: -10px;
-	    top: 120px;
+	    top: 100px;
 	    background-color: #9facc3;
 	    background-repeat: no-repeat;
 	    background-position: 50%;