|  | @@ -7,7 +7,7 @@ export const imgToCanvas = async (url: string) => {
 | 
											
												
													
														|  |    if (url && typeof url == 'string' && url.includes('data:image')) {
 |  |    if (url && typeof url == 'string' && url.includes('data:image')) {
 | 
											
												
													
														|  |      img.src = url
 |  |      img.src = url
 | 
											
												
													
														|  |    } else {
 |  |    } else {
 | 
											
												
													
														|  | -    img.src = url + `?${new Date().getTime()}`
 |  | 
 | 
											
												
													
														|  | 
 |  | +    img.src = url + `?t=${+new Date()}`
 | 
											
												
													
														|  |    }
 |  |    }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |    // 防止跨域引起的 Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported.
 |  |    // 防止跨域引起的 Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported.
 | 
											
										
											
												
													
														|  | @@ -43,7 +43,11 @@ export const addWatermark = async (canvas, text) => {
 | 
											
												
													
														|  |      const img = document.createElement('img')
 |  |      const img = document.createElement('img')
 | 
											
												
													
														|  |      img.setAttribute('crossOrigin', 'anonymous')
 |  |      img.setAttribute('crossOrigin', 'anonymous')
 | 
											
												
													
														|  |      // 为了处理base64 和 连接加载不同的
 |  |      // 为了处理base64 和 连接加载不同的
 | 
											
												
													
														|  | -    if (imgList && typeof imgList == 'string' && imgList.includes('data:image')) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    if (
 | 
											
												
													
														|  | 
 |  | +      imgList &&
 | 
											
												
													
														|  | 
 |  | +      typeof imgList == 'string' &&
 | 
											
												
													
														|  | 
 |  | +      imgList.includes('data:image')
 | 
											
												
													
														|  | 
 |  | +    ) {
 | 
											
												
													
														|  |        img.src = imgList
 |  |        img.src = imgList
 | 
											
												
													
														|  |      } else {
 |  |      } else {
 | 
											
												
													
														|  |        img.src = imgList + `?${new Date().getTime()}`
 |  |        img.src = imgList + `?${new Date().getTime()}`
 |