From 272615a9578b117c735cb2a437a1a9bcfeec113c Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Sun, 28 Jan 2024 20:42:26 +0800
Subject: [PATCH] fix

---
 src/assets/style/style.css          | 6 +++---
 src/assets/style/style.less         | 6 +++---
 src/component/HomePage/Generate.vue | 4 ++--
 src/lang/en.ts                      | 8 ++++----
 src/tool/guide.js                   | 2 +-
 src/views/HomeView.vue              | 2 +-
 src/views/LoginPage.vue             | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index e4ab58b5..d4fcc9c5 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -958,10 +958,10 @@ i {
 }
 .mark_loading .mark_loading_text {
   text-align: center;
-  font-size: 2rem;
+  font-size: 1.2rem;
   position: absolute;
-  bottom: 7%;
-  right: 7%;
+  bottom: 2%;
+  right: 2%;
 }
 .mark_loading .mark_loading_text div {
   margin-top: 10px;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 7b8f9141..d3d9a1ba 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1045,10 +1045,10 @@ i{
 	flex-direction: column;
 	.mark_loading_text{
 		text-align: center;
-		font-size: 2rem;
+		font-size: 1.2rem;
 		position: absolute;
-		bottom: 7%;
-		right: 7%;
+		bottom: 2%;
+		right: 2%;
 		div{
 			margin-top: 10px;
 			span{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 99cd6fe3..fc766b2e 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -176,9 +176,9 @@
             </div>
 			
         </div>
-		<div class="mark_loading" v-show="loadingShow">
+		<div class="mark_loading" v-show="!loadingShow">
 			<a-spin size="large" />
-			<div class="mark_loading_text" v-show="generateLineUp >= 0">
+			<div class="mark_loading_text" v-show="generateLineUp != 0">
 				<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
 			</div>
 			<div v-show="remGenerate" :class="[driver__.driver?'hideEvents':'']" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
diff --git a/src/lang/en.ts b/src/lang/en.ts
index c1571cec..8804230f 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -65,7 +65,7 @@ export default {
 		Organize:'Organize',
 		Upload:'Upload',
 		Generate:'Generate',
-		Close:'Cancle',
+		Close:'Cancel',
 		Reset:'Reset',
 		currently:'You are currently in the {generateLineUp} th position in the queue',
 		Delete:'Delete',
@@ -174,7 +174,7 @@ export default {
 		Upload:'Upload',
 		Library:'Library',
 		Generate:'Generate',
-		Close:'Cancle',
+		Close:'Cancel',
 		currently:'You are currently in the {generateLineUp} th position in the queue',
 		PIN:'PIN',
 		Maximum:'Maximum {maxImg} images can be uploaded, Maximum 2M per image',
@@ -193,7 +193,7 @@ export default {
 		Upload:'Upload',
 		Library:'Library',
 		Generate:'Generate',
-		Close:'Cancle',
+		Close:'Cancel',
 		currently:'You are currently in the {generateLineUp} th position in the queue',
 		PIN:'PIN',
 		Maximum:'Maximum 8 images can be uploaded, Maximum 2M per image',
@@ -272,7 +272,7 @@ export default {
 		inputContent1:'Input prompt',
 		Generate:'Generate',
 		Sequence:'Sequence',
-		Close:'Cancle',
+		Close:'Cancel',
 		currently:'You are currently in the {generateLineUp} th position in the queue',
 		Merge:'Merge',
 		maximumLength:'The entered content exceeds the maximum length.',
diff --git a/src/tool/guide.js b/src/tool/guide.js
index 88a0be97..2056322d 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -118,7 +118,7 @@ function createDriver(){
 		showButtons:false,
 		stagePadding:10,//切口到元素的距离
 		stageRadius:5,//切口圆弧度
-		allowKeyboardControl:false,//控制是否可以键盘控制下一步
+		allowKeyboardControl:true,//控制是否可以键盘控制下一步
 		disableActiveInteraction:false,//是否禁用显示元素的交互
 		overlayOpacity:.4,
 		overlay: true,
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 4ae83948..8d38d54e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -93,7 +93,7 @@
 												">
 													<img class="content_img" :src="design.designOutfitUrl" />
 												</div>
-												<div class="icon iconfont icon-jushoucang icon_like" :class="[index == 0?driver__.index == 37?'Guide_active showEvents':'':'']" @click.stop="
+												<div class="icon iconfont icon-jushoucang icon_like" :class="[driver__.driver?index == 0?driver__.index == 37?'Guide_active showEvents':'hideEvents':'hideEvents':'']" @click.stop="
 													likeDesignCollection(
 														design,
 														index
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index cd8f15e1..55a3554d 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -15,7 +15,7 @@
 								'login_active',
 							]"
 						>
-							Log on to AiDA
+							Log on to AiDA 3.0
 						</div>
 					</div>
 					<!-- 账号密码登录 start -->