Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.5.9",
+  "version": "2.6.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/assets/scss/style.scss

@@ -258,14 +258,13 @@
     .show-table{
       height: 100%;
       width: 100%;
-      overflow-y: auto;
       .el-table::before{
         height: 0px;
       }
       .el-table{
         height: 100%;
         width: 100%;
-        overflow-y: auto;
+        overflow: hidden;
         font-size: 1rem;
       }
       .el-table__body-wrapper{
@@ -317,7 +316,7 @@
           }
           .rate{
             position: absolute;
-            top: 5%;
+            top: 3%;
             right: -40%;
             width: 100%;
             background-color: #111111aa;

src/components/Film.vue

@@ -60,7 +60,6 @@
             <el-table size="mini"
               :data="list.filter(res => !setting.excludeR18Films || !containsR18Keywords(res.type))"
               height="100%"
-              row-key="id"
               @row-click="(row) => detailEvent(site, row)"
               style="width: 100%">
               <el-table-column

src/components/Setting.vue

@@ -131,7 +131,7 @@
       <div class="clearDB">
         <span @click="clearDBEvent" class="clearBtn">软件重置</span>
         <span @click="changePasswordEvent" class="clearBtn">设置密码</span>
-        <span class="clearTips">如果新安装用户, 无法显示资源, 请点击软件重置. 如非必要, 切勿点击. 会清空用户数据, 恢复默认设置. 点击即软件重置, 并关闭软件.</span>
+        <div class="clearTips">如果新安装用户, 无法显示资源, 请点击软件重置. 如非必要, 切勿点击. 会清空用户数据, 恢复默认设置. 点击即软件重置, 并关闭软件.</div>
       </div>
       <div class="Tips">
         <span>所有资源来自网上, 该软件不参与任何制作, 上传, 储存等内容, 禁止传播违法资源. 该软件仅供学习参考, 请于安装后24小时内删除.</span>
@@ -570,9 +570,9 @@ export default {
       line-height: 32px;
     }
     .clearTips{
+      margin: 10px 0 0 20px;
       font-size: 12px;
       color: #ff000088;
-      margin-left: 10px;
     }
   }
   .Tips{