From de51a1ba899d5eef80378561827018178fa3526f Mon Sep 17 00:00:00 2001 From: congzc Date: Fri, 21 Jul 2023 18:13:58 +0800 Subject: [PATCH] 1 --- src/apis/createVideo.js | 28 +++- src/apis/login copy.js | 97 ----------- src/assets/img/Scale.png | Bin 0 -> 2946 bytes src/assets/img/delete.png | Bin 0 -> 3840 bytes src/components/EditPosition copy.vue | 159 ++++++++++++++++++ src/components/EditPosition.vue | 208 +++++++++++++++++++++++ src/types/auto-imports.d.ts | 2 + src/types/components.d.ts | 5 +- src/views/createVideo/index.vue | 240 ++++++++++++++++++++------- 9 files changed, 581 insertions(+), 158 deletions(-) delete mode 100644 src/apis/login copy.js create mode 100644 src/assets/img/Scale.png create mode 100644 src/assets/img/delete.png create mode 100644 src/components/EditPosition copy.vue create mode 100644 src/components/EditPosition.vue 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 0000000000000000000000000000000000000000..ead2abf8d639435f26e9be2d59bdb97f65fbdcfb GIT binary patch literal 2946 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 literal 0 HcmV?d00001 diff --git a/src/assets/img/delete.png b/src/assets/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..c20038052e7b2cae2366c574a424987cc6583dab GIT binary patch literal 3840 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 +
+ +
+ +
+ +
+
+
+
+
+
+
+ + + 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 @@ +