From 1a6befe3582af362b01b2dbd0267a918083be304 Mon Sep 17 00:00:00 2001 From: congzc Date: Wed, 12 Apr 2023 18:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E7=B4=A0?= =?UTF-8?q?=E6=9D=90=E5=9B=BE=E7=89=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 19 ++ package.json | 1 + src/api/editModel.js | 56 ++++++ src/api/myPage.js | 4 +- src/components/CutImg.vue | 14 +- src/components/editPosition.vue | 94 +++++----- src/main.js | 3 + src/utils/request.js | 1 - src/views/model/chooseModel.vue | 12 +- src/views/model/editModel.vue | 293 +++++++++++++++++++++++++------ src/views/model/previewModel.vue | 31 ++-- src/views/myPage/myPage.vue | 114 +++++++++--- yarn.lock | 10 +- 13 files changed, 498 insertions(+), 154 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85851b1..f0c171f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "vue-cropper": "^0.5.11", "vue-masonry": "^0.16.0", "vue-router": "^3.2.0", + "vue-waterfall2": "^1.10.6", "vuex": "^3.4.0" }, "devDependencies": { @@ -17150,6 +17151,15 @@ "dev": true, "license": "MIT" }, + "node_modules/vue-waterfall2": { + "version": "1.10.6", + "resolved": "https://registry.npmmirror.com/vue-waterfall2/-/vue-waterfall2-1.10.6.tgz", + "integrity": "sha512-roL8gYdFkWcpqeUqci8+RPj4rCDMrdmiSaZ2V7MZSy1vkYmfLpBPxHn1OshWPefBYGyilasnBqdQPUeL3ddrbw==", + "dependencies": { + "babel-runtime": "^6.26.0", + "regenerator-runtime": "^0.13.1" + } + }, "node_modules/vuex": { "version": "3.6.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz", @@ -30665,6 +30675,15 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue-waterfall2": { + "version": "1.10.6", + "resolved": "https://registry.npmmirror.com/vue-waterfall2/-/vue-waterfall2-1.10.6.tgz", + "integrity": "sha512-roL8gYdFkWcpqeUqci8+RPj4rCDMrdmiSaZ2V7MZSy1vkYmfLpBPxHn1OshWPefBYGyilasnBqdQPUeL3ddrbw==", + "requires": { + "babel-runtime": "^6.26.0", + "regenerator-runtime": "^0.13.1" + } + }, "vuex": { "version": "3.6.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz", diff --git a/package.json b/package.json index ac7ca67..0b16f51 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "vue-cropper": "^0.5.11", "vue-masonry": "^0.16.0", "vue-router": "^3.2.0", + "vue-waterfall2": "^1.10.6", "vuex": "^3.4.0" }, "devDependencies": { diff --git a/src/api/editModel.js b/src/api/editModel.js index ce6a7cb..9cefd7e 100644 --- a/src/api/editModel.js +++ b/src/api/editModel.js @@ -1,6 +1,18 @@ import request from '@/utils/request' // https://smapitest.malls.iformall.com/C/api/upload/awsImgUpload // https://smapitest.malls.iformall.com/C/api/ + +/** + * @description 获取语音列表 + * @returns personMouldId,paperwork + */ +export function voiceList(data) { + return request({ + url: `/api/voiceMould/voiceList?pageNum=1&pageSize=20`, + method: 'POST', + data + }) +} /** * @description 试听MP3 * @returns id @@ -11,6 +23,50 @@ export function videoDetial(id) { method: 'get', }) } + +/** + * @description 查询系统背景 + * @returns pageNum,pageSize,videoType + */ +export function systemBGIListApi(pageNum,pageSize,videoType) { + return request({ + url: `/api/materialMould/list?type=4&pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}`, + method: 'get', + }) +} +/** + * @description 查询我上传的背景 + * @returns pageNum,pageSize,videoType + */ +export function myBGIListApi(pageNum,pageSize,videoType) { + return request({ + url: `/api/materialMould/userList?type=4&pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}`, + method: 'get', + }) +} + +/** + * @description 查询系统素材 + * @returns pageNum,pageSize,videoType + */ +export function systemScListApi(pageNum,pageSize) { + return request({ + url: `/api/materialMould/list?type=5&pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'get', + }) +} + +/** + * @description 查询我上传的素材 + * @returns pageNum,pageSize,videoType + */ +export function myScListApi(pageNum,pageSize) { + return request({ + url: `/api/materialMould/userList?type=5&pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'get', + }) +} + /** * @description 上传背景图 * @returns data diff --git a/src/api/myPage.js b/src/api/myPage.js index e24c009..68a8491 100644 --- a/src/api/myPage.js +++ b/src/api/myPage.js @@ -5,9 +5,9 @@ import request from '@/utils/request' * @param {number} pageParams (pageNum, pageSize) * @returns data */ -export function getVideoList(pageNum, pageSize) { +export function getVideoList(pageNum, pageSize,videoType) { return request({ - url: `/api/userVideo/list?pageNum=${pageNum}&pageSize=${pageSize}`, + url: `/api/userVideo/list?pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}`, method: 'get' }) } diff --git a/src/components/CutImg.vue b/src/components/CutImg.vue index 0e4781a..612f68c 100644 --- a/src/components/CutImg.vue +++ b/src/components/CutImg.vue @@ -1,9 +1,15 @@ @@ -180,6 +188,7 @@ +
@@ -192,7 +201,7 @@ /> 更换背景
-
+
@@ -201,14 +210,14 @@
背景库
@@ -216,8 +225,8 @@
-
暂无数据
-
+ +
图片
@@ -228,9 +237,9 @@
- +
+
@@ -269,14 +279,14 @@
- 背景库 + 素材库
@@ -284,20 +294,21 @@
-
暂无数据
-
+ +
图片
- + +
- +
@@ -329,7 +340,7 @@ @@ -606,13 +766,23 @@ export default {