From 93e34aebfd453010843377d945686102fdbe44e7 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 25 Jan 2024 15:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=96=E6=B6=88generat?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 13 +++++++-- src/assets/style/style.less | 28 ++++++++++++++------ src/component/Detail/setDesignItemMobile.vue | 1 - src/component/HomePage/Generate.vue | 8 +++--- src/component/HomePage/PrintboardUpload.vue | 5 ++-- src/component/HomePage/SketchboardUpload.vue | 5 ++-- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/lang/fr.ts | 1 + src/lang/it.ts | 1 + src/lang/ja.ts | 1 + src/lang/kr.ts | 1 + src/lang/ru.ts | 1 + src/lang/th.ts | 1 + src/lang/vn.ts | 1 + src/tool/util.js | 1 - src/views/LibraryPage.vue | 7 ++--- 17 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index b4013cf0..e4ab58b5 100644 --- a/src/assets/style/style.css +++ b/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; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 83c1c60e..7b8f9141 100644 --- a/src/assets/style/style.less +++ b/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; - padding: 0 20px; - border-radius: 10px; - cursor: pointer; - } + + } + .mark_loading_btn{ + // border: #000; + // color: #fff; + 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; } } diff --git a/src/component/Detail/setDesignItemMobile.vue b/src/component/Detail/setDesignItemMobile.vue index 54a4bb9d..e890863b 100644 --- a/src/component/Detail/setDesignItemMobile.vue +++ b/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); } }) }) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 3367f9eb..6bff1ca9 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -52,8 +52,7 @@ v-model="searchPictureName" @keydown.enter="getgenerate()" /> -
{{ $t('Generate.Generate') }}
-
{{ $t('Generate.Close') }}
+
{{ $t('Generate.Generate') }}
{{ $t('Generate.maximumLength') }}
@@ -176,9 +175,10 @@
-
-
{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}
+
+
{{$t('Generate.Sequence')}}: {{ generateLineUp }}
+
{{$t('Generate.Close')}}
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 368ba81d..3320457b 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -127,9 +127,10 @@
-
-
{{ $t('PrintboardUpload.currently',{generateLineUp:generateLineUp}) }}
+
+
{{$t('Generate.Sequence')}}: {{ generateLineUp }}
+
{{$t('Generate.Close')}}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 6a033ccb..162001d1 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -249,9 +249,10 @@
-
-
{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}
+
+
{{$t('Generate.Sequence')}}: {{ generateLineUp }}
+
{{$t('Generate.Close')}}
diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 8c7d1362..d3afadb5 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -271,6 +271,7 @@ export default { Model3:'真实画风', inputContent1:'输入生成图片的标题', Generate:'生成', + Sequence:'队列', Close:'取消', currently:'您排在队列中的第{generateLineUp}位', Merge:'合成', diff --git a/src/lang/en.ts b/src/lang/en.ts index 7692ec41..7c57b31b 100644 --- a/src/lang/en.ts +++ b/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', diff --git a/src/lang/fr.ts b/src/lang/fr.ts index e60fc350..c3447c72 100644 --- a/src/lang/fr.ts +++ b/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', diff --git a/src/lang/it.ts b/src/lang/it.ts index 49aec5a8..12cf04a3 100644 --- a/src/lang/it.ts +++ b/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', diff --git a/src/lang/ja.ts b/src/lang/ja.ts index a7855b71..36bda02d 100644 --- a/src/lang/ja.ts +++ b/src/lang/ja.ts @@ -271,6 +271,7 @@ export default { Model3:'リアルなスタイル', inputContent1:'プロンプト入力', Generate:'生成する', + Sequence:'シーケンス', Close:'閉じる', currently:'現在、あなたは待ち行列の {generateLineUp} 番目の位置にいます。', Model:'モデル', diff --git a/src/lang/kr.ts b/src/lang/kr.ts index e8cdbbee..0dd18fda 100644 --- a/src/lang/kr.ts +++ b/src/lang/kr.ts @@ -271,6 +271,7 @@ export default { Model3:'리얼 스타일', inputContent1:'프롬프트 입력', Generate:'생성하다', + Sequence:'순서', Close:'닫기', currently:'현재 대기열에서 {generateLineUp} 번째 위치에 있습니다.', Merge:'병합', diff --git a/src/lang/ru.ts b/src/lang/ru.ts index 0225a7ae..1517de20 100644 --- a/src/lang/ru.ts +++ b/src/lang/ru.ts @@ -273,6 +273,7 @@ export default { Model3:'Реалистический стиль', inputContent1:'Быстрый ввод', Generate:'Генерировать', + Sequence:'Последовательность ', Close:'Закрыть ', currently:'В данный момент вы находитесь на {generateLineUp} позиции в очереди.', Merge:'слияние', diff --git a/src/lang/th.ts b/src/lang/th.ts index 1bb3ccae..cd182731 100644 --- a/src/lang/th.ts +++ b/src/lang/th.ts @@ -271,6 +271,7 @@ export default { Model3:'สไตล์แบบจริง', inputContent1:'ป้อนข้อมูลทันที', Generate:'กำเนิด', + Sequence:'ลำดับ ', Close:'ปิด', currently:'คุณอยู่ในตำแหน่งที่ {generateLineUp} ในคิว', Merge:'รวมเข้าด้วยกัน', diff --git a/src/lang/vn.ts b/src/lang/vn.ts index 5921f3cf..9a3eccfd 100644 --- a/src/lang/vn.ts +++ b/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', diff --git a/src/tool/util.js b/src/tool/util.js index 3c617e72..9b7ed5b7 100644 --- a/src/tool/util.js +++ b/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); diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index 125752e0..36079677 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -407,10 +407,11 @@
-
-
{{ $t('Generate.currently',{generateLineUp:generateLineUp}) }}
-
{{$t('LibraryPage.Close')}}
+
+
{{$t('Generate.Sequence')}}: {{ generateLineUp }}
+
{{$t('Generate.Close')}}
+