Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/views/HomeView/library.vue

@@ -1721,9 +1721,8 @@ export default defineComponent({
 				sloganText = this.captionGeneration
 				if(this.selectCode == "Sketchboard"){
 					level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:''
-					if(this.workspace.styleName){
-						sloganText = `${this.workspace.styleName},${sloganText}`
-					}
+					// sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
+					sloganText = `'all',${sloganText}`
 				}else if(this.selectCode == "Printboard"){
 					level2Type = this.scene?.value
 					if(level2Type == 'Slogan' && this.captionGeneration == ''){

src/views/Register.vue

@@ -85,7 +85,7 @@ import {
 import { setCookie, getCookie, WriteCookie, clonAllCookie } from '@/tool/cookie'
 import { Https } from '@/tool/https'
 import { useStore } from 'vuex'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import signUp from '@/component/mainPage/signUp/index.vue'
 export default defineComponent({
   components: {
@@ -93,6 +93,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+	const route = useRoute();
     const router = useRouter()
     let data = reactive({
       homeRecommendMax: null,
@@ -148,7 +149,14 @@ export default defineComponent({
 
     onMounted(() => {
       updataIsMoblie()
-      const savedLang = localStorage.getItem('loginLanguage')
+      let savedLang = localStorage.getItem('loginLanguage') || 'ENGLISH'
+	  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) {
         data.isSelectSuccessively = savedLang === 'CHINESE_SIMPLIFIED'
       }