From 8221efceb759546df4c55797f196758d74128347 Mon Sep 17 00:00:00 2001 From: congzc Date: Thu, 8 Jun 2023 18:06:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/package/en.ts | 9 ++- src/lang/package/zh-cn.ts | 9 ++- src/utils/request.js | 2 +- src/views/createVideo/index copy.vue | 4 +- src/views/createVideo/index.vue | 88 +++++++++++---------- src/views/myAccount/index.vue | 90 ++++++++++++++++++---- src/views/myCreating/index.vue | 111 ++++++++++++++------------- src/views/myCreating/videoStatus.js | 2 +- src/views/myStore/index.vue | 48 ++++++++---- 9 files changed, 229 insertions(+), 134 deletions(-) diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts index e33eedf..1d3d918 100644 --- a/src/lang/package/en.ts +++ b/src/lang/package/en.ts @@ -58,7 +58,7 @@ export default { reselect: "reselect", sureUpload: "Confirm upload", generateVideo: "Generate Video", - saveVideo:'save video', + saveVideo:'save manuscript', select:'Please select', }, @@ -75,11 +75,11 @@ export default { loading: "Loading , just a moment", noList: "Nothing here. How about making one ?", goCreate: "Go Create !", - draft: "Draft", + manuscript: "manuscript", generating: "Generating", generationFailed: "Failed", generationSucceed: "Succeed", - draftText: "Draft", + manuscriptText: "manuscript", generatingText: "The video is generating, please wait a moment", generationFailedText: "The video generate is failed, Reason:", edit:'edit' @@ -101,7 +101,8 @@ export default { successed: "Successed", failed: "Failed", msg1: "Obtain one video production time", - + inputCode:'Please enter the invitation code', + submit:'submit' }, // 商店 diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts index 14db0ff..4d90359 100644 --- a/src/lang/package/zh-cn.ts +++ b/src/lang/package/zh-cn.ts @@ -58,7 +58,7 @@ export default { reselect: "重新选择", sureUpload: "确认上传", generateVideo: "生成视频", - saveVideo:'保存视频', + saveVideo:'保存草稿', select:'请选择', }, @@ -75,11 +75,11 @@ export default { loading: "加载中,请稍等哦", noList: "暂无没有作品哦,快去尝试制作你的第一个视频吧!", goCreate: "去创作", - draft: "草稿", + manuscript: "草稿", generating: "生成中", generationFailed: "生成失败", generationSucceed: "生成成功", - draftText: "草稿", + manuscriptText: "草稿", generatingText: "视频正在生成中,请稍等哦", generationFailedText: "视频生成失败。原因:", edit:'编辑' @@ -101,7 +101,8 @@ export default { successed: "支付成功", failed: "支付失败", msg1: "获得视频制作次数一次", - + inputCode:'请输入邀请码', + submit:'提交' }, // 商店 diff --git a/src/utils/request.js b/src/utils/request.js index 71972a3..ff81ee4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ ElMessage // 开发环境需以 "/api" 拼接,其他环境需以 "/C" 拼接 const env = process.env.NODE_ENV == 'development' ? "/api" : "/C" -console.log(process.env.NODE_ENV, 'env') +// console.log(process.env.NODE_ENV, 'env') /** * @description:发送Axios请求 diff --git a/src/views/createVideo/index copy.vue b/src/views/createVideo/index copy.vue index 4cfe35f..91438d2 100644 --- a/src/views/createVideo/index copy.vue +++ b/src/views/createVideo/index copy.vue @@ -690,7 +690,7 @@ async function uploadProgress(videoId, isSaveVideo) { const res3 = await saveOrUpdateApi(saveOrUpdateData); // 保存数据 if (isSaveVideo == "saveVideo") { ElMessage.success( - lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as draft` + lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as manuscript` ); createLoading.value = false; return; @@ -737,7 +737,7 @@ async function saveOrUpdate(index, isSaveVideo) { const res2 = await saveOrUpdateApi(saveOrUpdateData); // 保存数据 if (isSaveVideo == "saveVideo") { ElMessage.success( - lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as draft` + lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as manuscript` ); createLoading.value = false; return; diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index bdec3c7..ae8bcd4 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -213,6 +213,7 @@
- - + + {{ - $t("createVideo.generateVideo") + $t("createVideo.saveVideo") }} - + {{ - $t("createVideo.saveVideo") + $t("createVideo.generateVideo") }}
@@ -322,23 +327,13 @@ @click="e.target.value = null" @change="handleFileChange" /> -

{{ $t("createVideo.recordedAudio") }}

-
+
- - -
- - - - {{ - $t("createVideo.generateVideo") - }} - +
+ +
{{ $t("createVideo.saveVideo") }} + + + + {{ + $t("createVideo.generateVideo") + }} +
@@ -870,7 +867,7 @@ async function uploadProgress(videoId, isSaveVideo) { // 这个if判断是不是仅仅保存视频 if (isSaveVideo == "saveVideo") { ElMessage.success( - lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as draft` + lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as manuscript` ); createLoading.value = false; router.push("/myCreating"); @@ -922,7 +919,7 @@ async function saveOrUpdate(index, isSaveVideo) { // 这个if判断是不是仅仅保存视频 if (isSaveVideo == "saveVideo") { ElMessage.success( - lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as draft` + lanChange.value == "zh-cn" ? `已保存为草稿` : `Saved as manuscript` ); createLoading.value = false; router.push("/myCreating"); @@ -1004,7 +1001,7 @@ onMounted(async () => { .page { // height: 1200px; height: calc(100vh - 80px); - padding: 20px 0 0 40px; + // padding: 20px 0 0 40px; background-color: #fff; border-radius: 25px 0 0; } @@ -1012,7 +1009,7 @@ onMounted(async () => { .left { width: 70%; height: 80%; - + padding: 20px; :deep(.el-input__wrapper) { border: none; border-bottom: 2px solid #000; @@ -1057,6 +1054,7 @@ onMounted(async () => { img { max-width: 100%; max-height: 100%; + border-radius: 15px; } } @@ -1064,7 +1062,8 @@ onMounted(async () => { position: relative; width: 100%; height: 100%; - border: 1px solid #000; + border: 1px solid #ccc; + border-radius: 30px; .imgBox { position: relative; width: 100%; @@ -1281,10 +1280,11 @@ onMounted(async () => { } .right { - width: 25%; + width: 30%; height: 100%; - background-color: green; - + padding: 30px 30px 20px 30px; + background-color: #f1f2f6; + border-radius: 30px 0 0 0; :deep(.el-tabs--border-card) { font-size: 20px; border: none; @@ -1292,6 +1292,8 @@ onMounted(async () => { .tabs { height: 100%; + padding: 20px 20px 0px 20px; + border-radius: 20px; .card1 { .text { padding: 10px; @@ -1308,7 +1310,7 @@ onMounted(async () => { } p { - margin: 10px 0; + margin: 7px 0; } > .el-button { @@ -1397,6 +1399,12 @@ onMounted(async () => { height: 100%; } } + .AudioBox { + display: flex; + justify-content: space-around; + padding: 20px; + transition: all 0.3s; + } > .el-button { width: 100%; height: 50px; diff --git a/src/views/myAccount/index.vue b/src/views/myAccount/index.vue index 170221a..6ca048e 100644 --- a/src/views/myAccount/index.vue +++ b/src/views/myAccount/index.vue @@ -19,10 +19,10 @@
-
+
3 Videos Generation Left
-
+
剩余生成视频次数:3条
{{ $t("account.until") }} 2023/12/31
@@ -30,7 +30,7 @@ {{ $t("account.getMore") }}
- +
-
+
Invite friends to get free video Generation! +

+ your Invitation code: + qweiuqkljzxcahdouiahsd +

-
+
邀请更多好友 免费 生成视频! -

+

邀请码: qweiuqkljzxcahdouiahsd

@@ -67,6 +71,15 @@
+ +
+ + {{ $t("account.submit") }} +
@@ -115,9 +128,9 @@ import { useRouter } from "vue-router"; import { userInfoPinia } from "@/store/modules/userInfo"; const { locale } = useI18n(); -const currentLan = ref(locale); +const lanChange = ref(locale); //国际化 -const userInfo = userInfoPinia(); +const userInfo = userInfoPinia(); //pinia //#region 二维码区域 // 点击复制邀请码 function copyInviteCode() { @@ -140,7 +153,14 @@ function DownloadCodeImg() { link.click(); } //#endregion +const inputCode = ref(""); +//#region 输入邀请码区 + +//#endregion --------------------------- + +//#region +//#endregion --------------------------- const router = useRouter(); function routerTo(url) { router.push(url); @@ -149,7 +169,7 @@ function routerTo(url) {