优化代码
This commit is contained in:
parent
583abaca7a
commit
4dc9bb53c9
@ -154,7 +154,7 @@ export function getNow() {
|
|||||||
return time
|
return time
|
||||||
}
|
}
|
||||||
export function activeWatermarkCheckUser(domId, canvasId, scale = 1) {
|
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') {
|
if (userInfo.value && userInfo.value.model !== 'lose') {
|
||||||
activeWatermark(
|
activeWatermark(
|
||||||
dvInfo.value.watermarkInfo.settingContent,
|
dvInfo.value.watermarkInfo.settingContent,
|
||||||
@ -168,6 +168,7 @@ export function activeWatermarkCheckUser(domId, canvasId, scale = 1) {
|
|||||||
ipInfoApi().then(res => {
|
ipInfoApi().then(res => {
|
||||||
userInfo.value = res.data
|
userInfo.value = res.data
|
||||||
if (userInfo.value && userInfo.value.model !== 'lose') {
|
if (userInfo.value && userInfo.value.model !== 'lose') {
|
||||||
|
debugger
|
||||||
activeWatermark(
|
activeWatermark(
|
||||||
dvInfo.value.watermarkInfo.settingContent,
|
dvInfo.value.watermarkInfo.settingContent,
|
||||||
userInfo.value,
|
userInfo.value,
|
||||||
@ -197,6 +198,7 @@ export function activeWatermark(
|
|||||||
selfWatermarkStatus,
|
selfWatermarkStatus,
|
||||||
scale = 1
|
scale = 1
|
||||||
) {
|
) {
|
||||||
|
debugger
|
||||||
// 清理历史水印
|
// 清理历史水印
|
||||||
removeActiveWatermark(domId)
|
removeActiveWatermark(domId)
|
||||||
if (
|
if (
|
||||||
|
Loading…
Reference in New Issue
Block a user