feat: retain the page number when back

reco_luan · reco_luan · commit a9cf0b14237e · 2019-11-25T23:49:58.000+08:00
Fix the bug that the list page does not retain the page number
diff --git a/components/HomeBlog.vue b/components/HomeBlog.vue
@@ -108,6 +108,7 @@ export default {
   },
   mounted () {
     this.recoShow = true
+    this._setPage(this._getStoragePage())
   },
   methods: {
     // 获取当前页码
@@ -128,13 +129,12 @@ export default {
       this.pages = pages.length == 0 ? [] : pages
     },
     getPagesByTags (tagInfo) {
-      const currentTag = tagInfo.name
-      const base = this.$site.base
-      window.location.href = `${base}tag/?tag=${currentTag}`
+      this.$router.push({ path: tagInfo.path })
     },
     _setPage (page) {
       this.currentPage = page
       this.$page.currentPage = page
+      this._setStoragePage(page)
     }
   }
 }
diff --git a/example/docs/.vuepress/config.js b/example/docs/.vuepress/config.js
@@ -1,7 +1,7 @@
 module.exports = {
   title: "vuepress-theme-reco",
   description: 'A simple and beautiful vuepress blog theme .',
-  dest: 'public',
+  dest: 'example/docs/public',
   head: [
     ['link', { rel: 'icon', href: '/favicon.ico' }],
     ['meta', { name: 'viewport', content: 'width=device-width,initial-scale=1,user-scalable=no' }]
diff --git a/example/docs/views/category3/2018/121501.md b/example/docs/views/category3/2018/121501.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121502.md b/example/docs/views/category3/2018/121502.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121503.md b/example/docs/views/category3/2018/121503.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121504.md b/example/docs/views/category3/2018/121504.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121505.md b/example/docs/views/category3/2018/121505.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121506.md b/example/docs/views/category3/2018/121506.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121507.md b/example/docs/views/category3/2018/121507.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121508.md b/example/docs/views/category3/2018/121508.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121509.md b/example/docs/views/category3/2018/121509.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121510.md b/example/docs/views/category3/2018/121510.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2018/121512.md b/example/docs/views/category3/2018/121512.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/example/docs/views/category3/2019/092101.md b/example/docs/views/category3/2019/092101.md
@@ -0,0 +1,10 @@
+---
+title: first page in category3
+date: 2018-12-15
+tags:
+ - tag1
+categories:
+ - category3
+---
+
+first page in category3
diff --git a/layouts/Category.vue b/layouts/Category.vue
@@ -56,7 +56,6 @@ export default {
       let posts = this.$currentCategories.pages
       this._sortPostData(posts)
       posts = this._filterPostData(posts)
-      this._setPage(1)
       return posts
     },
     // 标题只显示分类名称
@@ -67,6 +66,7 @@ export default {
 
   mounted () {
     this.recoShow = true
+    this._setPage(this._getStoragePage())
   },
 
   methods: {
@@ -84,6 +84,7 @@ export default {
     _setPage (page) {
       this.currentPage = page
       this.$page.currentPage = page
+      this._setStoragePage(page)
     },
     // 获取时间的数字类型
     _getTimeNum (date) {
diff --git a/layouts/Tag.vue b/layouts/Tag.vue
@@ -37,7 +37,7 @@ export default {
       // 当前页码
       currentPage: 1,
       recoShow: false,
-      currentTag: '全部',
+      currentTag: '全部'
     }
   },
 
@@ -47,13 +47,13 @@ export default {
       let posts = this.$currentTags.pages
       this._sortPostData(posts)
       posts = this._filterPostData(posts)
-      this._setPage(1)
       return posts
     }
   },
 
   mounted () {
     this.recoShow = true
+    this._setPage(this._getStoragePage())
   },
 
   methods: {
@@ -62,7 +62,7 @@ export default {
       this.$emit('currentTag', tag)
     },
     tagClick (tagInfo) {
-      this.$router.push({path: tagInfo.path})
+      this.$router.push({ path: tagInfo.path })
     },
     // 获取当前页码
     getCurrentPage (page) {
@@ -74,7 +74,8 @@ export default {
     _setPage (page) {
       this.currentPage = page
       this.$page.currentPage = page
-    },
+      this._setStoragePage(page)
+    }
   }
 }
 </script>
diff --git a/layouts/Tags.vue b/layouts/Tags.vue
@@ -51,6 +51,7 @@ export default {
 
   mounted () {
     this.recoShow = true
+    this._setPage(this._getStoragePage())
   },
 
   methods: {
@@ -72,6 +73,7 @@ export default {
     _setPage (page) {
       this.currentPage = page
       this.$page.currentPage = page
+      this._setStoragePage(page)
     }
   }
 }
diff --git a/mixins/index.js b/mixins/index.js
@@ -50,6 +50,23 @@ export default {
           resolve(posts)
         }
       })
+    },
+    // 获取当前页码
+    _getStoragePage () {
+      const path = window.location.pathname
+      const currentPage = JSON.parse(sessionStorage.getItem('currentPage'))
+
+      if (currentPage === null || path !== currentPage.path) {
+        sessionStorage.setItem('currentPage', { page: 1, path: '' })
+        return 1
+      }
+
+      return parseInt(currentPage.page)
+    },
+    // 设置当前页码
+    _setStoragePage (page) {
+      const path = window.location.pathname
+      sessionStorage.setItem('currentPage', JSON.stringify({ page, path }))
     }
   }
 }
