调整取消generat布局

src/assets/style/style.css

@@ -958,7 +958,10 @@ i {
 }
 .mark_loading .mark_loading_text {
   text-align: center;
-  font-size: 2.5rem;
+  font-size: 2rem;
+  position: absolute;
+  bottom: 7%;
+  right: 7%;
 }
 .mark_loading .mark_loading_text div {
   margin-top: 10px;
@@ -967,10 +970,16 @@ i {
   margin: 0 5px;
   color: red;
 }
-.mark_loading .mark_loading_text .mark_loading_btn {
+.mark_loading .mark_loading_btn {
+  margin-top: 10px;
+  text-align: center;
   border: 2px solid;
   display: inline-block;
   padding: 0 20px;
   border-radius: 10px;
   cursor: pointer;
+  padding: 0.3rem 4rem;
+  background: #39215b;
+  color: #fff;
+  border: none;
 }

src/assets/style/style.less

@@ -1045,7 +1045,10 @@ i{
 	flex-direction: column;
 	.mark_loading_text{
 		text-align: center;
-		font-size: 2.5rem;
+		font-size: 2rem;
+		position: absolute;
+		bottom: 7%;
+		right: 7%;
 		div{
 			margin-top: 10px;
 			span{
@@ -1055,12 +1058,21 @@ i{
 				
 			}
 		}
-		.mark_loading_btn{
+		
-			border: 2px solid;
+	}
-			display: inline-block;
+	.mark_loading_btn{
-			padding: 0 20px;
+		// border: #000;
-			border-radius: 10px;
+		// color: #fff;
-			cursor: pointer;
+		margin-top: 10px;
-		}
+		text-align: center;
+		border: 2px solid;
+		display: inline-block;
+		padding: 0 20px;
+		border-radius: 10px;
+		cursor: pointer;
+		padding: .3rem 4rem;
+		background: #39215b;
+		color: #fff;
+		border: none;
 	}
 }

src/component/Detail/setDesignItemMobile.vue

@@ -432,7 +432,6 @@ export default defineComponent({
 							if(item.id === i.id){
 								i.layersObject = item.layersObject
 								i.priority = item.layersObject[0].priority
-							console.log(item,i);
 							}
 						})
 					})

src/component/HomePage/Generate.vue

@@ -52,8 +52,7 @@
                 v-model="searchPictureName"
                 @keydown.enter="getgenerate()"
             />
-            <div v-if="!loadingShow" class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div>
+            <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div>
-            <div v-else class="generage_btn started_btn" :class="[driver__.driver?'hideEvents':'']" @click.stop="removeGenerate">{{ $t('Generate.Close') }}</div>
 			<span>{{ $t('Generate.maximumLength') }}</span>
         </div>
         <div v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" class="generage_img Guide_1_6">
@@ -176,9 +175,10 @@
             </div>
 			<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.currently',{generateLineUp:generateLineUp}) }}</div>
+					<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
 				</div>
+				<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
 			</div>
         </div>
 		<scaleImage ref="scaleImage"></scaleImage>

src/component/HomePage/PrintboardUpload.vue

@@ -127,9 +127,10 @@
 					</div>
 					<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('PrintboardUpload.currently',{generateLineUp:generateLineUp}) }}</div>
+							<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
 						</div>
+						<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
 					</div>
 				</div>
 				

src/component/HomePage/SketchboardUpload.vue

@@ -249,9 +249,10 @@
 					</div>
 					<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.currently',{generateLineUp:generateLineUp}) }}</div>
+							<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
 						</div>
+						<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
 					</div>
 				</div>
 			</div>

src/lang/cn.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'真实画风',
 		inputContent1:'输入生成图片的标题',
 		Generate:'生成',
+		Sequence:'队列',
 		Close:'取消',
 		currently:'您排在队列中的第{generateLineUp}位',
 		Merge:'合成',

src/lang/en.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'Real Style',
 		inputContent1:'Input prompt',
 		Generate:'Generate',
+		Sequence:'Sequence',
 		Close:'Close',
 		currently:'You are currently in the {generateLineUp} th position in the queue',
 		Merge:'Merge',

src/lang/fr.ts

@@ -272,6 +272,7 @@ export default {
 		Model3:'Style réel',
 		inputContent1:'Saisie rapide',
 		Generate:'Générer',
+		Sequence:'Séquence',
 		Close:'Fermer',
 		currently:"Vous êtes actuellement à la {generateLineUp}ème position dans la file d'attente.",
 		Merge:'Fusionner',

src/lang/it.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'Stile reale',
 		inputContent1:'Immissione rapida',
 		Generate:'creare',
+		Sequence:'Sequenza',
 		Close:'Chiudere',
 		currently:'Al momento ti trovi alla {generateLineUp}ª posizione nella coda.',
 		Merge:'Unire',

src/lang/ja.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'リアルなスタイル',
 		inputContent1:'プロンプト入力',
 		Generate:'生成する',
+		Sequence:'シーケンス',
 		Close:'閉じる',
 		currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。',
 		Model:'モデル',

src/lang/kr.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'리얼 스타일',
 		inputContent1:'프롬프트 입력',
 		Generate:'생성하다',
+		Sequence:'순서',
 		Close:'닫기',
 		currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.',
 		Merge:'병합',

src/lang/ru.ts

@@ -273,6 +273,7 @@ export default {
 		Model3:'Реалистический стиль',
 		inputContent1:'Быстрый ввод',
 		Generate:'Генерировать',
+		Sequence:'Последовательность ',
 		Close:'Закрыть ',
 		currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.',
 		Merge:'слияние',

src/lang/th.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'สไตล์แบบจริง',
 		inputContent1:'ป้อนข้อมูลทันที',
 		Generate:'กำเนิด',
+		Sequence:'ลำดับ ',
 		Close:'ปิด',
 		currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว',
 		Merge:'รวมเข้าด้วยกัน',

src/lang/vn.ts

@@ -271,6 +271,7 @@ export default {
 		Model3:'Phong cách thực tế',
 		inputContent1:'Nhập liệu nhanh chóng',
 		Generate:'Phát ra',
+		Sequence:'chuỗi ',
 		Close:'Đóng',
 		currently:'Bạn hiện đang ở vị trí thứ {generateLineUp} trong hàng đợi.',
 		Merge:'hợp nhất',

src/tool/util.js

@@ -165,7 +165,6 @@ function getBrowserInfo() {//获取是什么浏览器
 	var regStr_saf = /safari\/[\d.]+/gi;
 	var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器 
 	var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器  
-	console.log(isIE,isEdge);
 	//IE
 	if (agent.indexOf("msie") > 0) {
 		return agent.match(regStr_ie);

src/views/LibraryPage.vue

@@ -407,10 +407,11 @@
         <!-- 蒙层 start-->
         <div class="mark_loading" v-show="isShowMark">
             <a-spin size="large" />
-			<div class="mark_loading_text" v-show="isGenerate">
+			<div class="mark_loading_text" v-show="generateLineUp >= 0">
-				<div v-show="generateLineUp > 0">{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}</div>
+				<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
-				<div class="mark_loading_btn" @click="removeGenerate">{{$t('LibraryPage.Close')}}</div>
 			</div>
+			<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
+
         </div>
         <!-- 蒙层 end-->
 		<RobotAssist></RobotAssist>