From 518a9c34923638020bc82e6e32bb06c2daa4e25e Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 8 Dec 2020 17:36:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=87=8D=E7=BD=AE=E7=89=87=E5=A4=B4?= =?UTF-8?q?=E7=89=87=E5=B0=BE=E8=BE=93=E5=85=A5=E6=A1=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Play.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Play.vue b/src/components/Play.vue index 2814ac9..32a6090 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -505,6 +505,7 @@ export default { const key = this.video.key + '@' + this.video.info.id var time = this.video.info.time this.xg.removeAllProgressDot() + this.startPosition = this.endPosition = { min: '00', sec: '00' } if (db) { if (!time && db.index === index) { // 如果video.info.time没有设定的话，从历史中读取时间进度 time = db.time From fadb50a28bca92b65de125d80377d17b424b4abd Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 8 Dec 2020 18:14:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?film=E8=B0=83=E6=95=B4areas=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Film.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Film.vue b/src/components/Film.vue index 08aadfd..4d2f958 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -418,6 +418,7 @@ export default { }, list: { handler (list) { + this.areas = [...new Set(list.map(ele => ele.area))].filter(x => x) this.refreshFilteredList() }, deep: true @@ -429,17 +430,14 @@ export default { if (popperVisible === true) return if (!this.showToolbar) { this.sortKeyword = '' - this.selectedAreas = this.selectedLangs = [] this.selectedYears.start = 0 this.selectedYears.end = new Date().getFullYear() } let filteredData = this.list.filter(x => (this.selectedAreas.length === 0) || this.selectedAreas.includes(x.area)) - filteredData = filteredData.filter(x => (this.selectedLangs.length === 0) || this.selectedLangs.includes(x.lang)) filteredData = filteredData.filter(res => !this.setting.excludeR18Films || !this.containsR18Keywords(res.type)) filteredData = filteredData.filter(res => res.year >= this.selectedYears.start) filteredData = filteredData.filter(res => res.year <= this.selectedYears.end) this.selectedClassName = this.type.name + ' ' + filteredData.length + '/' + this.recordcount - this.areas = [...new Set(filteredData.map(ele => ele.area))].filter(x => x) switch (this.sortKeyword) { case '按上映年份': filteredData.sort(function (a, b) { From 27773be1c7f965b471bafa2e4396faafc34715cc Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 8 Dec 2020 18:26:05 +0800 Subject: [PATCH 3/5] v2.6.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 666c967..eb87073 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "2.6.8", + "version": "2.6.9", "private": true, "scripts": { "serve": "vue-cli-service serve", From 165040872c259e41ea6216782f42bc3272d74510 Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:06:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E6=97=B6=E9=87=8D=E7=BD=AEselectedArea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Film.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Film.vue b/src/components/Film.vue index 4d2f958..4d512e6 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -430,6 +430,7 @@ export default { if (popperVisible === true) return if (!this.showToolbar) { this.sortKeyword = '' + this.selectedAreas = [] this.selectedYears.start = 0 this.selectedYears.end = new Date().getFullYear() } From 4b0c67b8fa7133f1281194178aecfd50941878eb Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Tue, 8 Dec 2020 18:08:03 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0"=E8=B7=B3=E7=95=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE"=E6=8C=89=E9=92=AE,=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E6=98=BE=E7=A4=BA=E7=89=87=E5=A4=B4=E7=89=87?= =?UTF-8?q?=E5=B0=BE=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Play.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Play.vue b/src/components/Play.vue index 32a6090..de6d570 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -98,7 +98,10 @@ - + + + + @@ -347,7 +350,8 @@ export default { children: 'children' }, startPosition: { min: '00', sec: '00' }, - endPosition: { min: '00', sec: '00' } + endPosition: { min: '00', sec: '00' }, + showTimeSpanSetting: false } }, filters: {