From de31c4c0bb56b38599e9265deb9e52fee632ff45 Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 5 Nov 2020 21:28:08 +0100 Subject: [PATCH 01/24] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Recommendation=E7=9A=84?= =?UTF-8?q?=E6=8B=BC=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 6 +-- src/components/Aside.vue | 2 +- ...{Recommandation.vue => Recommendation.vue} | 53 ++++++++++--------- src/components/register.js | 4 +- src/lib/dexie/dexie.js | 8 +-- src/lib/dexie/index.js | 4 +- ...ommandations.json => Recommendations.json} | 0 src/lib/dexie/initData.js | 6 +-- src/lib/dexie/recommandation.js | 28 ---------- src/lib/dexie/recommendation.js | 28 ++++++++++ 10 files changed, 71 insertions(+), 68 deletions(-) rename src/components/{Recommandation.vue => Recommendation.vue} (84%) rename src/lib/dexie/iniData/{Recommandations.json => Recommendations.json} (100%) delete mode 100644 src/lib/dexie/recommandation.js create mode 100644 src/lib/dexie/recommendation.js diff --git a/src/App.vue b/src/App.vue index a764ea7..2cf0493 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@ - + @@ -45,8 +45,8 @@ export default { editSites () { return this.$store.getters.getEditSites }, - recommandation () { - return this.$store.getters.recommandation + recommendation () { + return this.$store.getters.recommendation } }, watch: { diff --git a/src/components/Aside.vue b/src/components/Aside.vue index e458c79..8cbdd33 100644 --- a/src/components/Aside.vue +++ b/src/components/Aside.vue @@ -14,7 +14,7 @@ - + 影视推荐 diff --git a/src/components/Recommandation.vue b/src/components/Recommendation.vue similarity index 84% rename from src/components/Recommandation.vue rename to src/components/Recommendation.vue index 26f706c..fa6896f 100644 --- a/src/components/Recommandation.vue +++ b/src/components/Recommendation.vue @@ -2,7 +2,7 @@
- 视频数:{{ recommandations.length }} + 视频数:{{ recommendations.length }} - - @@ -71,7 +71,7 @@
-
-
-
{{site.name}}
-
-
    -
  • {{ i.name }}
  • -
-
-
-
-
{{type.name}}
-
-
    -
  • {{ i.name | classNameFilter }}
  • -
-
-
+ + + + + + + +
@@ -213,6 +213,8 @@ export default { site: {}, classList: [], type: {}, + selectedClassName: '最新', + selectedSiteName: '', pagecount: 0, list: [], statusText: ' ', @@ -283,6 +285,14 @@ export default { }, filterSettings () { this.siteClick(this.site) + }, + selectedClassName () { + this.type = this.classList.find(x => x.name === this.selectedClassName) + this.classClick(this.type) + }, + selectedSiteName () { + this.site = this.sites.find(x => x.name === this.selectedSiteName) + this.siteClick(this.site) } }, methods: { @@ -478,7 +488,7 @@ export default { }, changeView () { if (this.view === 'Film') { - this.getAllsites() + this.getAllSites() if (this.setting.view === 'picture') { this.$refs.filmWaterfall.refresh() this.getPage().then(() => { @@ -565,18 +575,17 @@ export default { } } }, - getAllsites () { + getAllSites () { sites.all().then(res => { if (res.length <= 0) { this.site = {} this.type = {} this.list = [] } else { - this.sites = res.filter((item, index, self) => { - return self.indexOf(item) >= 0 && item.isActive - }) + this.sites = res.filter(item => item.isActive) if (this.site === undefined || !this.sites.some(x => x.key === this.site.key)) { this.site = this.sites[0] + this.selectedSiteName = this.sites[0].name this.siteClick(this.site) } } @@ -584,7 +593,7 @@ export default { } }, created () { - this.getAllsites() + this.getAllSites() this.getAllSearch() } } From 4a369a755eaa27bf143164ef80f5f6362aaf7d6d Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 5 Nov 2020 22:15:05 +0100 Subject: [PATCH 03/24] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84console=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Play.vue | 1 - src/lib/site/tools.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/Play.vue b/src/components/Play.vue index b8b8888..736260d 100644 --- a/src/components/Play.vue +++ b/src/components/Play.vue @@ -1150,7 +1150,6 @@ export default { shortcut.all().then(res => { this.right.type = 'shortcut' this.right.shortcut = res - console.log(res) }) } }, diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js index effdceb..4acd9a0 100644 --- a/src/lib/site/tools.js +++ b/src/lib/site/tools.js @@ -26,7 +26,6 @@ axios.interceptors.request.use(function (config) { axios.interceptors.response.use(function (response) { // 对响应数据做些事 if (response.status && response.status === 200 && response.request.responseURL.includes('api.php') && !response.data.startsWith(' Date: Thu, 5 Nov 2020 22:20:53 +0100 Subject: [PATCH 04/24] =?UTF-8?q?zy-table=E5=B7=B2=E7=BB=8F=E8=A2=ABel-tab?= =?UTF-8?q?le=E5=8F=96=E4=BB=A3,=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/style.scss | 85 -------------------------------- src/assets/scss/theme/dark.scss | 30 ----------- src/assets/scss/theme/green.scss | 28 ----------- src/assets/scss/theme/light.scss | 28 ----------- src/assets/scss/theme/pink.scss | 28 ----------- 5 files changed, 199 deletions(-) diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 4039ae2..8911de4 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -98,91 +98,6 @@ .zy-highlighted{ color: var(--highlight-color); } -// table -.zy-table{ - display: flex; - flex-direction: column; - height: 100%; - font-size: 15px; - .tHeader{ - display: flex; - align-items: center; - justify-content: space-between; - height: 50px; - min-height: 50px; - width: 100%; - border-bottom: 1px solid; - .btn{ - user-select: none; - margin-left: 15px; - margin-right: 15px; - cursor: pointer; - font-size: 14px; - } - } - .tBody{ - flex: 1; - border-bottom: 1px solid; - overflow: auto; - .el-table__row td{ - border: none; - } - .el-table::before{ - height: 0px; - } - ul{ - list-style: none; - padding: 0; - margin: 0; - li{ - display: flex; - justify-content: flex-start; - align-items: center; - flex-direction: row; - height: 50px; - border-bottom: 1px solid; - cursor: pointer; - span{ - display: flex; - font-size: 13px; - height: 50px; - line-height: 50px; - overflow: hidden; - margin-right: 5px; - &.name{ - flex: 1; - min-width: 100px; - overflow: hidden; - margin-left: 10px; - } - &.type{ - width: 10%; - } - &.time{ - width: 10%; - } - &.last{ - width: 10%; - } - &.site{ - width: 10%; - } - &.note{ - width: 10%; - } - &.info{ - width: 10%; - } - &.operate{ - .btn{ - width: 40px; - } - } - } - } - } - } -} // scroll .zy-scroll{ &::-webkit-scrollbar{ diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index 52360ab..4d23d87 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -45,36 +45,6 @@ color: var(--d-fc-1); transition: all 0.3s cubic-bezier(.25,.8,.25,1); } - .zy-table{ - color: var(--d-fc-2); - .tHeader{ - border-bottom-color: var(--d-c-3); - .btn{ - &:hover{ - color: var(--d-fc-3) - } - } - } - .tBody{ - border-bottom-color: var(--d-c-3); - ul{ - li{ - border-bottom-color: var(--d-c-2); - transition: all 0.3s cubic-bezier(.25,.8,.25,1); - &:hover{ - box-shadow: var(--d-bsc); - background-color: var(--d-bgc-2); - color: #fff; - } - span{ - &.btn:hover{ - color: var(--d-fc-3) - } - } - } - } - } - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index b46af69..a8c3eac 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -43,34 +43,6 @@ .zy-checkbox{ color: var(--g-fc-1); } - .zy-table{ - color: var(--g-fc-2); - .tHeader{ - border-bottom-color: var(--g-c-3); - .btn{ - &:hover{ - color: var(--g-fc-3) - } - } - } - .tBody{ - border-bottom-color: var(--g-c-3); - ul{ - li{ - border-bottom-color: var(--g-c-2); - transition: all 0.3s cubic-bezier(.25,.8,.25,1); - &:hover{ - box-shadow: var(--g-bsc-hover); - } - span{ - &.btn:hover{ - color: var(--g-fc-3) - } - } - } - } - } - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index afc74b1..5172c5c 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -43,34 +43,6 @@ .zy-checkbox{ color: var(--l-fc-1); } - .zy-table{ - color: var(--l-fc-2); - .tHeader{ - border-bottom-color: var(--l-c-3); - .btn{ - &:hover{ - color: var(--l-fc-3) - } - } - } - .tBody{ - border-bottom-color: var(--l-c-3); - ul{ - li{ - border-bottom-color: var(--l-c-2); - transition: all 0.3s cubic-bezier(.25,.8,.25,1); - &:hover{ - box-shadow: var(--l-bsc-hover); - } - span{ - &.btn:hover{ - color: var(--l-fc-3) - } - } - } - } - } - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index 76ff08b..ee36f31 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -42,34 +42,6 @@ .zy-checkbox{ color: var(--p-fc-1); } - .zy-table{ - color: var(--p-fc-2); - .tHeader{ - border-bottom-color: var(--p-c-3); - .btn{ - &:hover{ - color: var(--p-fc-3) - } - } - } - .tBody{ - border-bottom-color: var(--p-c-3); - ul{ - li{ - border-bottom-color: var(--p-c-2); - transition: all 0.3s cubic-bezier(.25,.8,.25,1); - &:hover{ - box-shadow: var(--p-bsc-hover); - } - span{ - &.btn:hover{ - color: var(--p-fc-3) - } - } - } - } - } - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { From dd43c18491f64d0fbecad7cdc432c7d73720dcdc Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 5 Nov 2020 22:23:07 +0100 Subject: [PATCH 05/24] =?UTF-8?q?=E5=88=A0=E9=99=A4zy-checkbox=E7=9A=84css?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/theme/dark.scss | 4 ---- src/assets/scss/theme/green.scss | 4 +--- src/assets/scss/theme/light.scss | 3 --- src/assets/scss/theme/pink.scss | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index 4d23d87..09708e9 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -41,10 +41,6 @@ color: var(--d-fc-1); } } - .zy-checkbox{ - color: var(--d-fc-1); - transition: all 0.3s cubic-bezier(.25,.8,.25,1); - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index a8c3eac..d7126c4 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -40,9 +40,7 @@ background-color: var(--g-bgc-1); } } - .zy-checkbox{ - color: var(--g-fc-1); - } + .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index 5172c5c..a6505fa 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -40,9 +40,6 @@ background-color: var(--l-bgc-1); } } - .zy-checkbox{ - color: var(--l-fc-1); - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index ee36f31..df24d59 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -39,9 +39,6 @@ color: var(--p-fc-1); } } - .zy-checkbox{ - color: var(--p-fc-1); - } .zy-scroll{ &:hover{ &::-webkit-scrollbar-thumb { From 7591c30b59ba6278aabfc87f7fa9cda2ba8cf2c4 Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 5 Nov 2020 22:40:53 +0100 Subject: [PATCH 06/24] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F,el-s?= =?UTF-8?q?elect=E9=80=89=E6=8B=A9=E6=88=96=E5=88=92=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E4=B9=9F=E7=94=A8=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2=E4=B9=8B=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/theme/dark.scss | 6 +++--- src/assets/scss/theme/green.scss | 6 +++--- src/assets/scss/theme/light.scss | 6 +++--- src/assets/scss/theme/pink.scss | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index 09708e9..d633828 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -337,17 +337,17 @@ background-color: var(--d-bgc-1); } .el-select-dropdown__item.hover{ - background-color: var(--d-c-1); + background-color: var(--d-bgc-2); box-shadow: var(--d-bsc); } .el-select-dropdown__item.selected{ color: var(--d-fc-1); - background-color: var(--d-c-1); + background-color: var(--d-bgc-2); box-shadow: var(--d-bsc); } .el-select-dropdown__item.selected.hover{ color: var(--d-fc-1); - background-color: var(--d-c-1); + background-color: var(--d-bgc-2); box-shadow: var(--d-bsc); } } diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index d7126c4..290f63d 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -336,17 +336,17 @@ background-color: var(--g-bgc-1); } .el-select-dropdown__item.hover{ - background-color: var(--g-c-1); + background-color: var(--g-bgc-2); box-shadow: var(--g-bsc); } .el-select-dropdown__item.selected{ color: var(--g-fc-1); - background-color: var(--g-c-1); + background-color: var(--g-bgc-2); box-shadow: var(--g-bsc); } .el-select-dropdown__item.selected.hover{ color: var(--g-fc-1); - background-color: var(--g-c-1); + background-color: var(--g-bgc-2); box-shadow: var(--g-bsc); } } diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index a6505fa..005dc3e 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -335,17 +335,17 @@ background-color: var(--l-bgc-1); } .el-select-dropdown__item.hover{ - background-color: var(--l-c-1); + background-color: var(--l-bgc-2); box-shadow: var(--l-bsc); } .el-select-dropdown__item.selected{ color: var(--l-fc-1); - background-color: var(--l-c-1); + background-color: var(--l-bgc-2); box-shadow: var(--l-bsc); } .el-select-dropdown__item.selected.hover{ color: var(--l-fc-1); - background-color: var(--l-c-1); + background-color: var(--l-bgc-2); box-shadow: var(--l-bsc); } } diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index df24d59..6c6016e 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -334,17 +334,17 @@ background-color: var(--p-bgc-1); } .el-select-dropdown__item.hover{ - background-color: var(--p-c-1); + background-color: var(--p-bgc-2); box-shadow: var(--p-bsc); } .el-select-dropdown__item.selected{ color: var(--p-fc-1); - background-color: var(--p-c-1); + background-color: var(--p-bgc-2); box-shadow: var(--p-bsc); } .el-select-dropdown__item.selected.hover{ color: var(--p-fc-1); - background-color: var(--p-c-1); + background-color: var(--p-bgc-2); box-shadow: var(--p-bsc); } } From 5f47789a1a659eeb7c5c72f80cc7ac34cf2853b7 Mon Sep 17 00:00:00 2001 From: haiyangcui Date: Thu, 5 Nov 2020 22:54:54 +0100 Subject: [PATCH 07/24] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Film.vue | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/components/Film.vue b/src/components/Film.vue index 0926bd7..48e6831 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -1,7 +1,7 @@