Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/App.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- <RouteCache /> -->
-	<router-view v-if="show"></router-view>
+	<router-view></router-view>
 	<div id="loading" v-if="loading" v-loading="true"></div>
 </template>
 
@@ -22,19 +22,15 @@
 	window['onClickRegister'] = () => {
 		router.push({ name: 'register' })
 	}
-	const show = ref(true)
-	provide('reload', () => {
-		show.value = false
-		nextTick(() => {
-			show.value = true
-		})
-	})
 </script>
 
 <style lang="less">
 	#app {
 		font-size: 1.6rem;
 	}
+	.el-message{
+		font-size: 1.6rem;
+	}
 	#loading {
 		position: fixed;
 		z-index: 999999999;

src/api/login.ts

@@ -11,6 +11,7 @@ export const SendVerificationCode = (params) => {
 	return request({
 		url: '/api/user/send-verification-code',
 		method: 'post',
+		loading: true,
 		params
 	})
 }
@@ -28,6 +29,7 @@ export const Register = (data) => {
 	return request({
 		url: '/api/user/register',
 		method: 'post',
+		loading: true,
 		data
 	})
 }
@@ -43,6 +45,7 @@ export const Login = (data) => {
 	return request({
 		url: '/api/user/login',
 		method: 'post',
+		loading: true,
 		data
 	})
 }

src/lang/en.ts

@@ -4,7 +4,7 @@ export default {
 		login: 'Log in',
 		register: 'Register',
 		loginTo: 'Log on to <span>FiDA</span>',
-		LoginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.',
+		loginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.',
 		name: 'Name',
 		email: 'Email',
 		password: 'Password',

src/lang/index.ts

@@ -27,7 +27,7 @@ const i18n = createI18n({
   warnHtmlMessage: false,
   legacy: false,
   globalInjection:true,  // 全局模式，可以直接使用 $t
-  locale: 'ENGLISH',
+  locale: localStorage.getItem('language') || 'ENGLISH',
   messages: messages
 })
 

src/utils/request.ts

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import router from '@/router/index'
 import { useGlobalStore, useUserInfoStore } from '@/stores'
+import { ElMessage } from 'element-plus'
 
 // 扩展 AxiosRequestConfig 接口
 declare module 'axios' {
@@ -80,13 +81,7 @@ service.interceptors.response.use(
     // 处理异常的情况
     // console.log(res)
     if (res.code != 200) {
-    //   showToast({
-    //     message: res.errMsg || res.message,
-    //     // type: 'fail',
-    //     duration: 5000,
-    //     position: 'top',
-    //     icon: 'none'
-    //   })
+      ElMessage.error(res.message)
       return Promise.reject(new Error(res.errMsg || res.message || 'error'))
     } else {
       // 默认只返回data，不返回状态码和message
@@ -123,11 +118,7 @@ service.interceptors.response.use(
 		}
 		error.config && removePending(error.config)
 		console.log('err' + error) // for debug
-		// showToast({
-		//   message: error.message,
-		//   type: 'fail',
-		//   duration: 5000
-		// })
+		ElMessage.error(error.message)
 	}
     return Promise.reject(error)
   }

src/views/home/setting/General.vue

@@ -18,12 +18,13 @@
 </template>
 
 <script setup lang="ts">
-	import { computed, ref, onBeforeUnmount, inject } from 'vue'
+	import { computed, ref, nextTick, inject } from 'vue'
+	import { useRouter } from 'vue-router'
 	import dropdownMenu from '@/components/dropdown-menu.vue'
 	import { useUserInfoStore } from '@/stores'
 	import { useI18n } from 'vue-i18n'
+	const router = useRouter()
 	const { locale } = useI18n()
-	const reload = inject('reload')
 	const userInfoStore = useUserInfoStore()
 	const langs = ref([
 		{ label: 'English', value: 'ENGLISH' },
@@ -31,7 +32,10 @@
 	])
 	const changeLang = (value: string) => {
 		locale.value = value
-		reload()
+		localStorage.setItem('language', value)
+		nextTick(() => {
+			router.go(0)
+		})
 	}
 	const logout = () => {
 		userInfoStore.logOut()

src/views/login/login.vue

@@ -102,6 +102,7 @@
 			verificationCode: code
 		})
 			.then((res) => {
+				console.log(res)
 				if (res) {
 					userInfoStore.setToken(res)
 					userInfoStore.setUserInfo({
@@ -110,8 +111,8 @@
 					router.push({ name: 'mainInput' })
 				}
 			})
-			.catch(() => {
-				console.warn('error verify code!')
+			.catch((error) => {
+				console.warn(error)
 			})
 	}
 </script>