设置页面

src/views/home/index.vue

@@ -15,12 +15,14 @@
 			<div class="bottom-view"><router-view></router-view></div>
 		</div>
 	</div>
+	<setting />
 </template>
 
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import LeftNav from './left-nav.vue'
 	import TopNav from './top-nav.vue'
+	import setting from './setting/index.vue'
 	import { useGlobalStore } from '@/stores'
 	const globalStore = useGlobalStore()
 	const loading = computed(() => globalStore.state.loading)

src/views/home/setting/General.vue

@@ -0,0 +1,52 @@
+<template>
+	<div>
+		<div class="label">User Name</div>
+		<div class="value">张三</div>
+	</div>
+	<div>
+		<div class="label">Email</div>
+		<div class="value">zhangsan@example.com</div>
+	</div>
+	<div>
+		<div class="label">Language</div>
+		<dropdown-menu v-model="locale" :list="langs" @change="changeLang" />
+	</div>
+	<div>
+		<div class="label">Log out on this device</div>
+		<button class="logout-btn" @click="logout">Log out</button>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { computed, ref, onBeforeUnmount, inject } from 'vue'
+	import dropdownMenu from '@/components/dropdown-menu.vue'
+	import { useUserInfoStore } from '@/stores'
+	import { useI18n } from 'vue-i18n'
+	const { locale } = useI18n()
+	const reload = inject('reload')
+	const userInfoStore = useUserInfoStore()
+	const langs = ref([
+		{ label: 'English', value: 'ENGLISH' },
+		{ label: '中文', value: 'CHINESE_SIMPLIFIED' }
+	])
+	const changeLang = (value: string) => {
+		locale.value = value
+		reload()
+	}
+	const logout = () => {
+		userInfoStore.logOut()
+	}
+</script>
+ 
+<style lang="less" scoped>
+	.logout-btn {
+		cursor: pointer;
+		height: 3.7rem;
+		width: 9.6rem;
+		border-radius: 3.7rem;
+		border: none;
+		background-color: #ff7a51;
+		color: #fff;
+		font-size: 1.4rem;
+	}
+</style>

src/views/home/setting/LearnMore.vue

@@ -0,0 +1,33 @@
+<template>
+	<div>
+		<div class="label">User Agreement</div>
+		<button @click="onClickUserAgreement">View</button>
+	</div>
+	<div>
+		<div class="label">Privacy Policy</div>
+		<button @click="onClickPrivacy">View</button>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { computed, ref, onBeforeUnmount, inject } from 'vue'
+
+	const onClickUserAgreement = () => {
+		console.log('onClickUserAgreement')
+	}
+	const onClickPrivacy = () => {
+		console.log('onClickPrivacy')
+	}
+</script>
+ 
+<style lang="less" scoped>
+	button {
+		width: 10rem;
+		height: 3.73rem;
+		background-color: transparent;
+		border: 0.01rem solid #b5b5b5;
+		color: #000;
+		font-size: 1.4rem;
+		border-radius: 3rem;
+	}
+</style>

src/views/home/setting/Profile.vue

@@ -0,0 +1,75 @@
+<template>
+	<div>
+		<div class="label">Region</div>
+		<dropdown-menu v-model="region" :list="regions" @change="changeRegion" />
+	</div>
+	<div>
+		<div class="label">Role</div>
+		<dropdown-menu v-model="role" :list="roles" @change="changeRole" />
+	</div>
+	<div>
+		<div class="label">Current Agent Profile</div>
+		<div class="group">
+			<span class="icon"><svg-icon name="xiang" size="20" color="#000" /></span>
+			<dropdown-menu v-model="agent" :list="agents" @change="changeAgent" />
+		</div>
+	</div>
+	<div>
+		<div class="label">Current Notification Frequency</div>
+		<div class="value">3–6 times per hour</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { computed, ref, onBeforeUnmount, inject } from 'vue'
+	import dropdownMenu from '@/components/dropdown-menu.vue'
+	import { useUserInfoStore } from '@/stores'
+	import { useI18n } from 'vue-i18n'
+	const { locale } = useI18n()
+	const region = ref('China')
+	const regions = ref([
+		{ label: 'United States', value: 'United States' },
+		{ label: 'Singapore', value: 'Singapore' },
+		{ label: 'Australia', value: 'Australia' },
+		{ label: 'South Korea', value: 'South Korea' },
+		{ label: 'China', value: 'China' },
+		{ label: 'Italy', value: 'Italy' },
+		{ label: 'France', value: 'France' },
+		{ label: 'Japan', value: 'Japan' },
+		{ label: 'Canada', value: 'Canada' },
+		{ label: 'Germany', value: 'Germany' }
+	])
+	const changeRegion = (value: string) => {
+		console.log(value)
+	}
+
+	const role = ref('Designer')
+	const roles = ref([
+		{ label: 'Designer', value: 'Designer' },
+		{ label: 'Student', value: 'Student' },
+		{ label: 'Teacher', value: 'Teacher' },
+		{ label: 'Parent', value: 'Parent' }
+	])
+	const changeRole = (value: string) => {
+		console.log(value)
+	}
+
+	const agent = ref('Partner')
+	const agents = ref([
+		{ label: 'Partner', value: 'Partner' },
+		{ label: 'Observer', value: 'Observer' },
+		{ label: 'Mentor', value: 'Mentor' }
+	])
+	const changeAgent = (value: string) => {
+		console.log(value)
+	}
+</script>
+ 
+<style lang="less" scoped>
+	.group {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 1rem;
+	}
+</style>

