From 362dccb167bd129d8e9ac21b167850d888137c69 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 12 Nov 2020 10:45:54 +0100
Subject: [PATCH 1/6] =?UTF-8?q?=E5=9B=BA=E5=AE=9A"=E5=A4=87=E6=B3=A8"?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6,"=E6=9C=80=E8=BF=91=E6=9B=B4=E6=96=B0"?=
 =?UTF-8?q?=E5=88=97=E5=AE=BD=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index e5aeed0..afa7b5a 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -120,14 +120,14 @@
           </el-table-column>
           <el-table-column
             prop="note"
-            label="备注">
+            label="备注"
+            width="120">
           </el-table-column>
           <el-table-column
             prop="last"
             label="最近更新"
             :formatter="dateFormat"
-            align="center"
-            width="120">
+            align="left">
           </el-table-column>
           <el-table-column
             label="操作"
@@ -207,15 +207,15 @@
           <el-table-column
             sortable
             prop="note"
-            label="备注">
+            label="备注"
+            width="120">
           </el-table-column>
           <el-table-column key="last"
             sortable
             prop="last"
             label="最近更新"
             :formatter="dateFormat"
-            align="center"
-            width="120">
+            align="left">
           </el-table-column>
           <el-table-column
             label="操作"

From fe75edd7383b316c451324764766e436b0cebdbc Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 12 Nov 2020 10:51:29 +0100
Subject: [PATCH 2/6] v2.6.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2a440c..d905f5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

From 35adae51cc5014d21ddedbab4b3ca2423adb84bc Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Thu, 12 Nov 2020 23:52:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4"=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD"=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 99282b3..7917b39 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -1265,6 +1265,14 @@ export default {
 }
 </script>
 <style>
+.xgplayer-skin-default .xgplayer-live {
+  width: 100px;
+  position: absolute;
+  top:50%;
+  left:50%;
+  transform: translate(-50%, -50%);
+  font-size: 18px !important;
+}
 .xgplayer-skin-default .xg-btn-playPrev,
 .xgplayer-skin-default .xg-btn-playNextOne,
 .xgplayer-skin-default .xg-btn-showList,

From 9da7ffc451c11fdf799610b20c0483576be6a3d9 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 12 Nov 2020 17:34:28 +0100
Subject: [PATCH 4/6] =?UTF-8?q?Revert=20"=E7=A7=BB=E9=99=A4"=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=89=80=E6=9C=89=E8=B5=84=E6=BA=90"=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3,=E6=90=9C=E7=B4=A2=E5=8F=98=E6=80=BB=E6=98=AF?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=89=80=E6=9C=89=E8=B5=84=E6=BA=90",=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A8=E8=8D=90=E6=8E=92=E5=BA=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Recommendation.vue | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/components/Recommendation.vue b/src/components/Recommendation.vue
index 808ac2f..252a76b 100644
--- a/src/components/Recommendation.vue
+++ b/src/components/Recommendation.vue
@@ -29,7 +29,7 @@
         </el-select>
         <el-button :loading="loading" @click.stop="updateEvent" icon="el-icon-refresh">更新推荐</el-button>
     </div>
-    <div class="listpage-body" id="recommendataions-body" infinite-wrapper>
+    <div class="listpage-body" id="recommendataions-body" >
       <div class="show-table" id="star-table" v-show="viewMode === 'list'">
         <el-table size="mini" fit height="100%" row-key="id"
         ref="recommendataionsTable"
@@ -80,7 +80,7 @@
         </el-table>
       </div>
       <div class="show-picture" id="star-picture" v-show="viewMode === 'picture'">
-        <Waterfall ref="recommendataionsWaterfall" :list="loadedRecommendations" :gutter="20" :width="240"
+        <Waterfall ref="recommendataionsWaterfall" :list="filteredRecommendations" :gutter="20" :width="240"
           :breakpoints="{
             1200: { //当屏幕宽度小于等于1200
               rowPerView: 4,
@@ -120,7 +120,6 @@
               </div>
             </template>
         </Waterfall>
-        <infinite-loading force-use-infinite-wrapper :identifier="infiniteId" @infinite="infiniteHandler"></infinite-loading>
       </div>
     </div>
   </div>
@@ -130,14 +129,12 @@ import { mapMutations } from 'vuex'
 import { history, recommendation, setting } from '../lib/dexie'
 import zy from '../lib/site/tools'
 import Waterfall from 'vue-waterfall-plugin'
-import InfiniteLoading from 'vue-infinite-loading'
 const { clipboard } = require('electron')
 export default {
   name: 'recommendations',
   data () {
     return {
       recommendations: [],
-      loadedRecommendations: [],
       sites: [],
       viewMode: 'picture',
       loading: false,
@@ -146,14 +143,11 @@ export default {
       areas: [],
       selectedAreas: [],
       sortKeyword: '',
-      sortKeywords: ['上映', '评分', '默认'],
-      infiniteId: +new Date(),
-      batchSize: 50
+      sortKeywords: ['上映', '评分', '默认']
     }
   },
   components: {
-    Waterfall,
-    InfiniteLoading
+    Waterfall
   },
   computed: {
     view: {
@@ -189,7 +183,7 @@ export default {
       }
     },
     filteredRecommendations () {
-      var filteredData = this.loadedRecommendations.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
+      var filteredData = this.recommendations.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.detail.area))
       filteredData = filteredData.filter(x => (this.selectedTypes.length === 0) || this.selectedTypes.includes(x.detail.type))
       return filteredData
     }
@@ -227,18 +221,6 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
-    infiniteHandler ($state) {
-      console.log('infiniteHandler' + this.loadedRecommendations.length)
-      if (this.loadedRecommendations.length === this.recommendations.length) {
-        console.log('complete')
-        $state.complete()
-      } else {
-        var nextBatch = this.recommendations.slice(this.loadedRecommendations.length, this.loadedRecommendations.length + this.batchSize)
-        this.loadedRecommendations.push(...nextBatch)
-        $state.loaded()
-        console.log('loaded' + this.loadedRecommendations.length)
-      }
-    },
     detailEvent (e) {
       this.detail = {
         show: true,
@@ -343,8 +325,6 @@ export default {
         this.recommendations = res.sort(function (a, b) {
           return b.id - a.id
         })
-        this.loadedRecommendations = this.recommendations.slice(0, this.batchSize)
-        this.infiniteId += 1
         this.getFilterData()
       })
     },

From e457574755bb1c3d8f42e2e79aaafc2d7f8a81ca Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 12 Nov 2020 22:58:45 +0100
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BC=80=E5=90=AFairplay=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Play.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Play.vue b/src/components/Play.vue
index 7917b39..c63cce1 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -260,7 +260,8 @@ export default {
         videoStop: true,
         showList: true,
         showHistory: true,
-        videoTitle: true
+        videoTitle: true,
+        airplay: true
       },
       state: {
         showList: false,

From 9a678219841f1d8cd0443395aa476dba6590d08f Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 12 Nov 2020 23:35:21 +0100
Subject: [PATCH 6/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index afa7b5a..57cdf13 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -450,7 +450,6 @@ export default {
       const key = this.site.key
       const type = this.type.tid
       const page = this.pagecount
-      console.log(key, type, page, 'infiniteHandler') // TODO: 初次进入会重复请求两次, 导致数据重复, 代码报错.
       this.statusText = ' '
       if (key && page < 1) { // OK资源前几类硬是去不掉
         $state.complete()