Merge remote-tracking branch 'origin/StableVersion' into develop

src/views/HomeView/library.vue

@@ -1594,6 +1594,7 @@ export default defineComponent({
 			let state = true
 			this.generateTime[str] = setInterval(()=>{
 				// let data = this.generateList[str].filter((item:any)=>item.status != 'Success').map((obj:any) => obj.taskId);
+				if(!this.isGenerate[this.selectCode] || !this.remGenerate[this.selectCode])return
 				if(!state)return
 				state = false
 				Https.axiosPost(Https.httpUrls.generateResult, data).then(
@@ -1967,7 +1968,9 @@ export default defineComponent({
 								}
 								.content_body_header_right{
 									display: flex;
-									width: 43rem;
+									// width: 43rem;
+									width: auto;
+									margin-right: 2rem;
 								}
                                 .check_all_block{
                                     display: flex;

src/views/Register.vue

@@ -31,10 +31,17 @@
 				<div class="gallery_btn white" v-if="userDetail.systemUser != -1" @click="logout">log off</div>
 			</div>
 			<div class="homeRecommend_right" v-if="userDetail.systemUser == -1">
+				<div class="cutLangue">
+					<div @click="()=>isSelectSuccessively = !isSelectSuccessively">
+						<i class="fi fi-rr-globe"></i>
+						<!-- <a-switch :checked="isSelectSuccessively" @click="()=>isSelectSuccessively = !isSelectSuccessively" checked-children="EN" un-checked-children="CN"/> -->
+						{{ isSelectSuccessively? 'CN':'EN'}}
+					</div>
+				</div>
 				<div class="gallery_btn" @click="setLogin">Login</div>
 			</div>
         </header>
-		<signUp ref="signUp" @close="signUpClose"></signUp>
+		<signUp ref="signUp" :isSelectSuccessively="isSelectSuccessively"></signUp>
     </div>
 	
 </template>
@@ -54,7 +61,8 @@ export default defineComponent({
 		const router = useRouter();
 		let data = reactive({
 			homeRecommendMax:null,
-			signUp:null
+			signUp:null,
+			isSelectSuccessively:false,
 		})
 		let isMoblie = ref(false)
 		let userDetail = computed(()=>{
@@ -94,6 +102,7 @@ export default defineComponent({
 		})
 		onBeforeUnmount(() => {
 			window.removeEventListener('resize', updataIsMoblie);
+			
 		});
 		return {
 			...toRefs(data),
@@ -181,6 +190,31 @@ export default defineComponent({
 			    margin-right: 3rem;
 			}
 		}
+		> .cutLangue{
+			display: flex;
+			align-items: center;
+			margin-right: 4rem;
+			> i{
+				font-size: 5rem;
+			}
+			> div{
+				cursor: pointer;
+				display: flex;
+				align-items: center;
+				> i{
+					font-size: 3.5rem;
+					display: flex;
+					margin-right: 1rem;
+				}
+			}
+			> button{
+				height: 4rem;
+				min-width: 8rem;
+			}
+			> .text{
+				margin-right: 1rem;
+			}
+		}
 	}
     .homeRecommend_logo {
         width: 14.4rem;
@@ -189,7 +223,9 @@ export default defineComponent({
     }
 	.login_footer_item_text{
 		margin-left: 5rem;
+		text-decoration: underline;
 		display: none;
+		cursor: pointer;
 	}
     .homeRecommend_right_content {
         top: 0;