diff --git a/dist.zip b/dist.zip index 0cbb021..6e031e4 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index aafa2aa..2232818 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dependencies": { "axios": "0.18.1", "element-ui": "^2.15.12", + "file-saver": "^2.0.5", "franc": "^6.1.0", "install": "^0.13.0", "lib-flexible": "^0.3.2", diff --git a/src/api/editModel.js b/src/api/editModel.js index 9f287c1..8080f83 100644 --- a/src/api/editModel.js +++ b/src/api/editModel.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // https://smapitest.malls.iformall.com/C/api/ /** - * @description 获取语音列表 + * @description 获取语音列表1级 * @returns personMouldId,paperwork */ export function voiceList(data) { @@ -13,6 +13,19 @@ export function voiceList(data) { data }) } + +/** + * @description 获取语音列表2级 + * @returns personMouldId,paperwork + */ +export function voiceList2Api(id) { + return request({ + url: `/api/voiceMould/findById?id=${id}`, + method: 'GET', + }) +} + + /** * @description 试听MP3 * @returns id diff --git a/src/api/myPage.js b/src/api/myPage.js index 68a8491..14cbdea 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,videoType) { +export function getVideoList(pageNum, pageSize,videoType,videoStatuss) { return request({ - url: `/api/userVideo/list?pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}`, + url: `/api/userVideo/list?pageNum=${pageNum}&pageSize=${pageSize}&videoType=${videoType}&videoStatuss=${videoStatuss}`, method: 'get' }) } diff --git a/src/components/editPosition.vue b/src/components/editPosition.vue index 48622e4..53d1d61 100644 --- a/src/components/editPosition.vue +++ b/src/components/editPosition.vue @@ -19,10 +19,10 @@ class="material" :style="{ transformOrigin: 'top left', - transform: 'scale(' + item.w + ') ', + transform: 'scale(' + item.w / proportion + ') ', zIndex: item.z, - top: item.y + 'px', - left: item.x + 'px' + top: item.y / proportion + 'px', + left: item.x / proportion + 'px' }" >
{{ item.text }}
@@ -166,8 +166,8 @@ export default { const deltaX = event.touches[0].clientX - this.startX const deltaY = event.touches[0].clientY - this.startY // console.log(deltaX) - this.materialList.scList[index].x += deltaX - this.materialList.scList[index].y += deltaY + this.materialList.scList[index].x += deltaX.toFixed(0) * this.proportion + this.materialList.scList[index].y += deltaY.toFixed(0) * this.proportion this.startX = event.touches[0].clientX this.startY = event.touches[0].clientY @@ -219,6 +219,7 @@ export default { // 鼠标抬起 onMouseUp1() { this.dragging = false + this.startDistance = 0 }, // 鼠标在父盒子移动时,判断是否按下,然后再走逻辑 onMouseMove1() { diff --git a/src/styles/index.scss b/src/styles/index.scss index b17f228..1e6f370 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,5 +1,5 @@ .floatRight { - float: right; + // float: right; } // 淡化文字 .desalinate { @@ -29,4 +29,13 @@ p { } .relative { position: relative; +} +.wordColor { + color: #51d9ca; +} +.displayFlex { + display: flex; + justify-content: space-between; + align-items: center; + } \ No newline at end of file diff --git a/src/views/model/chooseModel.vue b/src/views/model/chooseModel.vue index 3ccf9aa..58b8998 100644 --- a/src/views/model/chooseModel.vue +++ b/src/views/model/chooseModel.vue @@ -17,7 +17,7 @@ -
+
播报声音(必选)
-
英语_女性_安娜
+
{{ soundChoose.subTitle }}
立即制作
@@ -170,6 +170,13 @@
请输入文案
+
+ 文字过少,难以识别 +