Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player

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",
     "core-js": "^3.7.0",
     "cors": "^2.8.5",

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{

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{

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);

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);

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);

src/components/Film.vue

@@ -17,12 +17,17 @@
           :value="item.name">
         </el-option>
       </el-select>
-      <b-button-group>
-        <el-select v-model="searchGroup" size="small"
-          style="width:100px;"
-         :popper-append-to-body="false"
-          default-first-option placeholder="请选择"
-          @change="searchEvent">
+      <el-autocomplete
+        clearable
+        size="small"
+        v-model.trim="searchTxt"
+        value-key="keywords"
+        :fetch-suggestions="querySearch"
+        placeholder="搜索"
+        @keyup.enter.native="searchAndRecord"
+        @select="searchEvent"
+        @change="searchChangeEvent">
+        <el-select v-model="searchGroup" slot="prepend" default-first-option placeholder="请选择" @change="searchEvent">
           <el-option
             v-for="item in searchGroups"
             :key="item"
@@ -30,22 +35,9 @@
             :value="item">
           </el-option>
         </el-select>
-        <el-autocomplete
-          clearable
-          size="small"
-          v-model.trim="searchTxt"
-          value-key="keywords"
-          :fetch-suggestions="querySearch"
-          :popper-append-to-body="false"
-          popper-class="zy-autocomplete"
-          placeholder="搜索"
-          @keyup.enter.native="searchAndRecord"
-          @select="searchEvent"
-          @change="searchChangeEvent">
-        </el-autocomplete>
         <!--方便触屏-->
-        <el-button icon="el-icon-search" @click.stop="searchEvent" />
-      </b-button-group>
+        <el-button slot="append" icon="el-icon-search" @click.stop="searchEvent" />
+      </el-autocomplete>
     </div>
     <div class="listpage-body" id="film-body" infinite-wrapper>
       <div class="show-picture" v-if="setting.view === 'picture' && !show.find">
@@ -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 })
       })

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