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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

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,15 @@ export default {
       if (popperVisible === true) return
       if (!this.showToolbar) {
         this.sortKeyword = ''
-        this.selectedAreas = this.selectedLangs = []
+        this.selectedAreas = []
         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) {

src/components/Play.vue

@@ -98,7 +98,10 @@
             <circle cx="12" cy="12" r="10"></circle>
           </svg>
         </span>
-        <span class="timespan" v-if="right.list.length > 1">
+        <span class="timespanSwitch" v-if="right.list.length > 1">
+          <el-switch v-model="showTimeSpanSetting" active-text="跳略设置"></el-switch>
+        </span>
+        <span class="timespan" v-if="showTimeSpanSetting">
           <label>片头长度：</label>
           <input type="number" v-model="startPosition.min" style="width:45px" min="00" max="59" placeholder="00" required>
           <label>:</label>
@@ -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: {
@@ -505,6 +509,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