Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/FiDA_Front

src/views/home/index.vue

@@ -47,6 +47,7 @@
 		overflow: hidden;
 		display: flex;
 		user-select: none;
+
 		> .right-main {
 			flex: 1;
 			display: flex;
@@ -61,8 +62,10 @@
 			}
 		}
 	}
+
 	.bg-1 {
 		z-index: -1;
+		background: #f8f7f5;
 		animation: opacity-in 0.5s ease-in-out 1 both;
 	}
 	.bg-2 {
@@ -73,7 +76,6 @@
 		width: 100%;
 		height: 100%;
 		overflow: hidden;
-		// background-color: rgba(248, 247, 245, 1);
 		> * {
 			position: absolute;
 			border-radius: 50%;

src/views/home/setting/Profile.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div class="label">Region</div>
-		<dropdown-menu v-model="region" :list="regions" @change="changeRegion" />
+		<dropdown-menu v-model="base" :list="baseList" @change="changeBase" />
 	</div>
 	<div>
 		<div class="label">Role</div>
@@ -25,9 +25,10 @@
 	import dropdownMenu from '@/components/dropdown-menu.vue'
 	import { useUserInfoStore } from '@/stores'
 	import { useI18n } from 'vue-i18n'
+	const userInfoStore = useUserInfoStore()
 	const { locale } = useI18n()
-	const region = ref('China')
-	const regions = ref([
+	const base = ref(userInfoStore.state.userInfo.base)
+	const baseList = ref([
 		{ label: 'United States', value: 'United States' },
 		{ label: 'Singapore', value: 'Singapore' },
 		{ label: 'Australia', value: 'Australia' },
@@ -39,16 +40,17 @@
 		{ label: 'Canada', value: 'Canada' },
 		{ label: 'Germany', value: 'Germany' }
 	])
-	const changeRegion = (value: string) => {
+	const changeBase = (value: string) => {
 		console.log(value)
 	}
 
-	const role = ref('Designer')
+	const role = ref(userInfoStore.state.userInfo.role)
 	const roles = ref([
 		{ label: 'Designer', value: 'Designer' },
 		{ label: 'Student', value: 'Student' },
 		{ label: 'Teacher', value: 'Teacher' },
-		{ label: 'Parent', value: 'Parent' }
+		{ label: 'Parent', value: 'Parent' },
+		{ value: 'Other', label: 'Other' }
 	])
 	const changeRole = (value: string) => {
 		console.log(value)