From 4da1385686dda8fee723819f368a4f509bc8cd4f Mon Sep 17 00:00:00 2001
From: xxiaoccpm <3570544406@qq.com>
Date: Fri, 19 Jul 2024 11:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E5=A7=8B=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BB=A3=E7=A0=81=E6=B3=A8=E5=85=A5=E8=BF=9B=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar/components/User.vue | 13 ++++-
 src/utils/constant.ts                            |  2 +-
 src/utils/request.ts                             |  5 --
 src/views/book/component/User.vue                | 68 ++++++++++++++++++++++++
 src/views/book/index.vue                         | 23 +++-----
 src/views/login/account.vue                      |  5 ++
 src/views/login/index.vue                        |  1 -
 7 files changed, 92 insertions(+), 25 deletions(-)
 create mode 100644 src/views/book/component/User.vue

diff --git a/src/layout/components/Navbar/components/User.vue b/src/layout/components/Navbar/components/User.vue
index c418ccf..7a662c6 100644
--- a/src/layout/components/Navbar/components/User.vue
+++ b/src/layout/components/Navbar/components/User.vue
@@ -7,6 +7,9 @@
 		</div>
 		<template #dropdown>
 			<el-dropdown-menu class="user-dropdown">
+				<router-link to="/book/home">
+					<el-dropdown-item> 商城首页</el-dropdown-item>
+				</router-link>
 				<router-link to="/profile">
 					<el-dropdown-item> {{ $t('app.profile') }} </el-dropdown-item>
 				</router-link>
@@ -20,16 +23,22 @@
 import { useUserStore } from '@/store/modules/user'
 import { useRouter } from 'vue-router'
 import { ArrowDown } from '@element-plus/icons-vue'
+import constant from '@/utils/constant'
+import { ElNotification } from 'element-plus'
 
 const userStore = useUserStore()
 const router = useRouter()
 
 const logout = () => {
 	userStore.logoutAction().then(() => {
-		// router.push({ path: '/login' })
+		ElNotification({
+			title: '登出成功！！！',
+			type: 'success'
+		})
+		router.push({ path: constant.loginPage })
 
 		// 刷新页面
-		location.reload()
+		//location.reload()
 	})
 }
 </script>
