Merge remote-tracking branch 'origin/dev' into dev

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', () => {

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'])
     })

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) {

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()
           })
         }
       }