Commit 5a33e34c authored by wangwei's avatar wangwei

Merge branch 'dev2'

parents c6786b36 7bd38117
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
if(this.groupId && this.groupId !== 'null'){ if(this.groupId && this.groupId !== 'null'){
URL += `&groupId=${this.groupId}` URL += `&groupId=${this.groupId}`
} }
console.log(URL);
this.qrcode(URL); this.qrcode(URL);
this.refVisible = true; this.refVisible = true;
this.$nextTick(()=>{ this.$nextTick(()=>{
......
...@@ -186,10 +186,6 @@ ...@@ -186,10 +186,6 @@
} = document.getElementById('capture').getClientRects()[0]; } = document.getElementById('capture').getClientRects()[0];
// document.getElementById('capture').style.width = width + 'px'; // document.getElementById('capture').style.width = width + 'px';
let o = this.getOffsetRect(this.$refs.imageWrapper); let o = this.getOffsetRect(this.$refs.imageWrapper);
let {
height1,
width1
} = document.getElementById('capture').getClientRects()[0];
console.log('document.getElementById', document.getElementById('capture').getClientRects()[0]); console.log('document.getElementById', document.getElementById('capture').getClientRects()[0]);
document.getElementById('inviteBtn').style.top = height + top + 20 + 'px'; document.getElementById('inviteBtn').style.top = height + top + 20 + 'px';
document.getElementById('inviteBtn').style.opacity = 1; document.getElementById('inviteBtn').style.opacity = 1;
...@@ -197,9 +193,9 @@ ...@@ -197,9 +193,9 @@
async: true, async: true,
timeout: 500, timeout: 500,
scrollX:1, scrollX:1,
scale: 4, scale: 2,
width: width1, width: width,
height: height1, height: height,
letterRendering: true, letterRendering: true,
}).then((canvas) => { }).then((canvas) => {
let dataURL = canvas.toDataURL("image/jpg"); let dataURL = canvas.toDataURL("image/jpg");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment