From 040c11b2156a34b6b4eff3cc61d5f7f1bb82b954 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 29 Jul 2022 09:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saas/AppCountryAlbum/AppCountryAlbum.vue     | 16 +++++++---------
 src/project/saas/AppCountryAlbum/Watermark.vue   |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/project/saas/AppCountryAlbum/AppCountryAlbum.vue b/src/project/saas/AppCountryAlbum/AppCountryAlbum.vue
index da6d2dc0..715d2469 100644
--- a/src/project/saas/AppCountryAlbum/AppCountryAlbum.vue
+++ b/src/project/saas/AppCountryAlbum/AppCountryAlbum.vue
@@ -23,15 +23,6 @@ export default {
     Tabbar
   },
 
-  methods: {
-    ...mapActions(['injectJWeixin']),
-
-    onChange(e) {
-      this.params = e.params
-      this.component = e.type
-    }
-  },
-
   onLoad () {
     uni.setStorageSync('address', {
       lat: '',
@@ -49,6 +40,13 @@ export default {
   },
 
   methods: {
+    ...mapActions(['injectJWeixin']),
+
+    onChange(e) {
+      this.params = e.params
+      this.component = e.type
+    },
+
     getLocation () {
       this.injectJWeixin(['getLocation']).then(() => {
         wx.getLocation({
diff --git a/src/project/saas/AppCountryAlbum/Watermark.vue b/src/project/saas/AppCountryAlbum/Watermark.vue
index f78d840e..000e2593 100644
--- a/src/project/saas/AppCountryAlbum/Watermark.vue
+++ b/src/project/saas/AppCountryAlbum/Watermark.vue
@@ -186,7 +186,7 @@
       this.img = decodeURIComponent(query.url)
       this.height = uni.getSystemInfoSync().windowHeight
 
-      if (uni.getStorageSync('address').address) {
+      if (!uni.getStorageSync('address').address) {
         this.getLocation()
       }