v2.6.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.5.9",
+  "version": "2.6.1",
   "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;
@@ -392,119 +391,6 @@
   }
 }
 
-// PictureView
-.pictureView{
-  .body{
-    height: calc(100% - 40px);
-    display: flex;
-    position: relative;
-    overflow-y: auto;
-    &::-webkit-scrollbar{
-      width: 5px;
-      height: 1px;
-    }
-    &::-webkit-scrollbar-thumb {
-      border-radius: 10px;
-      position: absolute;
-    }
-    &::-webkit-scrollbar-track {
-      border-radius: 10px;
-      position: absolute;
-    }
-    .body-box{
-      height: 100%;
-      width: 100%;
-    }
-    .show-img{
-      height: 100%;
-      width: 100%;
-      padding: 10px;
-      .card{
-        border-radius: 6px;
-        overflow: hidden;
-        .img{
-          position: relative;
-          min-height: 40px;
-          img{
-            width: 100%;
-            height: auto;
-            cursor: pointer;
-          }
-          .rate{
-            position: absolute;
-            top: 5%;
-            right: -40%;
-            width: 100%;
-            background-color: #2f90b9;
-            color: #cdcdcd;
-            height: 30px;
-            line-height: 30px;
-            font-size: 14px;
-            text-align: center;
-            transform: rotate(45deg);
-          }
-          .update{
-            position: absolute;
-            top: 5%;
-            left: -40%;
-            width: 100%;
-            background-color: #68b88e;
-            color: #cdcdcd;
-            height: 30px;
-            line-height: 30px;
-            font-size: 14px;
-            text-align: center;
-            transform: rotate(-45deg);
-          }
-          .operate{
-            display: none;
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            background-color: #111111aa;
-            width: 100%;
-            font-size: 13px;
-            .operate-wrap{
-              display: flex;
-              justify-content: space-between;
-              .o-play, .o-star, .o-share{
-                cursor: pointer;
-                display: inline-block;
-                width: 80px;
-                height: 36px;
-                text-align: center;
-                line-height: 36px;
-                color: #cdcdcd;
-                &:hover{
-                  background-color: #111;
-                }
-              }
-            }
-          }
-        }
-        .name{
-          font-size: 16px;
-          padding: 10px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          cursor: pointer;
-        }
-        .info{
-          display: flex;
-          justify-content: space-between;
-          font-size: 12px;
-          padding: 10px;
-        }
-        &:hover{
-          .operate{
-            display: block;
-          }
-        }
-      }
-    }
-  }
-}
 // loading
 .zy-loading{
   width: 100%;

src/components/Film.vue

@@ -29,14 +29,14 @@
     </div>
     <div class="listpage-body" id="film-body" infinite-wrapper>
       <div class="show-picture" v-if="setting.view === 'picture' && !show.find">
-          <Waterfall ref="waterfall" :list="list" :gutter="20" :width="240"
+          <Waterfall ref="filmWaterfall" :list="list" :gutter="20" :width="240"
           :breakpoints="{ 1200: { rowPerView: 4 } }"
           animationEffect="fadeInUp"
           backgroundColor="rgba(0, 0, 0, 0)">
             <template slot="item" slot-scope="props">
               <div class="card" v-show="!setting.excludeR18Films || !containsR18Keywords(props.data.type)">
                 <div class="img">
-                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(site, props.data)">
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.filmWaterfall.refresh()" @click="detailEvent(site, props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
                       <span class="o-play" @click="playEvent(site, props.data)">播放</span>
@@ -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
@@ -463,7 +462,7 @@ export default {
     changeView () {
       if (this.view === 'Film') {
         if (this.setting.view === 'picture') {
-          this.$refs.waterfall.refresh()
+          this.$refs.filmWaterfall.refresh()
         }
         this.getPage().then(() => {
           this.infiniteId += 1

src/components/Play.vue

@@ -131,7 +131,7 @@
           </ul>
           <ul v-show="right.type === 'other'" class="list-other">
             <li v-show="right.other.length === 0">无数据</li>
-            <li @click="otherItemEvent(m)" v-for="(m, n) in right.other" :key="n"><span class="title">{{m.name}} - [{{m.site}}]</span></li>
+            <li @click="otherItemEvent(m)" v-for="(m, n) in right.other" :key="n"><span class="title">{{m.name}} - [{{m.site.name}}]</span></li>
           </ul>
         </div>
       </div>
@@ -744,46 +744,39 @@ export default {
         this.$message.warning('删除历史记录失败, 错误信息: ' + err)
       })
     },
-    async getAllsites () {
-      const all = await sites.all()
+    async getOtherSites () {
       this.right.other = []
-      for (const i of all) {
-        if (i.isActive) {
-          try {
-            const searchRes = await zy.search(i.key, this.name)
+      sites.all().then(sitesRes => {
+        // 排除已关闭的源和当前源
+        for (const siteItem of sitesRes.filter(x => x.isActive && x.key !== this.video.key)) {
+          zy.search(siteItem.key, this.name).then(searchRes => {
             const type = Object.prototype.toString.call(searchRes)
             if (type === '[object Array]') {
               searchRes.forEach(async item => {
                 const detailRes = item
-                detailRes.key = i.key
-                detailRes.site = i.site
+                detailRes.key = siteItem.key
+                detailRes.site = siteItem
                 this.right.other.push(detailRes)
               })
             }
             if (type === '[object Object]') {
               const detailRes = searchRes
-              detailRes.key = i.key
-              detailRes.site = i.name
+              detailRes.key = siteItem.key
+              detailRes.site = siteItem
               this.right.other.push(detailRes)
             }
-          } catch (err) {
-            console.error(err)
-          }
+          })
         }
-      }
+      })
     },
     otherEvent (m) {
       this.right.type = 'other'
-      this.getAllsites()
+      this.getOtherSites()
       this.right.show = true
     },
     async otherItemEvent (e) {
-      const db = await history.find({ site: e.key, ids: e.id })
-      if (db) {
-        this.video = { key: db.site, info: { id: db.ids, name: db.name, index: db.index, site: e.key } }
-      } else {
-        this.video = { key: e.key, info: { id: e.id, name: e.name, index: 0, site: e.key } }
-      }
+      // 打开当前播放的剧集index, 定位到当前的时间
+      this.video = { key: e.key, info: { id: e.id, name: e.name, site: e.site, index: this.video.info.index, time: this.video.info.time } }
       this.right.show = false
       this.right.type = ''
     },

src/components/Recommandation.vue

@@ -71,7 +71,7 @@
         </el-table>
       </div>
       <div class="show-picture" id="star-picture" v-show="viewMode === 'picture'">
-        <Waterfall ref="waterfall" :list="filteredRecommandations" :gutter="20" :width="240"
+        <Waterfall ref="recommandataionsWaterfall" :list="filteredRecommandations" :gutter="20" :width="240"
           :breakpoints="{ 1200: { rowPerView: 4 } }"
           animationEffect="fadeInUp"
           backgroundColor="rgba(0, 0, 0, 0)">
@@ -81,7 +81,7 @@
                   <div class="rate" v-if="props.data.rate && props.data.rate !== '暂无评分'">
                     <span>{{props.data.rate}}分</span>
                   </div>
-                  <img style="width: 100%" :src="props.data.detail.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(props.data)">
+                  <img style="width: 100%" :src="props.data.detail.pic" alt="" @load="$refs.recommandataionsWaterfall.refresh()" @click="detailEvent(props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
                       <span class="o-play" @click="playEvent(props.data)">播放</span>
@@ -171,7 +171,7 @@ export default {
     view () {
       if (this.view === 'Recommandation') {
         this.getRecommandations()
-        this.$refs.waterfall.refresh()
+        this.$refs.recommandataionsWaterfall.refresh()
       }
     }
   },
@@ -199,6 +199,7 @@ export default {
               return b.detail.year - a.detail.year
             })
             recommandation.clear().then(recommandation.bulkAdd(this.recommandations))
+            this.getFilterData()
             this.$message.success('更新推荐成功')
           }
         }

src/components/Setting.vue

@@ -131,14 +131,14 @@
       <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>
       </div>
     </div>
     <div> <!-- 输入密码页面 -->
-      <el-dialog :visible.sync="show.checkPasswordDialog" v-if='show.checkPasswordDialog' :append-to-body="true" @close="closeDialog">
+      <el-dialog :visible.sync="show.checkPasswordDialog" v-if='show.checkPasswordDialog' :append-to-body="true" @close="closeDialog" width="300px">
         <el-form label-width="75px" label-position="left">
           <el-form-item label="当前密码" prop='name'>
             <el-input v-model="inputPassword" placeholder="请输入您的当前密码" />
@@ -151,7 +151,7 @@
       </el-dialog>
     </div>
     <div> <!-- 修改密码页面 -->
-      <el-dialog :visible.sync="show.changePasswordDialog" v-if='show.changePasswordDialog' :append-to-body="true" @close="closeDialog">
+      <el-dialog :visible.sync="show.changePasswordDialog" v-if='show.changePasswordDialog' :append-to-body="true" @close="closeDialog" width="300px">
         <el-form label-width="75px" label-position="left">
           <el-form-item label="新密码" prop='name'>
             <el-input v-model="inputPassword" placeholder="请输入您的新密码" />
@@ -403,7 +403,7 @@ export default {
     getLatestVersion () {
       ipcRenderer.send('checkForUpdate')
       ipcRenderer.on('update-available', (e, info) => {
-        this.d.latestVersion = info.version
+        this.latestVersion = info.version
       })
       ipcRenderer.on('update-error', () => {
         this.$message.warning = '更新出错.'
@@ -570,9 +570,9 @@ export default {
       line-height: 32px;
     }
     .clearTips{
+      margin: 10px 0 0 20px;
       font-size: 12px;
       color: #ff000088;
-      margin-left: 10px;
     }
   }
   .Tips{

src/components/Star.vue

@@ -77,7 +77,7 @@
         </el-table>
       </div>
       <div class="show-picture" id="star-picture" v-show="viewMode === 'picture'">
-        <Waterfall ref="waterfall" :list="list" :gutter="20" :width="240"
+        <Waterfall ref="starWaterfall" :list="list" :gutter="20" :width="240"
           :breakpoints="{ 1200: { rowPerView: 4 } }"
           animationEffect="fadeInUp"
           backgroundColor="rgba(0, 0, 0, 0)">
@@ -90,7 +90,7 @@
                   <div class="update" v-if="props.data.hasUpdate">
                     <span>有更新</span>
                   </div>
-                  <img style="width: 100%" :src="props.data.detail.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(props.data)">
+                  <img style="width: 100%" :src="props.data.detail.pic" alt="" @load="$refs.starWaterfall.refresh()" @click="detailEvent(props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
                       <span class="o-play" @click="playEvent(props.data)">播放</span>
@@ -173,6 +173,7 @@ export default {
       if (this.view === 'Star') {
         this.getAllsites()
         this.getFavorites()
+        this.$refs.starWaterfall.refresh()
       }
     }
   },