Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -252,6 +252,12 @@ const routes: Array<RouteRecordRaw> = [
|
||||
meta: { enter: "all" },
|
||||
component: () => import("@/views/HomeRecommend.vue")
|
||||
},
|
||||
{
|
||||
path: "/Square/:lang",
|
||||
name: "HomeRecommendLang",
|
||||
meta: { enter: "all" },
|
||||
component: () => import("@/views/HomeRecommend.vue"),
|
||||
},
|
||||
{
|
||||
path: "/administrator",
|
||||
name: "administrator",
|
||||
|
||||
@@ -62,7 +62,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
|
||||
import { useStore } from 'vuex'
|
||||
import { setLang } from '@/tool/guide'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useRouter, useRoute } from 'vue-router'
|
||||
import { gsap, TweenMax } from 'gsap'
|
||||
import { ScrollTrigger } from 'gsap/ScrollTrigger'
|
||||
export default defineComponent({
|
||||
@@ -71,6 +71,7 @@ export default defineComponent({
|
||||
const {t, locale} = useI18n()
|
||||
const store = useStore()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
let registerModel = ref()
|
||||
let data = reactive({})
|
||||
|
||||
@@ -117,7 +118,14 @@ export default defineComponent({
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', updataIsMoblie)
|
||||
// 初始化语言设置
|
||||
const savedLang = localStorage.getItem('loginLanguage')
|
||||
let savedLang = localStorage.getItem('loginLanguage')
|
||||
if(route?.params?.lang == 'cn'){
|
||||
savedLang = 'CHINESE_SIMPLIFIED'
|
||||
localStorage.setItem('loginLanguage', savedLang)
|
||||
}else if(route?.params?.lang == 'en'){
|
||||
savedLang = 'ENGLISH'
|
||||
localStorage.setItem('loginLanguage', savedLang)
|
||||
}
|
||||
if (savedLang) {
|
||||
isChinese.value = savedLang === 'CHINESE_SIMPLIFIED'
|
||||
locale.value = savedLang
|
||||
|
||||
Reference in New Issue
Block a user