Commit 98c4a480e5f1b178dfa7416e43160bdf91d058c8
1 parent
c5de44dd
图片文字合成
Showing
1 changed file
with
13 additions
and
12 deletions
src/pages/test.vue
| @@ -32,31 +32,32 @@ | @@ -32,31 +32,32 @@ | ||
| 32 | // 调用分享（新方法） | 32 | // 调用分享（新方法） |
| 33 | if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.CNDSCheckAllowVisitPhotoAlbumHandler) { | 33 | if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.CNDSCheckAllowVisitPhotoAlbumHandler) { |
| 34 | // 获取URL图片 | 34 | // 获取URL图片 |
| 35 | - window.webkit.messageHandlers.CNDSCheckAllowVisitPhotoAlbumHandler.postMessage({body: {"imgUrl": this.imgUrl,"textInfo": this.textInfo}}); | 35 | + window.webkit.messageHandlers.CNDSCheckAllowVisitPhotoAlbumHandler.postMessage({body: {imgData:imgData}}); |
| 36 | } else if (window.obj && window.obj.CNDSCheckAllowVisitPhotoAlbumHandler) { | 36 | } else if (window.obj && window.obj.CNDSCheckAllowVisitPhotoAlbumHandler) { |
| 37 | // 获取URL图片 | 37 | // 获取URL图片 |
| 38 | - window.obj.CNDSCheckAllowVisitPhotoAlbumHandler(JSON.stringify({"imgUrl": this.imgUrl,"textInfo": this.textInfo})); | 38 | + window.obj.CNDSCheckAllowVisitPhotoAlbumHandler(imgData); |
| 39 | } | 39 | } |
| 40 | }, | 40 | }, |
| 41 | savecanvas(){ | 41 | savecanvas(){ |
| 42 | - if(this.isCNLive.value){ | ||
| 43 | - this.getimgUrl() | ||
| 44 | - return | ||
| 45 | - } | ||
| 46 | let canvas = document.querySelector('.canvas'); | 42 | let canvas = document.querySelector('.canvas'); |
| 47 | let that = this; | 43 | let that = this; |
| 48 | html2canvas(canvas,{scale:2,logging:false,useCORS:true}).then(function(canvas) { | 44 | html2canvas(canvas,{scale:2,logging:false,useCORS:true}).then(function(canvas) { |
| 49 | let type = 'png'; | 45 | let type = 'png'; |
| 50 | let imgData = canvas.toDataURL(type); | 46 | let imgData = canvas.toDataURL(type); |
| 51 | // 照片格式处理 | 47 | // 照片格式处理 |
| 52 | -// let _fixType = function(type) { | ||
| 53 | -// type = type.toLowerCase().replace(/jpg/i, 'jpeg'); | ||
| 54 | -// let r = type.match(/png|jpeg|bmp|gif/)[0]; | ||
| 55 | -// return 'image/' + r; | ||
| 56 | -// }; | 48 | + let _fixType = function(type) { |
| 49 | + type = type.toLowerCase().replace(/jpg/i, 'jpeg'); | ||
| 50 | + let r = type.match(/png|jpeg|bmp|gif/)[0]; | ||
| 51 | + return 'image/' + r; | ||
| 52 | + }; | ||
| 57 | // imgData = imgData.replace(_fixType(type),''); | 53 | // imgData = imgData.replace(_fixType(type),''); |
| 58 | let filename = "证书" + '.' + type; | 54 | let filename = "证书" + '.' + type; |
| 59 | - that.saveFile(imgData,filename); | 55 | + if(that.isCNLive.value){ |
| 56 | + that.getimgUrl(imgData) | ||
| 57 | + }else { | ||
| 58 | + that.saveFile(imgData,filename); | ||
| 59 | + } | ||
| 60 | + | ||
| 60 | }); | 61 | }); |
| 61 | }, | 62 | }, |
| 62 | saveFile(data, filename){ | 63 | saveFile(data, filename){ |