From 63dc9a16f081dc8cd1ec5d852b92a2f57ec7fa8b Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 1 Jun 2022 11:23:42 +0800 Subject: [PATCH] bug --- src/saas/AppCountryAlbum/Watermark.vue | 27 +++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue index 6b194243..83081b1b 100644 --- a/src/saas/AppCountryAlbum/Watermark.vue +++ b/src/saas/AppCountryAlbum/Watermark.vue @@ -2,7 +2,7 @@
- 保存至:{{ albumName || '默认相册' }} + 保存至:{{ albumName || '系统相册' }}
@@ -145,7 +145,7 @@ isHide: true, height: '100%', waterSrc: '', - albumId: '1', + albumId: '', albumName: '', albumIndex: 0, watermarkList: [], @@ -373,12 +373,25 @@ } }) - this.albumName = this.albumList.filter((v, index) => { - if (v.value === this.albumId) { - this.albumIndex = index + this.albumList.some((v, index) => { + if (this.albumId) { + if (v.value === this.albumId) { + this.albumIndex = index + this.albumName = v.label + + return true + } + } else { + console.log(v) + if (v.label === '系统相册') { + this.albumIndex = index + this.albumId = v.value + this.albumName = '系统相册' + + return true + } } - return v.value === this.albumId - })[0].label + }) } }) },