From 42dd8fe5e40484670502db05f09b06641771fbe8 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Wed, 28 Oct 2020 23:58:06 +0100
Subject: [PATCH] =?UTF-8?q?star=E6=B7=BB=E5=8A=A0=E8=B1=86=E7=93=A3?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail.vue |  3 ++-
 src/components/Star.vue   | 36 +++++++++++++++++-------------------
 src/lib/dexie/dexie.js    |  2 +-
 src/lib/site/tools.js     |  2 ++
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/Detail.vue b/src/components/Detail.vue
index adfcd57..558dea6 100644
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -181,7 +181,8 @@ export default {
           ids: this.info.id,
           site: this.detail.site,
           name: this.info.name,
-          detail: this.info
+          detail: this.info,
+          rate: this.info.rate
         }
         star.add(docs).then(res => {
           this.$message.success('收藏成功')
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 7961f09..117c779 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -37,14 +37,11 @@
             align="center">
           </el-table-column>
           <el-table-column
-            :sort-by="['site.name', 'name']"
-            sortable
-            :sort-method="sortBySite"
             prop="site.name"
             width="120"
-            label="片源">
+            label="源站">
             <template slot-scope="scope">
-              <span>{{ getSiteName(scope.row.key) }}</span>
+              <span>{{ getSiteName(scope.row) }}</span>
             </template>
           </el-table-column>
           <el-table-column v-if="list.some(e => e.detail.note)"
@@ -52,6 +49,11 @@
             width="120"
             label="备注">
           </el-table-column>
+          <el-table-column v-if="list.some(e => e.rate)"
+            prop="rate"
+            width="120"
+            label="豆瓣评分">
+          </el-table-column>
           <el-table-column v-if="list.some(e => e.index >= 0)"
             prop="index"
             width="120"
@@ -143,14 +145,6 @@ export default {
     sortByType (a, b) {
       return a.type.localeCompare(b.type)
     },
-    sortBySite (a, b) {
-      const siteA = this.getSiteName(a.key)
-      if (!siteA) {
-        return -1
-      } else {
-        return siteA.localeCompare(this.getSiteName(b.key))
-      }
-    },
     detailEvent (e) {
       this.detail = {
         show: true,
@@ -282,10 +276,14 @@ export default {
         }
       })
     },
-    getSiteName (key) {
-      var site = this.sites.find(e => e.key === key)
-      if (site) {
-        return site.name
+    getSiteName (row) {
+      if (row.site) {
+        return row.site.name
+      } else {
+        var site = this.sites.find(e => e.key === row.key)
+        if (site) {
+          return site.name
+        }
       }
     },
     getHistoryNote (index) {
@@ -349,6 +347,7 @@ export default {
                   name: ele.name,
                   hasUpdate: ele.hasUpdate,
                   index: ele.index,
+                  rate: ele.rate,
                   detail: ele.detail === undefined ? {
                     director: ele.director,
                     actor: ele.actor,
@@ -357,8 +356,7 @@ export default {
                     lang: ele.lang,
                     year: ele.year,
                     last: ele.last,
-                    note: ele.note,
-                    rate: ele.rate
+                    note: ele.note
                   } : ele.detail
                 }
                 starList.push(doc)
diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index f6b1214..c9c114f 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -8,7 +8,7 @@ db.version(4).stores({
   iptvSearch: '++id, keywords',
   setting: 'id, theme, site, shortcut, view, externalPlayer, searchAllSites, excludeRootClasses, excludeR18Films, forwardTimeInSec',
   shortcut: 'name, key, desc',
-  star: '++id, [key+ids], site, name, detail, index, hasUpdate',
+  star: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   sites: '++id, key, name, api, download, isActive, group',
   history: '++id, [site+ids], name, type, year, index, time',
   mini: 'id, site, ids, name, index, time',
diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js
index 96a75ff..e7fd6a0 100644
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -242,6 +242,8 @@ const zy = {
             var rating = parsedHtml('body').find('#interest_sectl').first().find('strong').first()
             if (rating.text()) {
               resolve(rating.text())
+            } else {
+              resolve('暂无评分')
             }
           }).catch(err => {
             reject(err)