From 3b15852df5898f134ccd49f56fa554d6837af315 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 15:45:02 +0800
Subject: [PATCH] 29950

---
 src/saas/AppCountryAlbum/AlbumDetail.vue       |  6 ++++++
 src/saas/AppCountryAlbum/AppCountryAlbum.vue   |  2 +-
 src/saas/AppCountryAlbum/components/Home.vue   | 12 +++++++-----
 src/saas/AppCountryAlbum/components/Tabbar.vue |  3 +--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index e43bd025..af867845 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -100,7 +100,13 @@
       })
 
       uni.$on('change', () => {
+        this.isMore = false
+        this.current = 1
         this.getInfo(query.id)
+
+        this.$nextTick(() => {
+          this.getList()
+        })
       })
 
       uni.$on('update', () => {
diff --git a/src/saas/AppCountryAlbum/AppCountryAlbum.vue b/src/saas/AppCountryAlbum/AppCountryAlbum.vue
index f735e7cd..623c8e1c 100644
--- a/src/saas/AppCountryAlbum/AppCountryAlbum.vue
+++ b/src/saas/AppCountryAlbum/AppCountryAlbum.vue
@@ -33,7 +33,7 @@ export default {
   },
 
   onShow() {
-    // this.$refs?.TabPage?.show()
+    this.$refs?.TabPage?.show()
     this.$nextTick(() => {
       this.injectJWeixin(['getLocation', 'sendChatMessage', 'shareAppMessage', 'shareWechatMessage'])
     })
diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue
index 16054ceb..bead66ef 100644
--- a/src/saas/AppCountryAlbum/components/Home.vue
+++ b/src/saas/AppCountryAlbum/components/Home.vue
@@ -95,11 +95,6 @@
       this.getAlbumList()
       this.getMsgList()
       this.getUserInfo()
-
-      uni.$on('update', () => {
-        this.getCountPhotoNo()
-        this.getAlbumList()
-      })
     },
 
     destroyed () {
@@ -113,6 +108,13 @@
         })
       },
 
+      update () {
+        this.getCountPhotoNo()
+        this.getAlbumList()
+        this.getMsgList()
+        this.getUserInfo()
+      },
+
       getUserInfo () {
         this.$http.post('/api/user/info').then(res => {
           if (res.code === 0) {
diff --git a/src/saas/AppCountryAlbum/components/Tabbar.vue b/src/saas/AppCountryAlbum/components/Tabbar.vue
index d5533cc8..1afb65fe 100644
--- a/src/saas/AppCountryAlbum/components/Tabbar.vue
+++ b/src/saas/AppCountryAlbum/components/Tabbar.vue
@@ -47,9 +47,8 @@
       },
       show() {
         if (this.currIndex == 0) {
-          this.currIndex = -1
           this.$nextTick(() => {
-            this.currIndex = 0
+            this.$refs.Home.update()
           })
         }
       }