diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue index 405373ff7..2f02b977a 100644 --- a/src/views/ebiz/billingDetail/billingDetail.vue +++ b/src/views/ebiz/billingDetail/billingDetail.vue @@ -255,11 +255,13 @@ @cancel="cancelChange" /> -
+ -
+ { this.$toast.clear() if (res.result == 0) { @@ -673,6 +682,7 @@ export default { this.total = res.content.total this.loading = false this.listShow = true + localStorage.setItem("billingShow", false) } else{ this.tableData = [] this.listShow = false @@ -856,6 +866,11 @@ export default { closeDetails() { this.xiangqingShow = !this.xiangqingShow }, + customEvent() { + this.closeHebao(); + // console.log('缓存变true了'); + this.queryOutOrderListFunc(); + }, closeHebao() { this.hebaoShow = !this.hebaoShow }, diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue index c7eda65e8..7d9830994 100644 --- a/src/views/ebiz/generateImg/generateImg.vue +++ b/src/views/ebiz/generateImg/generateImg.vue @@ -56,7 +56,7 @@ export default { methods: { getList() { this.orderList = JSON.parse(localStorage.getItem('orderList')) - console.log('页面数据',this.orderList); + // console.log('页面数据',this.orderList); }, // 将 Blob转base64 blobToBase64(blob) { @@ -96,38 +96,24 @@ export default { }, // 生成图片并下载 async domToImage(domElement, quality, callback) { - console.log(location); - const canvas = await html2canvas(domElement, { - height: domElement.scrollHeight, - // windowHeight: domElement.scrollHeight, - useCORS: true, - backgroundColor: null, - scale: 2 // 高清处理 - }) - const dataURL = canvas.toDataURL('image/png'); - console.log(dataURL); - this.downloadImage(dataURL); - return html2canvas(domElement, { width: domElement.offsetWidth, height: domElement.offsetHeight, backgroundColor: '#fff', scale: 1, - dpi: 300 + dpi: 300, + useCORS: true, + allowTaint: true, }).then((canvas) => { // 转换canvas为PNG图片并压缩 + this.$toast.loading({ + duration: 1000, // 持续展示 toast + forbidClick: true, // 禁用背景点击 + loadingType: 'spinner', + message: '加载中……' + }) canvas.toBlob( (blob) => { - // const a = document.createElement('a') - // a.href = URL.createObjectURL(blob) - // a.download = '业绩贺报.png' - // a.click() - // let newimg = new Image() - // newimg.src = URL.createObjectURL(blob) - // newimg.onload = function () { - // URL.revokeObjectURL(newimg.src) - // callback(newimg) - // } this.blobToBase64(blob).then((base64String) => { base64Excel({ base64Img: base64String }).then(res => { if (res.result == '0') { @@ -141,6 +127,10 @@ export default { .catch(() => { this.$toast.fail('图片下载失败,请重新下载!') }) + setTimeout(() => { + localStorage.setItem("billingShow", true) + location.reload(true) + }, 1000) } })