From 83fe4f885437b679299ae1466ea668bacb91a8ae Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 28 Jul 2022 16:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/saas/AppCountryAlbum/Watermark.vue        |  2 ++
 .../components/watermark/Watermark1.vue               | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/project/saas/AppCountryAlbum/Watermark.vue b/src/project/saas/AppCountryAlbum/Watermark.vue
index abc0b691..d2f71777 100644
--- a/src/project/saas/AppCountryAlbum/Watermark.vue
+++ b/src/project/saas/AppCountryAlbum/Watermark.vue
@@ -311,6 +311,8 @@
           if (res.code === 0) {
             const data = res.data.result.now
 
+            alert(JSON.stringify(data))
+
             uni.setStorageSync('address', {
               ...uni.getStorageSync('address'),
               weather: `${data.text} ${data.temp}°` || ''
diff --git a/src/project/saas/AppCountryAlbum/components/watermark/Watermark1.vue b/src/project/saas/AppCountryAlbum/components/watermark/Watermark1.vue
index 84ef0dae..beab1d5e 100644
--- a/src/project/saas/AppCountryAlbum/components/watermark/Watermark1.vue
+++ b/src/project/saas/AppCountryAlbum/components/watermark/Watermark1.vue
@@ -79,6 +79,17 @@
           if (v.address) {
             this.address = uni.getStorageSync('address').address || ''
             this.weather = uni.getStorageSync('address').weather || ''
+            this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
+              if (v.fieldType === '3') {
+                v.defaultValue = uni.getStorageSync('address').address || ''
+              }
+
+              if (v.fieldType === '2') {
+                v.defaultValue = uni.getStorageSync('address').weather || ''
+              }
+
+              return v
+            })
           }
         },
         deep: true