diff --git a/README.md b/README.md index 05aefe8..23df7d7 100644 --- a/README.md +++ b/README.md @@ -150,4 +150,5 @@ proxy_pass http://vapi.youlai.tech/; git commit -m "feat: " -git commit --no-verify -m "提交时的注释" 跳过检验 \ No newline at end of file +git commit --no-verify -m "提交时的注释" 跳过检验 +git merge origin/dev_ \ No newline at end of file diff --git a/src/apis/createVideo.js b/src/apis/createVideo.js index 5c09f13..eeeb9ee 100644 --- a/src/apis/createVideo.js +++ b/src/apis/createVideo.js @@ -5,9 +5,9 @@ import request from "@/utils/request.js"; * @params pageNum, pageSize * @returns data */ -export function personPhotoList(pageNum, pageSize) { +export function personPhotoList(pageNum, pageSize, sendType) { return request({ - url: `api/personPhoto/list?pageNum=${pageNum}&pageSize=${pageSize}`, + url: `api/personPhoto/list?pageNum=${pageNum}&pageSize=${pageSize}&sendType=${sendType}`, method: 'get' }) } @@ -48,4 +48,40 @@ export function videoUpload(data) { method: 'post', data }) +} + +/** + * @description 获取视频上传进度 + * @params videoId + * @returns data + */ +export function uploadProgressApi(videoId) { + return request({ + url: `api/video/uploadProgress?videoId=${videoId}`, + method: 'GET', + }) +} + +/** + * @description 获取语言 + * @params + * @returns data + */ +export function voiceTotalApi() { + return request({ + url: `api/voiceMould/voiceTotal`, + method: 'GET', + }) +} + +/** + * @description 获取声音列表 + * @params id + * @returns data + */ +export function chooseTypeApi(id) { + return request({ + url: `api/voiceMould/chooseType/?id=${id}`, + method: 'GET', + }) } \ No newline at end of file diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 0d3a5c4..5386731 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -22,14 +22,10 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href); class="h-full w-full flex items-center justify-center left-top-box" to="/" > - diff --git a/src/store/modules/userInfo.js b/src/store/modules/userInfo.js new file mode 100644 index 0000000..aeb506f --- /dev/null +++ b/src/store/modules/userInfo.js @@ -0,0 +1,12 @@ +import { defineStore } from "pinia"; +import { store } from "@/store"; + +export const userInfoPinia = defineStore("userInfo", () => { + // state + const email = ref(""); + function setEmail(params) { + email.value = params + } + + return { email, setEmail }; +}); \ No newline at end of file diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 1b3e870..5ab0126 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -70,11 +70,11 @@ } } - .is-active > .el-sub-menu__title { + .is-active>.el-sub-menu__title { color: $subMenuActiveText !important; } - & .nest-menu .el-sub-menu > .el-sub-menu__title, + & .nest-menu .el-sub-menu>.el-sub-menu__title, & .el-sub-menu .el-menu-item { min-width: $sideBarWidth !important; background-color: $subMenuBg !important; @@ -87,7 +87,7 @@ .hideSidebar { .sidebar-container { - width: 54px !important; + // width: 54px !important; .svg-icon { margin-right: 0; @@ -95,13 +95,13 @@ } .main-container { - margin-left: 54px; + // margin-left: 54px; } .el-sub-menu { overflow: hidden; - & > .el-sub-menu__title { + &>.el-sub-menu__title { padding: 0 !important; .svg-icon { @@ -120,8 +120,8 @@ .el-menu--collapse { .el-sub-menu { - & > .el-sub-menu__title { - & > span { + &>.el-sub-menu__title { + &>span { display: inline-block; width: 0; height: 0; @@ -158,6 +158,7 @@ } .withoutAnimation { + .main-container, .sidebar-container { transition: none; @@ -167,7 +168,7 @@ // when menu collapsed .el-menu--vertical { - & > .el-menu { + &>.el-menu { .svg-icon { margin-right: 16px; } @@ -178,7 +179,7 @@ } } - .nest-menu .el-sub-menu > .el-sub-menu__title, + .nest-menu .el-sub-menu>.el-sub-menu__title, .el-menu-item { &:hover { // you can use $subMenuHover @@ -187,7 +188,7 @@ } // the scroll bar appears when the subMenu is too long - > .el-menu--popup { + >.el-menu--popup { max-height: 100vh; overflow-y: auto; @@ -204,4 +205,4 @@ border-radius: 20px; } } -} +} \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 151c1b1..3f6b0ea 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -12,7 +12,7 @@ console.log(process.env.NODE_ENV, 'env') */ const request = axios.create({ baseURL: env, - timeout: 5000 + timeout: 15000 }) // 请求拦截器 diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index 3f0e922..7867a1a 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -99,9 +99,10 @@ v-for="item in AiFaceList" :key="item.id" > - - -

{{ item.title }}

+
+ +
+ s @@ -131,7 +132,9 @@
🕗

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

+ + :label="item.name" + :value="item.id" + > + + {{ item.name }} +

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

+

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

+ {{ @@ -184,8 +203,14 @@

+ - +
OLO
- weqrewerwer@mail.com + {{ userInfo.email }}