From 4f6c2483456d6a629b0f0c11c374cd23d2d643ea Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Wed, 11 Nov 2020 21:36:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E5=BC=95=E5=85=A5=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84bootstrap-vue=E4=BE=9D=E8=B5=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 59a89e280b208f84e7befc0564b0fce15c1a84d5. --- package.json | 1 - src/components/Film.vue | 2 +- src/lib/element/index.js | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index c1c48d9..d367d95 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "main": "background.js", "dependencies": { "axios": "^0.21.0", - "bootstrap-vue": "^2.19.0", "cheerio": "^1.0.0-rc.3", "child_process": "^1.0.2", "core-js": "^3.7.0", diff --git a/src/components/Film.vue b/src/components/Film.vue index fa6b963..b926f7e 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -19,7 +19,7 @@ diff --git a/src/lib/element/index.js b/src/lib/element/index.js index 164485d..a4dce1e 100644 --- a/src/lib/element/index.js +++ b/src/lib/element/index.js @@ -1,8 +1,6 @@ import Vue from 'vue' import { Message, Button, Table, TableColumn, Tag, Input, Dialog, Form, FormItem, Switch, Select, Option, Checkbox, Autocomplete } from 'element-ui' import Plugin from 'v-fit-columns' -import { BButtonGroup } from 'bootstrap-vue' - Vue.use(Button) Vue.use(Table) Vue.use(TableColumn) @@ -17,5 +15,4 @@ Vue.use(Select) Vue.use(Option) Vue.use(Checkbox) Vue.use(Autocomplete) -Vue.component('b-button-group', BButtonGroup) Vue.prototype.$message = Message From a73e679b723285f698e2f74b62865fb29912c408 Mon Sep 17 00:00:00 2001 From: buvta <12312540+buvta@users.noreply.github.com> Date: Wed, 11 Nov 2020 21:36:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E6=94=B9=E8=BF=9B=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E7=9A=84=E6=A0=B7=E5=BC=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b72886fbe663cd6f60f80af023b4719e4fe05975. --- src/assets/scss/style.scss | 26 ++++++++++++++-------- src/assets/scss/theme/dark.scss | 13 +---------- src/assets/scss/theme/green.scss | 14 +----------- src/assets/scss/theme/light.scss | 14 +----------- src/assets/scss/theme/pink.scss | 14 +----------- src/components/Film.vue | 38 +++++++++++++------------------- 6 files changed, 36 insertions(+), 83 deletions(-) diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index a651996..d59c2f8 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -146,6 +146,23 @@ cursor: pointer; } } + .el-autocomplete{ + .el-input-group__prepend{ + border: none; + .el-select{ + width: 100px; + .el-input, .el-input__inner{ + width: 100%; + } + } + } + .el-input .el-input__inner{ + width: 200px; + } + .el-input-group__append{ + border: none; + } + } .is-loading:before { background-color: none !important; } @@ -155,15 +172,6 @@ } .el-select-dropdown__item{ font-size: 1rem; - border: none; - } - .zy-autocomplete { - font-size: 1rem;; - border: none; - li { - font-size: 1rem; - border: none; - } } } .listpage-body{ diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss index 799761c..eb8363e 100644 --- a/src/assets/scss/theme/dark.scss +++ b/src/assets/scss/theme/dark.scss @@ -336,21 +336,10 @@ border: none; background-color: var(--d-bgc-1); } - .el-select-dropdown__item.hover, .el-select-dropdown__item.selected{ + .el-select-dropdown__item.hover, .el-select-dropdown__item.selected, .el-select-dropdown__item.selected.hover{ color: var(--d-fc-1); background-color: var(--d-bgc-2); - } - .zy-autocomplete { - color: var(--d-fc-1); - background-color: var(--d-bgc-1); box-shadow: var(--d-bsc); - li { - color: var(--d-fc-1); - background-color: var(--d-bgc-1); - &:hover{ - background-color: var(--d-bgc-2); - } - } } } .listpage-body{ diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss index 143da14..10bcd29 100644 --- a/src/assets/scss/theme/green.scss +++ b/src/assets/scss/theme/green.scss @@ -335,23 +335,11 @@ border: none; background-color: var(--g-bgc-1); } - .el-select-dropdown__item.hover, .el-select-dropdown__item.selected{ + .el-select-dropdown__item.hover, .el-select-dropdown__item.selected, .el-select-dropdown__item.selected.hover{ color: var(--g-fc-1); background-color: var(--g-bgc-2); box-shadow: var(--g-bsc); } - .zy-autocomplete { - color: var(--g-fc-1); - background-color: var(--g-bgc-1); - box-shadow: var(--g-bsc); - li { - color: var(--g-fc-1); - background-color: var(--g-bgc-1); - &:hover{ - background-color: var(--g-bgc-2); - } - } - } } .listpage-body{ color: var(--g-fc-1); diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss index 81a0879..de80cd5 100644 --- a/src/assets/scss/theme/light.scss +++ b/src/assets/scss/theme/light.scss @@ -334,23 +334,11 @@ border: none; background-color: var(--l-bgc-1); } - .el-select-dropdown__item.hover, .el-select-dropdown__item.selected{ + .el-select-dropdown__item.hover, .el-select-dropdown__item.selected, .el-select-dropdown__item.selected.hover{ color: var(--l-fc-1); background-color: var(--l-bgc-2); box-shadow: var(--l-bsc); } - .zy-autocomplete { - color: var(--l-fc-1); - background-color: var(--l-bgc-1); - box-shadow: var(--l-bsc); - li { - color: var(--l-fc-1); - background-color: var(--l-bgc-1); - &:hover{ - background-color: var(--l-bgc-2); - } - } - } } .listpage-body{ color: var(--l-fc-1); diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss index 86c8faf..a144375 100644 --- a/src/assets/scss/theme/pink.scss +++ b/src/assets/scss/theme/pink.scss @@ -333,23 +333,11 @@ border: none; background-color: var(--p-bgc-1); } - .el-select-dropdown__item.hover, .el-select-dropdown__item.selected{ + .el-select-dropdown__item.hover, .el-select-dropdown__item.selected, .el-select-dropdown__item.selected.hover{ color: var(--p-fc-1); background-color: var(--p-bgc-2); box-shadow: var(--p-bsc); } - .zy-autocomplete { - color: var(--g-fc-1); - background-color: var(--g-bgc-1); - box-shadow: var(--g-bsc); - li { - color: var(--g-fc-1); - background-color: var(--g-bgc-1); - &:hover{ - background-color: var(--g-bgc-2); - } - } - } } .listpage-body{ color: var(--p-fc-1); diff --git a/src/components/Film.vue b/src/components/Film.vue index b926f7e..690d349 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -17,12 +17,17 @@ :value="item.name"> - - + + - - - - + +
@@ -286,7 +278,7 @@ export default { searchTxt: '', searchContents: [], currentColumn: '', - searchGroup: '全部', + searchGroup: '', searchGroups: [], // 福利片关键词 r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'] @@ -719,8 +711,8 @@ export default { } this.searchGroups = [...new Set(this.sites.map(site => site.group))] if (this.searchGroups.length === 1) this.searchGroups = [] + this.searchGroups.unshift('站内') this.searchGroups.push('全部') - this.searchGroups.push('站内') this.searchGroup = this.setting.searchGroup if (this.searchGroup === undefined) setting.find().then(res => { this.searchGroup = res.searchGroup }) })