src/views/home/setting/index.vue

@@ -0,0 +1,126 @@
+<template>
+	<el-dialog
+		class="setting"
+		v-model="showDialog"
+		align-center
+		:show-close="false"
+		width="70rem"
+		style="border-radius: 2rem; padding: 3.8rem; --el-dialog-padding-primary: 1rem"
+	>
+		<template #header="{ close }">
+			<div class="setting-header">
+				<div class="title">Setting</div>
+				<span class="close" @click="close">
+					<svg-icon name="close" size="10" color="#000" />
+				</span>
+			</div>
+		</template>
+		<div class="setting-box">
+			<div class="left">
+				<div
+					v-for="v in navs"
+					:key="v.icon"
+					:class="{ active: nav === v.icon }"
+					@click="nav = v.icon"
+				>
+					<span class="icon"><svg-icon :name="v.icon" size="18" color="#000" /></span>
+					<span class="label">{{ v.label }}</span>
+				</div>
+			</div>
+			<div class="view">
+				<component :is="navs.find((v) => v.icon === nav).component" />
+			</div>
+		</div>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+	import General from './General.vue'
+	import Profile from './Profile.vue'
+	import LearnMore from './LearnMore.vue'
+	import MyEvent from '@/utils/myEvent'
+	import { computed, ref, onBeforeUnmount, shallowRef } from 'vue'
+	import { useRoute, useRouter } from 'vue-router'
+	import { useI18n } from 'vue-i18n'
+	const { t: $t } = useI18n()
+	const route = useRoute()
+	const router = useRouter()
+	const showDialog = ref(false)
+	const openSetting = () => {
+		showDialog.value = true
+	}
+	MyEvent.add('openSettingDialog', openSetting)
+	onBeforeUnmount(() => {
+		MyEvent.remove('openSettingDialog', openSetting)
+	})
+
+	const nav = ref('setting')
+	const navs = shallowRef([
+		{ icon: 'setting', label: 'General', component: General },
+		{ icon: 'profile', label: 'Profile', component: Profile },
+		{ icon: 'learn-more', label: 'Learn more', component: LearnMore }
+	])
+</script>
+ 
+<style lang="less" scoped>
+	.setting-header {
+		margin-top: 0.2rem;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 3.3rem;
+		border-bottom: 0.1rem solid rgba(0, 0, 0, 0.1);
+		> .title {
+			font-family: Semibold;
+			font-size: 1.6rem;
+			color: #000;
+		}
+	}
+	.setting-box {
+		width: 100%;
+		height: 50rem;
+		display: flex;
+		> .left {
+			margin-top: 1.8rem;
+			> div {
+				width: 16.4rem;
+				height: 3.4rem;
+				display: flex;
+				align-items: center;
+				// justify-content: center;
+				cursor: pointer;
+				&.active {
+					background: rgba(0, 0, 0, 0.04);
+					border-radius: 1rem;
+				}
+				> .icon {
+					margin: 0 1rem;
+				}
+				> .label {
+					color: #000;
+					font-size: 1.4rem;
+				}
+			}
+		}
+		> .view {
+			margin-left: 3.5rem;
+			flex: 1;
+			overflow-y: auto;
+			&::v-deep(> div) {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				height: 6rem;
+				border-bottom: 0.1rem solid rgba(0, 0, 0, 0.1);
+				&:last-child {
+					border-bottom: none;
+				}
+				> .value,
+				> .label {
+					font-size: 1.4rem;
+					color: #000;
+				}
+			}
+		}
+	}
+</style>

src/views/home/top-nav.vue

@@ -12,13 +12,38 @@
 			<span class="link"></span>
 			<span class="icon" @click="onShop"><svg-icon name="shop" size="21" /></span>
 		</div>
