From 2196eaa68c12b34a64f86029f7b29e45a4695935 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Fri, 11 Dec 2020 13:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=A8=A1=E5=BC=8F=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=BD=AC=E7=A7=BB=E5=88=B0=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E7=BA=BF=EF=BC=8C=E6=90=9C=E7=B4=A2=E4=BA=A6?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=B7=A5=E5=85=B7=E6=A0=8F(=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BE=85=E5=AE=9E=E7=8E=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Film.vue    | 31 ++++++++++++++-----------------
 src/components/Setting.vue | 30 ------------------------------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index e62de06..12a045c 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -9,9 +9,6 @@
           :value="item.name">
         </el-option>
       </el-select>
-      <el-switch v-model="searchViewMode" active-text="海报" active-value="picture" inactive-text="列表" inactive-value="table" @change="updateSearchViewMode"
-                 v-if="show.find">
-      </el-switch>
       <el-select v-model="selectedClassName" size="small" placeholder="类型" :popper-append-to-body="false" popper-class="popper" @change="classClick" v-show="show.class">
         <el-option
           v-for="item in classList"
@@ -49,7 +46,7 @@
         <el-button icon="el-icon-close" @click.stop="stopSearchEvent" slot="append" v-if="keepSearching"/>
       </el-autocomplete>
     </div>
-    <div class="toolbar" v-if="!show.find && showToolbar">
+    <div class="toolbar" v-show="showToolbar">
       <el-select v-model="selectedAreas" size="small" multiple collapse-tags placeholder="地区" popper-class="popper" :popper-append-to-body="false" @remove-tag="refreshFilteredList" @visible-change="refreshFilteredList($event)">
         <el-option
           v-for="item in areas"
@@ -73,7 +70,8 @@
        <el-input-number size="small" v-model="selectedYears.end" :min=0 :max="new Date().getFullYear()" controls-position="right" step-strictly @change="refreshFilteredList"></el-input-number>
        </span>
     </div>
-    <el-divider content-position="center" v-if="!show.find">
+    <el-divider content-position="center">
+      <el-button type="text" size="mini" @click="toggleViewMode">视图切换</el-button>
       <el-button type="text" size="mini" @click='() => { showToolbar = !showToolbar; if (!showToolbar) this.refreshFilteredList() }'>{{ showToolbar ? '隐藏工具栏' : '显示工具栏' }}</el-button>
     </el-divider>
     <div class="listpage-body" id="film-body" infinite-wrapper>
@@ -128,7 +126,7 @@
             prop="name"
             label="片名">
           </el-table-column>
-          <el-table-column
+          <el-table-column v-if="type.name === '最新'"
             prop="type"
             label="类型"
             width="100">
@@ -181,7 +179,7 @@
           </infinite-loading>
         </el-table>
       </div>
-      <div class="show-table" v-if="searchViewMode=== 'table' && show.find">
+      <div class="show-table" v-if="setting.searchViewMode === 'table' && show.find">
         <el-table size="mini"
           ref="searchResultTable"
           :data="searchContents.filter(res => !setting.excludeR18Films || (res.type !== undefined && !containsR18Keywords(res.type)))"
@@ -255,7 +253,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="show-picture" v-if="searchViewMode === 'picture' && show.find">
+      <div class="show-picture" v-if="setting.searchViewMode === 'picture' && show.find">
           <Waterfall ref="filmSearchWaterfall" :list="searchContents.filter(res => !setting.excludeR18Films || (res.type !== undefined && !containsR18Keywords(res.type)))" :gutter="20" :width="240"
           :breakpoints="{
             1200: { //当屏幕宽度小于等于1200
@@ -338,7 +336,6 @@ export default {
       searchGroups: [],
       // 福利片关键词
       r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'],
-      searchViewMode: 'picture',
       filteredList: [],
       areas: [],
       selectedAreas: [],
@@ -479,9 +476,15 @@ export default {
         this.$refs.filmWaterfall.refresh()
       }
     },
-    updateSearchViewMode () {
+    toggleViewMode () {
+      if (this.show.find) {
+        this.setting.searchViewMode = this.setting.searchViewMode === 'picture' ? 'table' : 'picture'
+      } else {
+        this.setting.view = this.setting.view === 'picture' ? 'table' : 'picture'
+      }
       setting.find().then(res => {
-        res.searchViewMode = this.searchViewMode
+        res.searchViewMode = this.setting.searchViewMode
+        res.view = this.setting.view
         setting.update(res)
       })
     },
@@ -839,17 +842,11 @@ export default {
         this.searchGroup = this.setting.searchGroup
         if (this.searchGroup === undefined) setting.find().then(res => { this.searchGroup = res.searchGroup })
       })
-    },
-    getSearchViewMode () {
-      setting.find().then(res => {
-        this.searchViewMode = res.searchViewMode === undefined ? 'picture' : res.searchViewMode
-      })
     }
   },
   created () {
     this.getAllSites()
     this.getSearchHistory()
-    this.getSearchViewMode()
   },
   mounted () {
     window.addEventListener('resize', () => {
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index d6f9eeb..b70c5a3 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -8,20 +8,6 @@
         <a @click="linkOpen('https://github.com/Hunlongyu/ZY-Player/issues')">当前版本v{{pkg.version}} 反馈</a>
         <a style="color:#38dd77" @click="openUpdate()" v-show="update.find" >最新版本v{{update.version}}</a>
       </div>
-      <div class="view">
-        <div class="title">视图</div>
-        <div class="view-box">
-          <div class="zy-select" @mouseleave="show.view = false">
-            <div class="vs-placeholder" @click="show.view = true">默认视图</div>
-            <div class="vs-options" v-show="show.view">
-              <ul class="zy-scroll">
-                <li :class="d.view === 'picture' ? 'active' : ''" @click="changeView('picture')">海报</li>
-                <li :class="d.view === 'table' ? 'active' : ''" @click="changeView('table')">列表</li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
       <div class="shortcut">
         <div class="title">快捷键</div>
         <div class="shortcut-box">
@@ -315,11 +301,6 @@ export default {
         this.shortcutList = res
       })
     },
-    changeView (e) {
-      this.d.view = e
-      this.updateSettingEvent()
-      this.show.view = false
-    },
     async clearCache () {
       const win = remote.getCurrentWindow()
       const ses = win.webContents.session
@@ -572,17 +553,6 @@ export default {
       cursor: pointer;
     }
   }
-  .view{
-    width: 100%;
-    padding: 20px;
-    margin-top: 20px;
-    .view-box{
-      margin-top: 10px;
-      .zy-select{
-        margin-right: 20px;
-      }
-    }
-  }
   .site{
     width: 100%;
     padding: 20px;