diff --git a/src/utils/constant.ts b/src/utils/constant.ts
index ddbada0..cae5e9a 100644
--- a/src/utils/constant.ts
+++ b/src/utils/constant.ts
@@ -8,7 +8,7 @@ export default {
 	version: appPackage.version,
 
 	// 登录成功后，跳转页面
-	loginPage: '/dashboard/workbench',
+	loginPage: '/book/index',
 
 	// API地址
 	apiUrl: import.meta.env.VITE_API_URL,
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 7ac43ed..da9d8cc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -22,11 +22,6 @@ service.interceptors.request.use(
 			config.headers.Authorization = userStore.token
 		}
 
-		var token = getCookie('book_user')
-		if (token) {
-			config.headers['cookie'] = token
-		}
-
 		config.headers['Accept-Language'] = cache.getLanguage()
 
 		// 追加时间戳，防止GET请求缓存
diff --git a/src/views/book/component/User.vue b/src/views/book/component/User.vue
new file mode 100644
index 0000000..40b08ec
--- /dev/null
+++ b/src/views/book/component/User.vue
@@ -0,0 +1,68 @@
+<template>
+	<el-dropdown class="avatar-container" trigger="hover">
+		<div class="avatar-wrapper">
+			<el-avatar shape="circle" :size="30" :src="userStore.user.avatar"></el-avatar>
+			<span>{{ userStore.user.realName }}</span>
+			<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+		</div>
+		<template #dropdown>
+			<el-dropdown-menu class="user-dropdown">
+				<router-link to="/dashboard/workbench">
+					<el-dropdown-item> 控制台 </el-dropdown-item>
+				</router-link>
+				<router-link to="/profile">
+					<el-dropdown-item> {{ $t('app.profile') }} </el-dropdown-item>
+				</router-link>
+
+				<el-dropdown-item divided @click="logout"> {{ $t('app.signOut') }} </el-dropdown-item>
+			</el-dropdown-menu>
+		</template>
+	</el-dropdown>
+</template>
+
+<script setup lang="ts">
+import { useUserStore } from '@/store/modules/user'
+import { useRouter } from 'vue-router'
+import { ArrowDown } from '@element-plus/icons-vue'
+import constant from '@/utils/constant'
+import { ElNotification } from 'element-plus'
+
+const userStore = useUserStore()
+const router = useRouter()
+
+const logout = () => {
+	userStore.logoutAction().then(() => {
+		ElNotification({
+			title: '登出成功！！！',
+			type: 'success'
+		})
+		router.push({ path: constant.loginPage })
+
+		// 刷新页面
+		//location.reload()
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+.avatar-container {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	height: var(--theme-header-height);
+	.avatar-wrapper {
+		display: flex;
+		align-items: center;
+		white-space: nowrap;
+		cursor: pointer;
+		padding: 0 8px;
+		color: var(--theme-header-text-color);
+		span {
+			margin-left: 6px;
+		}
+	}
+	//&:hover {
+	//	background: var(--theme-header-hover-color);
+	//}
+}
+</style>
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index 96db162..12e33ec 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router'
+import User from './component/User.vue'
 import { onMounted, ref } from 'vue'
-import { getCookie } from '@/utils/tokenUtil'
-import { getUserInfo } from '@/api/book'
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
 const router = useRouter()
 // 记录切换值
 const changeValue = ref('/book/index')
@@ -15,13 +16,6 @@ const changeRouters = () => {
 	}
 	router.push(changeValue.value)
 }
-
-onMounted(() => {
-	console.log(getCookie('book_user'))
-	// getUserInfo().then(res => {
-	// 	console.log(res)
-	// })
-})
 </script>
 
 <template>
@@ -29,10 +23,6 @@ onMounted(() => {
 		<div class="nav-link">
 			<div class="site-nav-bd">
 				<ul>
-					<li @click="router.push('/book/login?returnUrl=/book/index&status=0')">亲，请登录</li>
-					<li @click="router.push('/book/login?returnUrl=/book/index&status=1')">免费注册</li>
-				</ul>
-				<ul>
 					<li @click="changeRouters">{{ changeValue == '/book/my' ? '商城首页' : '我的淘宝' }}</li>
 					<li @click="router.push('/book/trolley')">
 						<el-icon>
@@ -46,9 +36,10 @@ onMounted(() => {
 						</el-icon>
 						收藏夹
 					</li>
-					<li @click="router.push('/login')">
-						<el-icon><Setting /></el-icon>书城管理后台
-					</li>
+				</ul>
+				<ul>
+					<li v-if="userStore?.token"><User></User></li>
+					<li v-else @click="router.push('/login')">登录/注册</li>
 				</ul>
 			</div>
 		</div>
diff --git a/src/views/login/account.vue b/src/views/login/account.vue
index d368827..c0291d6 100644
--- a/src/views/login/account.vue
+++ b/src/views/login/account.vue
@@ -25,6 +25,7 @@ import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import constant from '@/utils/constant'
 import { sm2Encrypt } from '@/utils/smCrypto'
+import { ElNotification } from 'element-plus'
 
 const userStore = useUserStore()
 const router = useRouter()
@@ -88,6 +89,10 @@ const onLogin = () => {
 		userStore
 			.accountLoginAction(loginData)
 			.then(() => {
+				ElNotification({
+					title: '登录成功！！！',
+					type: 'success'
+				})
 				router.push({ path: constant.loginPage })
 			})
 			.catch(() => {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f83773f..966e2a8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -14,7 +14,6 @@
 			</div>
 			<account v-if="loginType === 'account'" />
 			<mobile v-if="loginType === 'mobile'" />
-			<third />
 		</div>
 	</div>
 </template>