| @@ -41,13 +41,19 @@ declare module '@vue/runtime-core' { | |||||
| GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] | GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] | ||||
| Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] | Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] | ||||
| IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] | IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] | ||||
| IEpCloseBold: typeof import('~icons/ep/close-bold')['default'] | |||||
| IEpDelete: typeof import('~icons/ep/delete')['default'] | |||||
| IEpDocumentAdd: typeof import('~icons/ep/document-add')['default'] | IEpDocumentAdd: typeof import('~icons/ep/document-add')['default'] | ||||
| IEpDownload: typeof import('~icons/ep/download')['default'] | |||||
| IEpEdit: typeof import('~icons/ep/edit')['default'] | IEpEdit: typeof import('~icons/ep/edit')['default'] | ||||
| IEpGoods: typeof import('~icons/ep/goods')['default'] | IEpGoods: typeof import('~icons/ep/goods')['default'] | ||||
| IEpLoading: typeof import('~icons/ep/loading')['default'] | |||||
| IEpLock: typeof import('~icons/ep/lock')['default'] | IEpLock: typeof import('~icons/ep/lock')['default'] | ||||
| IEpMenu: typeof import('~icons/ep/menu')['default'] | IEpMenu: typeof import('~icons/ep/menu')['default'] | ||||
| IEpPhone: typeof import('~icons/ep/phone')['default'] | IEpPhone: typeof import('~icons/ep/phone')['default'] | ||||
| IEpSearch: typeof import('~icons/ep/search')['default'] | |||||
| IEpUser: typeof import('~icons/ep/user')['default'] | IEpUser: typeof import('~icons/ep/user')['default'] | ||||
| IEpVideoPlay: typeof import('~icons/ep/video-play')['default'] | |||||
| LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] | LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] | ||||
| MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] | MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] | ||||
| MyLoading: typeof import('./../components/myLoading.vue')['default'] | MyLoading: typeof import('./../components/myLoading.vue')['default'] | ||||
| @@ -69,7 +69,7 @@ request.interceptors.response.use( | |||||
| ); | ); | ||||
| return | return | ||||
| // 弹出错误 | // 弹出错误 | ||||
| } else if (code != 200) { | |||||
| } else if (code != 200 && code !== 64001) { | |||||
| if (code == 500) { | if (code == 500) { | ||||
| // ElMessage.error("系统异常,请稍后再试"); | // ElMessage.error("系统异常,请稍后再试"); | ||||
| // ElMessage.error($t('tips.systemException')); | // ElMessage.error($t('tips.systemException')); | ||||
| @@ -500,19 +500,18 @@ | |||||
| :placeholder="$t('createVideo.select')" | :placeholder="$t('createVideo.select')" | ||||
| style="width: 100%" | style="width: 100%" | ||||
| > | > | ||||
| <el-option :value="0" label="定制声音"></el-option> | |||||
| <el-option | <el-option | ||||
| v-for="item in soundOptions" | v-for="item in soundOptions" | ||||
| :key="item.value" | :key="item.value" | ||||
| :label=" | |||||
| (lanChange == 'zh-cn' | |||||
| :value="item.id" | |||||
| > {{ (lanChange == 'zh-cn' | |||||
| ? item.displayName + ` (${item.sex == 1 ? '男' : '女'})` | ? item.displayName + ` (${item.sex == 1 ? '男' : '女'})` | ||||
| : item.localName + | : item.localName + | ||||
| ` (${item.sex == 1 ? 'male' : 'female'})`) + | ` (${item.sex == 1 ? 'male' : 'female'})`) + | ||||
| returnAge(item.ageType) | returnAge(item.ageType) | ||||
| " | |||||
| :value="item.id" | |||||
| /> | |||||
| }} | |||||
| <span v-if="item.customized === 1" style="color:red">(私人订制)</span> | |||||
| </el-option> | |||||
| </el-select> | </el-select> | ||||
| <p>{{ $t("createVideo.styles") }}</p> | <p>{{ $t("createVideo.styles") }}</p> | ||||
| <!-- 风格 --> | <!-- 风格 --> | ||||
| @@ -949,6 +948,9 @@ async function voiceTotal() { | |||||
| const soundOptions = ref([]); | const soundOptions = ref([]); | ||||
| async function chooseType() { | async function chooseType() { | ||||
| const res = await chooseTypeApi(language.value); | const res = await chooseTypeApi(language.value); | ||||
| res.data.sort(function(a, b){ | |||||
| return a.customized > b.customized ? 1 : -1 | |||||
| }) | |||||
| soundOptions.value = res.data; | soundOptions.value = res.data; | ||||
| sound.value = null; | sound.value = null; | ||||
| } | } | ||||
| @@ -1636,10 +1638,10 @@ async function createVideo() { | |||||
| await saveOrUpdate("isCreate"); | await saveOrUpdate("isCreate"); | ||||
| const res2 = await createVideoApi(workId.value); | const res2 = await createVideoApi(workId.value); | ||||
| // 去充值 | // 去充值 | ||||
| if (res2.code === '64001') { | |||||
| if (res2.code === 64001) { | |||||
| // router.push("/myStore"); | // router.push("/myStore"); | ||||
| router.push({ | router.push({ | ||||
| path: "/businessCheck", | |||||
| path: "/myStore", | |||||
| query: { | query: { | ||||
| tag: 'createVideo' | tag: 'createVideo' | ||||
| }, | }, | ||||
| @@ -85,7 +85,7 @@ const handleCurrentChange = (val) => { | |||||
| const getListData = async (PageNum, PageSize) => { | const getListData = async (PageNum, PageSize) => { | ||||
| try { | try { | ||||
| let data = { | let data = { | ||||
| projectType: 1, | |||||
| projectType: 2, | |||||
| pageNum: 1, | pageNum: 1, | ||||
| pageSize: 10 | pageSize: 10 | ||||
| } | } | ||||
| @@ -4,7 +4,7 @@ | |||||
| <el-table :data="tableData" style="width: 100%; height: 90%" size="large" align="center" border> | <el-table :data="tableData" style="width: 100%; height: 90%" size="large" align="center" border> | ||||
| <el-table-column | <el-table-column | ||||
| prop="title" | |||||
| prop="productTitle" | |||||
| label="名称" | label="名称" | ||||
| align="center" | align="center" | ||||
| /> | /> | ||||
| @@ -85,7 +85,7 @@ const handleCurrentChange = (val) => { | |||||
| const getListData = async (PageNum, PageSize) => { | const getListData = async (PageNum, PageSize) => { | ||||
| try { | try { | ||||
| let data = { | let data = { | ||||
| projectType: 1, | |||||
| projectType: 2, | |||||
| pageNum: 1, | pageNum: 1, | ||||
| pageSize: 10 | pageSize: 10 | ||||
| } | } | ||||