-		<img class="pic" src="@/assets/images/pic.jpg" />
+		<el-popover
+			placement="bottom-end"
+			popper-style="width:auto; min-width: 22rem; padding: 0.8rem; border-radius: 1.4rem;"
+		>
+			<template #reference>
+				<img class="pic" src="@/assets/images/pic.jpg" />
+			</template>
+			<div class="menu-box">
+				<div>
+					<span class="label">{{ email }}</span>
+				</div>
+				<p></p>
+				<div class="btn" @click="onSetting">
+					<span class="icon"><svg-icon name="setting" size="18" /></span>
+					<span class="label">Settings</span>
+				</div>
+				<div class="btn" @click="onLogout">
+					<span class="icon"><svg-icon name="logout" size="18" /></span>
+					<span class="label">Log out</span>
+				</div>
+			</div>
+		</el-popover>
 	</div>
 </template>
 
 <script setup lang="ts">
+	import MyEvent from '@/utils/myEvent'
 	import { computed, ref } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
+	import { useUserInfoStore } from '@/stores'
+	const userInfoStore = useUserInfoStore()
+	const email = computed(() => userInfoStore.state.userInfo.email || '------')
 	const route = useRoute()
 	const topNavStyle = computed(() => route.meta.topNavStyle)
 	const router = useRouter()
@@ -37,6 +62,12 @@
 			loading.value = false
 		}, 1500)
 	}
+	const onSetting = () => {
+		MyEvent.emit('openSettingDialog')
+	}
+	const onLogout = () => {
+		userInfoStore.logOut()
+	}
 </script>
 
 <style lang="less" scoped>
@@ -68,7 +99,7 @@
 			height: 4.3rem;
 			margin-right: 1rem;
 			background-color: rgba(255, 252, 244, 1);
-			border: 1px solid #FFCF90;
+			border: 1px solid #ffcf90;
 			border-radius: 0.8rem;
 			> .credits {
 				flex: 1;
@@ -78,7 +109,7 @@
 			> .link {
 				height: 100%;
 				width: 0;
-				border-right: 1px solid #FFCF90;
+				border-right: 1px solid #ffcf90;
 			}
 			> .icon {
 				cursor: pointer;
@@ -88,10 +119,46 @@
 				animation: loading 0.6s linear infinite;
 			}
 		}
-		> .pic {
+		.pic {
 			width: 4.65rem;
 			height: 4.65rem;
 			border-radius: 50%;
 		}
 	}
+	.menu-box {
+		user-select: none;
+		> * {
+			margin-bottom: 0.4rem;
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+
+		> div {
+			height: 3.7rem;
+			display: flex;
+			align-items: center;
+			// justify-content: center;
+			&.btn {
+				cursor: pointer;
+			}
+			&.btn:hover {
+				background-color: rgba(0, 0, 0, 0.06);
+			}
+			> .label {
+				font-size: 1.4rem;
+				color: #000;
+				margin-left: 0.8rem;
+			}
+			> .icon {
+				margin-left: 1rem;
+				--svg-icon-color: #000;
+			}
+		}
+		> p {
+			width: 100%;
+			height: 0;
+			border-bottom: 0.1rem solid #e5e5e5;
+		}
+	}
 </style>

src/views/login/login.vue

@@ -104,6 +104,9 @@
 			.then((res) => {
 				if (res) {
 					userInfoStore.setToken(res)
+					userInfoStore.setUserInfo({
+						email: formData.email
+					})
 					router.push({ name: 'mainInput' })
 				}
 			})

src/views/login/register.vue

@@ -111,6 +111,9 @@
 			.then((res) => {
 				if (res) {
 					userInfoStore.setToken(res)
+					userInfoStore.setUserInfo({
+						email: formData.email
+					})
 					router.push({ name: 'nuic' })
 				}
 			})

src/views/nuic/index.vue

@@ -25,7 +25,7 @@
 			<div class="bg-2"></div>
 			<div class="bg-1"></div>
 		</div>
-		<img class="loading-img" :class="{ loading }" src="@/assets/images/nuic/xiang.png" />
+		<img class="loading-img" :class="{ loading }" src="@/assets/images/nuic/xiang.gif" />
 		<div class="loading-tip" :class="{ loading }">{{ $t('Nuic.loadingTip') }}</div>
 	</div>
 </template>
@@ -167,7 +167,7 @@
 			top: 50%;
 			left: 50%;
 			transform: translate(-50%, -50%);
-			width: 14.4rem;
+			width: 60rem;
 			height: auto;
 			opacity: 0;
 			&.loading {