diff --git a/src/apis/createVideo.js b/src/apis/createVideo.js index e9a5335..94de4c2 100644 --- a/src/apis/createVideo.js +++ b/src/apis/createVideo.js @@ -6,9 +6,9 @@ import request from "@/utils/request.js"; * @param sex ,pageNum,pageSize * @returns data */ -export function modeListApi(sex, pageNum, pageSize) { +export function modeListApi(sex, pageNum, pageSize, videoType) { return request({ - url: `/api/personPatch/list?sex=${sex}&pageNum=${pageNum}&pageSize=${pageSize}`, + url: `/api/personPatch/list?sex=${sex}&pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}`, method: 'get' }) } @@ -126,3 +126,27 @@ export function saveImgApi(data) { data }) } + +/** + * @description 删除上传的背景或素材 + * @returns id + */ +export function delImgApi(id) { + return request({ + url: `/api/materialMould/del?id=${id}`, + method: 'get', + }) +} + + +/** + * @description:根据id获取模板详情 + * @param {number} id + * @return data + */ +export function personPatchApi(id) { + return request({ + url: `/api/personPatch/findById?id=${id}`, + method: 'get' + }) +} diff --git a/src/apis/login copy.js b/src/apis/login copy.js deleted file mode 100644 index a5c8b29..0000000 --- a/src/apis/login copy.js +++ /dev/null @@ -1,97 +0,0 @@ -import request from "@/utils/request.js"; - -const baseURL = import.meta.env.VITE_APP_BASE_API - -/** - * @description 注册 - * @params email,password - * @returns data - */ -export function register(data) { - return request({ - url: `/api/user/doRegisterByEmail`, - method: 'post', - data - }) -} - -/** - * @description 登录 - * @params email,password,code - * @returns data - */ -export function login(data) { - return request({ - url: `/api/user/loginByEmail`, - method: 'post', - data - }) -} - -/** -/** - * @description:重新发送邮件 - * @param {string} data - * @return: data - */ -export function sendRegisterEmail(email) { - return request({ - url: `/api/user/sendRegisterEmail`, - method: 'post', - data: { - email - } - }) -} - -/** -/** - * @description:忘记密码发送邮件 - * @param {string} data - * @return: data - */ -export function sendUpdPwdEmailApi(email) { - return request({ - url: `/api/user/sendUpdPwdEmail`, - method: 'post', - data: { - email - } - }) -} - -/** -/** - * @description:邮件重置密码, - * @param pwd, ticket - * @return: data - */ -export function resetPwdEmailApi(data) { - return request({ - url: `/api/user/doUpdPass`, - method: 'post', - data - }) -} - -/** -/** - * @description:邮件重置密码, - * @param oldpwd, newpwd - * @return: data - */ -export function resetPwdFormApi(data) { - return request({ - url: `/api/user/oldUpdPass`, - method: 'post', - data - }) -} - - -/** -* @description:获取图形验证码 -* @return: 验证码地址 -*/ -export const getCodeImgUrl = baseURL + '/api/user/captcha.jpg' - diff --git a/src/assets/img/Scale.png b/src/assets/img/Scale.png new file mode 100644 index 0000000..ead2abf Binary files /dev/null and b/src/assets/img/Scale.png differ diff --git a/src/assets/img/delete.png b/src/assets/img/delete.png new file mode 100644 index 0000000..c200380 Binary files /dev/null and b/src/assets/img/delete.png differ diff --git a/src/components/EditPosition copy.vue b/src/components/EditPosition copy.vue new file mode 100644 index 0000000..39d8f98 --- /dev/null +++ b/src/components/EditPosition copy.vue @@ -0,0 +1,159 @@ + + + diff --git a/src/components/EditPosition.vue b/src/components/EditPosition.vue new file mode 100644 index 0000000..4b9ae4c --- /dev/null +++ b/src/components/EditPosition.vue @@ -0,0 +1,208 @@ + + + diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 9ea2d5d..e5c7bdb 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,6 +2,7 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] + const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] @@ -270,6 +271,7 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef + readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef readonly asyncComputed: UnwrapRef diff --git a/src/types/components.d.ts b/src/types/components.d.ts index b92e3f0..c5566ae 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,9 +8,12 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] - copy: typeof import('./../components/myLoading copy.vue')['default'] + copy: typeof import('./../components/EditPosition copy.vue')['default'] CutImg: typeof import('./../components/cutImg.vue')['default'] CutImg1: typeof import('./../components/cutImg1.vue')['default'] + DoCreateVideo: typeof import('./../components/doCreateVideo.vue')['default'] + EditPosition: typeof import('./../components/EditPosition.vue')['default'] + 'EditPosition copy': typeof import('./../components/EditPosition copy.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] ElCol: typeof import('element-plus/es')['ElCol'] ElDialog: typeof import('element-plus/es')['ElDialog'] diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index c99668e..8f6d927 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -26,8 +26,8 @@
{{ $t("createVideo.all") }}
@@ -50,8 +50,8 @@
{{ $t("createVideo.all") }}
@@ -90,7 +90,16 @@
- + + + +
@@ -264,6 +273,8 @@ class="bjSystemBoxItem" v-for="item in systemBGIList" :key="item.id" + :class="bjImgActive == item.id ? 'ImgBorderActive' : ''" + @click="selectBjImg(item)" >
@@ -293,7 +304,16 @@ class="bjSystemBoxItem" v-for="item in personBGIList" :key="item.id" + :class="bjImgActive == item.id ? 'ImgBorderActive' : ''" + @click="selectBjImg(item)" > +
+ +
@@ -327,6 +347,8 @@ class="bjSystemBoxItem" v-for="item in systemSCIList" :key="item.id" + :class="scImgActive == item.id ? 'ImgBorderActive' : ''" + @click="selectScImg(item)" >
@@ -355,7 +377,16 @@ class="bjSystemBoxItem" v-for="item in personSCIList" :key="item.id" + :class="scImgActive == item.id ? 'ImgBorderActive' : ''" + @click="selectScImg(item)" > +
+ +
@@ -370,6 +401,7 @@ +