From d39b9e6d42a5ae0105f4e970c948698f721a44ad Mon Sep 17 00:00:00 2001 From: congzc Date: Mon, 10 Jul 2023 18:02:32 +0800 Subject: [PATCH] 1 --- src/lang/package/en.ts | 9 ++++++--- src/lang/package/zh-cn.ts | 1 + src/views/createVideo/index.vue | 4 ++++ src/views/myStore/index.vue | 13 ++++++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts index daadd95..40b3542 100644 --- a/src/lang/package/en.ts +++ b/src/lang/package/en.ts @@ -73,7 +73,7 @@ export default { chooseMusic:'Choose Music', searchMusic:'Search Music', comingSoon:'COMING SOON', - hotMusic:'Hit song', + hotMusic:'Hot Song', inputRequirement:'Please enter your requirements, for example: Please generate a beverage advertisement of 500 words or less', GeneratedText:'Generated Text', SmartText:'Smart Text', @@ -81,7 +81,9 @@ export default { tooltip1:'Click to listen', tooltip2:'Add Pause', uploadImgTip1:'Click here to upload pictures', - uploadImgTip2:'Please upload unobstructed frontal photo', + + // uploadImgTip2:'Please upload unobstructed frontal photo', + uploadImgTip2:'please upload a clear frontal photo', entered:'entered' }, @@ -109,7 +111,7 @@ export default { generationSucceed: "Succeed", videoUpSucceed: "HD", videoUpFailed: "UP Failed", - videoUping:'Upgrades', + videoUping:'upgrading', manuscriptText: "Manuscript", generatingText: "The video is generating, Please wait a moment", generationFailedText: "Video generation failed, click Edit button to retry.", @@ -167,6 +169,7 @@ export default { Language:'Language', sound:'Sound', IndividualVideoDuration:'Individual video duration', + Watermark:'Watermark', AIGeneratedPortrait:'AI generated portrait', PhotoSinging:'Photo singing', AIGeneratedText:'The number of times AI generated text', diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts index ef4c1c6..f913524 100644 --- a/src/lang/package/zh-cn.ts +++ b/src/lang/package/zh-cn.ts @@ -167,6 +167,7 @@ export default { Language:'语言', sound:'声音', IndividualVideoDuration:'单个视频时长', + Watermark:'水印', AIGeneratedPortrait:'AI生成人像', PhotoSinging:'照片唱歌', AIGeneratedText:'AI生成脚本次数', diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index 32125c4..dd8ec53 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -2518,6 +2518,8 @@ onUnmounted(() => { } .card2 { .overtimeTips { + height: 0; + opacity: 0; font-size: 16px; // width: 60%; @@ -2645,6 +2647,8 @@ onUnmounted(() => { width: 100%; padding: 10px; .overtimeTips { + opacity: 0; + height: 0; font-size: 16px; // width: 60%; // display: inline-block; diff --git a/src/views/myStore/index.vue b/src/views/myStore/index.vue index 1983662..a4fdf67 100644 --- a/src/views/myStore/index.vue +++ b/src/views/myStore/index.vue @@ -86,6 +86,13 @@ >{{ $t("shop.second") }} +
+ {{ $t("shop.Watermark") }}:{{ + item.userPackageDetails[0].aiPortrait == 0 + ? $t("shop.yes") + : $t("shop.no") + }} +
{{ $t("shop.AIGeneratedPortrait") }}:{{ item.userPackageDetails[0].aiPortrait == 0 @@ -318,7 +325,7 @@ onMounted(async () => { .page { // min-width: calc(100vw - 210px); height: calc(100vh - 80px); - padding: 20px 20px 0 20px; + padding: 0px 20px 0 20px; background-color: #fff; border-radius: 25px 0 0; padding: 20px; @@ -328,7 +335,7 @@ onMounted(async () => { display: flex; justify-content: flex-start; overflow-x: auto; - padding: 70px 20px 20px 10px; + padding: 30px 20px 20px 10px; max-width: 100%; // height: 75%; // overflow: hidden; @@ -340,7 +347,7 @@ onMounted(async () => { // } .item { position: relative; - width: 500px; + width: 480px; // height: 680px; margin-left: 45px; background-color: #fffefd;