diff --git a/dist.zip b/dist.zip index 7f997cf..3f26aaf 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/api/login.js b/src/api/login.js index e177707..f0d61e5 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -55,7 +55,7 @@ export function doUpdateInviteCode(inviteCodeData) { */ export function doLoginOut() { return request({ - url: `/api/user/loginOut`, + url: `/api/user/loginout`, method: 'get', }) } \ No newline at end of file diff --git a/src/views/model/downloadVideo.vue b/src/views/model/downloadVideo.vue index 8bd9789..9ea0e04 100644 --- a/src/views/model/downloadVideo.vue +++ b/src/views/model/downloadVideo.vue @@ -3,12 +3,7 @@
- +
@@ -58,6 +53,10 @@ export default { this.$router.push(url); }, + play() { + this.$refs.video.play(); + }, + backToIndex() { this.$router.push("/myPage"); }, @@ -103,11 +102,15 @@ export default { ); }, }, - created() { - this.videoId = this.$route.query.videoId; - this.getVideoDetail(this.videoId); - }, + created() {}, mounted() { + this.videoId = this.$route.query.videoId; + if (this.videoId) { + this.getVideoDetail(this.videoId); + } else { + this.videoUrl = this.$route.query.videoUrl; + this.open(); + } this.inPage = true; scrollToID("top"); }, diff --git a/src/views/model/generateVideo.vue b/src/views/model/generateVideo.vue index d7f8791..d0d9c6c 100644 --- a/src/views/model/generateVideo.vue +++ b/src/views/model/generateVideo.vue @@ -270,10 +270,13 @@ export default { this.isShowCover = false; clearTimeout(this.timeOuter); Toast.success("视频生成成功!"); + const url = res.data.videoPathUri + res.data.videoPath; + console.log(url, "url"); this.$router.push({ path: "/downloadVideo", query: { videoId: res.data.videoId, + videoUrl: url, }, }); this.timerOver = true; diff --git a/src/views/myPage/myPage.vue b/src/views/myPage/myPage.vue index cd22aca..2c3185f 100644 --- a/src/views/myPage/myPage.vue +++ b/src/views/myPage/myPage.vue @@ -109,10 +109,12 @@ export default { Toast.fail("视频生成中"); return; } else if (status == 2) { + const url = item.videoPathUri + item.videoPath; this.$router.push({ path: "/downloadVideo", query: { videoId: item.videoId, + videoUrl: url, }, }); } else if (status == 3) {