Merge pull request #100 from IKangXu/develop

Develop

Author: reco_luan

components/NoteAbstractItem.vue

@@ -18,7 +18,6 @@
 
 <script>
 import PageInfo from './PageInfo'
-
 export default {
   components: { PageInfo },
   props: ['item', 'currentPage', 'currentTag', 'hideAccessNumber']
@@ -27,7 +26,6 @@ export default {
 
 <style lang="stylus" scoped>
 @require '../styles/recoConfig.styl'
-
 .abstract-item
   position relative
   margin: 0 auto 20px;
@@ -83,10 +81,9 @@ export default {
         color $accentColor
       &:hover
         color $accentColor
-
 @media (max-width: $MQMobile)
   .tags
     display block
     margin-top 1rem;
     margin-left: 0!important;
-</style>
+</style>

images/top.png

@@ -7,36 +7,35 @@ export default {
       return tagColorArr[index]
     },
     _filterPostData (posts, isTimeline) {
-      const stickyArr = []
       posts = posts.filter(item => {
         const { title, frontmatter: { home, date, publish, sticky }} = item
-        if (sticky) {
-          stickyArr.unshift(item)
-          return false
-        }
         return isTimeline === true
           ? !(home == true || title == undefined || date === undefined || publish === false)
           : !(home == true || title == undefined || publish === false)
       })
-      this._sortstickyArr(stickyArr)
-      return stickyArr.concat(posts)
-    },
-    _sortstickyArr (posts) {
-      if (posts.length > 0) {
-        posts.sort((a, b) => {
-          return b.sticky - a.sticky
-        })
-      }
+      return posts
     },
     _sortPostData (posts) {
       posts.sort((a, b) => {
-        return this._getTimeNum(b) - this._getTimeNum(a)
+        let aSticky = a.frontmatter.sticky, bSticky=b.frontmatter.sticky;
+        if(aSticky && bSticky) {
+          return aSticky == bSticky ? this._compareTime(a,b) : (aSticky - bSticky)
+        } else if(aSticky && !bSticky) {
+          return -1;
+        } else if(!aSticky && bSticky){
+          return 1;
+        }
+        return this._compareTime(a,b)
       })
     },
     // 获取时间的数字类型
     _getTimeNum (date) {
       return parseInt(new Date(date.frontmatter.date).getTime())
     },
+    // 比对时间
+    _compareTime(a, b) {
+      return this._getTimeNum(b) - this._getTimeNum(a)
+    },
     // 获取博客数据
     _getPostData () {
       return new Promise(resolve => {
@@ -51,9 +50,9 @@ export default {
             return [...allData, ...currnetData.pages]
           }, [])
 
-          _sortPostData(posts)
           posts = _filterPostData(posts)
-
+          _sortPostData(posts)
+          
           this.$themeConfig.posts = posts
           resolve(posts)
         }
@@ -77,4 +76,4 @@ export default {
       sessionStorage.setItem('currentPage', JSON.stringify({ page, path }))
     }
   }
-}
+}