From 3ba2dc99938b1b3759d1576e0f55c1c0db265868 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Thu, 12 Nov 2020 11:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss        |  2 +-
 src/components/Film.vue           | 45 ++++++++++++-------------------
 src/components/History.vue        |  2 +-
 src/components/Recommendation.vue | 17 ++++++------
 src/components/Star.vue           |  6 ++---
 5 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index e45cc7f..f432392 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -235,7 +235,7 @@
         transform: scale(1.02);
       }
       .el-table .highlight{
-        color: var(--highlight-color) !important;
+        background-color: var(--highlight-color) !important; // 改为背景色，原来某些主题下看不清字
       }
       .el-button{
         font-size: 1rem;
diff --git a/src/components/Film.vue b/src/components/Film.vue
index 92f0411..e5aeed0 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -103,36 +103,31 @@
             width="100">
           </el-table-column>
           <el-table-column
-              prop="year"
-              label="上映"
-              align="center"
-              width="100">
+            prop="year"
+            label="上映"
+            align="center"
+            width="100">
           </el-table-column>
           <el-table-column
-              prop="area"
-              label="地区"
-              align="center"
-              width="100">
+            prop="area"
+            label="地区"
+            width="100">
           </el-table-column>
           <el-table-column
-              prop="lang"
-              label="语言"
-              align="center"
-              width="100">
+            prop="lang"
+            label="语言"
+            width="100">
           </el-table-column>
           <el-table-column
             prop="note"
-            label="备注"
-            width="120">
+            label="备注">
           </el-table-column>
           <el-table-column
-              prop="last"
-              label="最近更新"
-              :formatter="dateFormat"
-              align="center"
-              width="120">
-          </el-table-column>
-          <el-table-column key="placeholder">
+            prop="last"
+            label="最近更新"
+            :formatter="dateFormat"
+            align="center"
+            width="120">
           </el-table-column>
           <el-table-column
             label="操作"
@@ -193,7 +188,6 @@
               sortable
               prop="year"
               label="上映"
-              align="center"
               width="100">
           </el-table-column>
           <el-table-column
@@ -201,7 +195,6 @@
             :filters="getFilters('area')"
             :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.area }"
             label="地区"
-            align="center"
             width="100">
           </el-table-column>
           <el-table-column
@@ -209,14 +202,12 @@
             :filter-method="(value, row, column) => { this.currentColumn = column; return value === row.lang }"
             prop="lang"
             label="语言"
-            align="center"
             width="100">
           </el-table-column>
           <el-table-column
             sortable
             prop="note"
-            label="备注"
-            width="120">
+            label="备注">
           </el-table-column>
           <el-table-column key="last"
             sortable
@@ -226,8 +217,6 @@
             align="center"
             width="120">
           </el-table-column>
-          <el-table-column key="placeholder">
-          </el-table-column>
           <el-table-column
             label="操作"
             header-align="center"
diff --git a/src/components/History.vue b/src/components/History.vue
index ff8344e..6d6cbb7 100644
--- a/src/components/History.vue
+++ b/src/components/History.vue
@@ -31,7 +31,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column v-if="history.some(e => e.time)"
             width="150"
             label="时间进度">
             <template slot-scope="scope">
diff --git a/src/components/Recommendation.vue b/src/components/Recommendation.vue
index 9772657..808ac2f 100644
--- a/src/components/Recommendation.vue
+++ b/src/components/Recommendation.vue
@@ -55,20 +55,21 @@
             width="100"
             align="center">
           </el-table-column>
-          <el-table-column v-if="filteredRecommendations.some(e => e.detail.note)"
-            prop="detail.note"
-            width="120"
-            label="备注">
-          </el-table-column>
           <el-table-column v-if="filteredRecommendations.some(e => e.rate)"
             prop="rate"
-            width="120"
+            align="center"
+            width="100"
             label="豆瓣评分">
           </el-table-column>
+          <el-table-column v-if="filteredRecommendations.some(e => e.detail.note)"
+            prop="detail.note"
+            label="备注">
+          </el-table-column>
           <el-table-column
             label="操作"
-            header-align="right"
-            align="right">
+            header-align="center"
+            align="right"
+            width="200">
             <template slot-scope="scope">
               <el-button @click.stop="playEvent(scope.row)" type="text">播放</el-button>
               <el-button @click.stop="shareEvent(scope.row)" type="text">分享</el-button>
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 555cc0c..5878169 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -41,19 +41,19 @@
             :sort-by="['detail.year', 'name']"
             prop="detail.year"
             label="上映"
-            width="100"
-            align="center">
+            width="100">
           </el-table-column>
           <el-table-column v-if="list.some(e => e.detail.note)"
             prop="detail.note"
             width="120"
             label="备注">
           </el-table-column>
-          <el-table-column v-if="list.some(e => e.rate)"
+          <el-table-column v-if="list.some(e => e.rate && e.rate !== '暂无评分')"
             sortable
             sort-by="rate"
             prop="rate"
             width="120"
+            align="center"
             label="豆瓣评分">
           </el-table-column>
           <el-table-column v-if="list.some(e => e.index >= 0)"