From cccaae51c266bee439507d8bd419a85367a064d8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 30 Jun 2022 09:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/Watermark.vue                   | 2 +-
 .../AppCountryAlbum/components/watermark/Watermark1.vue  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 4ce102b7..27312dca 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -15,7 +15,7 @@
           :style="{left: x + 'px', top: y + 'px', transform: 'scale(' + watermarkScale + ')', transformOrigin: 'left' }"
           @touchstart="onTouchstart"
           @touchmove="onTouchmove">
-          <component ref="WatermarkItem" :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
+          <component ref="WatermarkItem" :address="address" :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
           <div v-if="!isHide" @click.stop="currIndex = -1" class="watermark-close" data-html2canvas-ignore>
             <image src="./images/close-b.png" />
           </div>
diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
index 4590771d..48805e98 100644
--- a/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
+++ b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
@@ -73,6 +73,15 @@
         },
         deep: true
       },
+
+      address: {
+        handler: function (v) {
+          if (v.address) {
+            this.address = uni.getStorageSync('address').address || ''
+            this.weather = uni.getStorageSync('address').weather || ''
+          }
+        }
+      }
     },
 
     created () {