From 68960ab5bbdb39a7f0fa013b88a9767625715d24 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Tue, 3 Nov 2020 16:34:12 +0100
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Bstar=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E6=97=B6=E7=9A=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Recommandation.vue |  4 +++-
 src/components/Star.vue           | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Recommandation.vue b/src/components/Recommandation.vue
index 6952a82..dcfa3e8 100644
--- a/src/components/Recommandation.vue
+++ b/src/components/Recommandation.vue
@@ -275,7 +275,9 @@ export default {
     },
     getRecommandations () {
       recommandation.all().then(res => {
-        this.recommandations = res.reverse()
+        this.recommandations = res.sort(function (a, b) {
+          return b.id - a.id
+        })
         this.getFilterData()
       })
     },
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 426bc56..f7219b8 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -345,7 +345,9 @@ export default {
     },
     getFavorites () {
       star.all().then(res => {
-        this.list = res.reverse()
+        this.list = res.sort(function (a, b) {
+          return b.id - a.id
+        })
       })
     },
     getAllsites () {
@@ -384,13 +386,15 @@ export default {
       remote.dialog.showOpenDialog(options).then(result => {
         if (!result.canceled) {
           var starList = this.list
+          var id = this.list.length + 1
           result.filePaths.forEach(file => {
             var str = fs.readFileSync(file)
             const json = JSON.parse(str)
-            json.forEach(ele => {
-              const starExists = starList.includes(x => x.key === ele.key && x.ids === ele.ids)
+            json.reverse().forEach(ele => {
+              const starExists = starList.some(x => x.key === ele.key && x.ids === ele.ids)
               if (!starExists) {
                 var doc = {
+                  id: id,
                   key: ele.key,
                   ids: ele.ids,
                   site: ele.site === undefined ? ele.site = this.sites.find(x => x.key === ele.key) : ele.site,
@@ -409,6 +413,7 @@ export default {
                     note: ele.note
                   } : ele.detail
                 }
+                id += 1
                 starList.push(doc)
               }
             })