|
|
@@ -4,7 +4,7 @@ export const imgToCanvas = async (url: string) => {
|
|
|
const img = document.createElement('img')
|
|
|
img.setAttribute('crossOrigin', 'anonymous')
|
|
|
// 为了处理base64 和 连接加载不同的
|
|
|
- if (url && url.includes('data:image')) {
|
|
|
+ if (url && typeof url == 'string' && url.includes('data:image')) {
|
|
|
img.src = url
|
|
|
} else {
|
|
|
img.src = url + `?${new Date().getTime()}`
|
|
|
@@ -43,7 +43,7 @@ export const addWatermark = async (canvas, text) => {
|
|
|
const img = document.createElement('img')
|
|
|
img.setAttribute('crossOrigin', 'anonymous')
|
|
|
// 为了处理base64 和 连接加载不同的
|
|
|
- if (imgList && imgList.includes('data:image')) {
|
|
|
+ if (imgList && typeof imgList == 'string' && imgList.includes('data:image')) {
|
|
|
img.src = imgList
|
|
|
} else {
|
|
|
img.src = imgList + `?${new Date().getTime()}`
|
