优化代码

This commit is contained in:
limengnan 2025-07-07 09:49:52 +08:00
parent 583abaca7a
commit 4dc9bb53c9

View File

@ -154,7 +154,7 @@ export function getNow() {
return time
}
export function activeWatermarkCheckUser(domId, canvasId, scale = 1) {
if (dvInfo.value.watermarkInfo) {
if (dvInfo.value.watermarkInfo && dvInfo.value.watermarkInfo.settingContent ) {
if (userInfo.value && userInfo.value.model !== 'lose') {
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
@ -168,6 +168,7 @@ export function activeWatermarkCheckUser(domId, canvasId, scale = 1) {
ipInfoApi().then(res => {
userInfo.value = res.data
if (userInfo.value && userInfo.value.model !== 'lose') {
debugger
activeWatermark(
dvInfo.value.watermarkInfo.settingContent,
userInfo.value,
@ -197,6 +198,7 @@ export function activeWatermark(
selfWatermarkStatus,
scale = 1
) {
debugger
// 清理历史水印
removeActiveWatermark(domId)
if (