diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue index 0414be35..6aebcd30 100644 --- a/src/saas/AppCountryAlbum/Watermark.vue +++ b/src/saas/AppCountryAlbum/Watermark.vue @@ -27,7 +27,7 @@ v-for="(item, index) in watermarkList" :key="item.id" @click.stop="currIndex = index"> - +
{{ item.name }}
@@ -123,8 +123,11 @@ this.img = query.url this.height = uni.getSystemInfoSync().windowHeight - this.getWatermarkList() this.getLocation() + + this.$nextTick(() => { + this.getWatermarkList() + }) }, methods: { @@ -273,7 +276,7 @@ }) this.$http.post('/api/appalbum/list', null, { - parmas: { + params: { size: 1000 } }).then(res => { @@ -407,7 +410,7 @@ } image { - width: 176px; + width: 236px; height: 200px; } diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue index 182e4db8..b680ef7f 100644 --- a/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue @@ -61,7 +61,7 @@ watch: { configList: { handler: function (v) { - if (v.length) { + if (v && v.length) { const date = v.filter(v => v.type === '1')[0] const time = v.filter(v => v.type === '0')[0] const title = v.filter(v => v.type === '5')[0] @@ -80,6 +80,7 @@ this.configList = JSON.parse(JSON.stringify(this.config)).map(v => { if (v.fieldType === '3') { v.defaultValue = uni.getStorageSync('address').address || '' + this.address = uni.getStorageSync('address').address || '' } if (v.fieldType === '7') { diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue index f0bb6954..ee513860 100644 --- a/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue @@ -120,6 +120,7 @@ this.configList = JSON.parse(JSON.stringify(this.config)).map(v => { if (v.fieldType === '3') { v.defaultValue = uni.getStorageSync('address').address || '' + this.address = uni.getStorageSync('address').address || '' } return v