diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue index 1c0cb40e..40fd15f2 100644 --- a/src/saas/AppCountryAlbum/AddReport.vue +++ b/src/saas/AppCountryAlbum/AddReport.vue @@ -28,7 +28,8 @@ return { component: 'WorkReport', configList: [], - currIndex: 0 + currIndex: 0, + albumId: '' } }, @@ -47,7 +48,8 @@ } }, - onLoad () { + onLoad (query) { + this.albumId = query.id || '' this.getConfig() }, @@ -62,7 +64,7 @@ save () { this.$loading() - this.$refs.reportItem.screenshot().then(canvas => { + this.$refs.reportItem.screenshot() && this.$refs.reportItem.screenshot().then(canvas => { let dataURL = canvas.toDataURL('image/png') const file = this.dataURLtoFile(dataURL, 'photo.png') let formData = new FormData() @@ -71,7 +73,7 @@ if (res.code === 0) { const data = this.configList[this.currIndex] uni.navigateTo({ - url: `./ReportImg?img=${res.data.url}&type=${data.watermarkType}&templateId=${data.id}` + url: `./ReportImg?albumId=${this.albumId}&img=${res.data.url}&type=${data.watermarkType}&templateId=${data.id}` }) } diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue index af867845..86b0c6bf 100644 --- a/src/saas/AppCountryAlbum/AlbumDetail.vue +++ b/src/saas/AppCountryAlbum/AlbumDetail.vue @@ -1,10 +1,10 @@