From 6fcb6ad16c952373bdd1e1e2939114eaeccec1d6 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Sat, 14 Nov 2020 15:29:38 +0100
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=B5=B7=E6=8A=A5=E5=92=8C=E5=88=97=E8=A1=A8=E4=B8=A4?=
 =?UTF-8?q?=E7=A7=8D=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss | 13 +++++++++
 src/components/Film.vue    | 60 ++++++++++++++++++++++++++++++++++++--
 src/lib/dexie/dexie.js     |  2 +-
 src/lib/dexie/initData.js  |  1 +
 4 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index f432392..831bb45 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -276,6 +276,19 @@
             text-align: center;
             transform: rotate(45deg);
           }
+          .site{
+            position: absolute;
+            top: 0%;
+            left: 0%;
+            width: 100%;
+            background-color: #111111aa;
+            color:#2f90b9;
+            height: 30px;
+            line-height: 30px;
+            font-size: 14px;
+            font-weight: bolder;
+            text-align: center;
+          }
           .progress{
             position: absolute;
             bottom: 10%;
diff --git a/src/components/Film.vue b/src/components/Film.vue
index caa94b8..eaa66a2 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -9,6 +9,8 @@
           :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"
@@ -150,7 +152,7 @@
           </infinite-loading>
         </el-table>
       </div>
-      <div class="show-table" v-show="show.find">
+      <div class="show-table" v-show="searchViewMode=== 'table' && show.find">
         <el-table size="mini"
           ref="searchResultTable"
           :data="searchContents.filter(res => !setting.excludeR18Films || (res.type !== undefined && !containsR18Keywords(res.type)))"
@@ -224,6 +226,47 @@
           </el-table-column>
         </el-table>
       </div>
+      <div class="show-picture" v-show="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
+              rowPerView: 4,
+            },
+            800: { //当屏幕宽度小于等于800
+              rowPerView: 3,
+            },
+            500: { //当屏幕宽度小于等于500
+              rowPerView: 2,
+            }
+          }"
+          animationEffect="fadeIn"
+          backgroundColor="rgba(0, 0, 0, 0)">
+            <template slot="item" slot-scope="props">
+              <div class="card" v-show="!setting.excludeR18Films || !containsR18Keywords(props.data.type)">
+                <div class="img">
+                  <div class="site">
+                    <span>{{props.data.site.name}}</span>
+                  </div>
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.filmSearchWaterfall.refresh()" @click="detailEvent(props.data.site, props.data)">
+                  <div class="operate">
+                    <div class="operate-wrap">
+                      <span class="o-play" @click="playEvent(props.data.site, props.data)">播放</span>
+                      <span class="o-star" @click="starEvent(props.data.site, props.data)">收藏</span>
+                      <span class="o-share" @click="shareEvent(props.data.site, props.data)">分享</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="name" @click="detailEvent(props.data.site, props.data)">{{props.data.name}}</div>
+                <div class="info">
+                  <span>{{props.data.area}}</span>
+                  <span>{{props.data.year}}</span>
+                  <span>{{props.data.note}}</span>
+                  <span>{{props.data.type}}</span>
+                </div>
+              </div>
+            </template>
+          </Waterfall>
+      </div>
     </div>
   </div>
 </template>
@@ -263,7 +306,8 @@ export default {
       searchGroup: '',
       searchGroups: [],
       // 福利片关键词
-      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
+      r18KeyWords: ['伦理', '论理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番'],
+      searchViewMode: 'picture'
     }
   },
   components: {
@@ -338,6 +382,12 @@ export default {
   },
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE', 'SET_SETTING']),
+    updateSearchViewMode () {
+      setting.find().then(res => {
+        res.searchViewMode = this.searchViewMode
+        setting.update(res)
+      })
+    },
     sortByLocaleCompare (a, b) {
       return a.localeCompare(b, 'zh')
     },
@@ -697,11 +747,17 @@ 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/lib/dexie/dexie.js b/src/lib/dexie/dexie.js
index 478a0cc..e0a3d0a 100644
--- a/src/lib/dexie/dexie.js
+++ b/src/lib/dexie/dexie.js
@@ -6,7 +6,7 @@ const db = new Dexie('zy')
 db.version(4).stores({
   search: '++id, keywords',
   iptvSearch: '++id, keywords',
-  setting: 'id, theme, site, shortcut, view, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, password, proxy',
+  setting: 'id, theme, site, shortcut, view, externalPlayer, searchGroup, excludeRootClasses, excludeR18Films, forwardTimeInSec, starViewMode, recommandationViewMode, searchViewMode, password, proxy',
   shortcut: 'name, key, desc',
   star: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
   recommendation: '++id, [key+ids], site, name, detail, index, rate, hasUpdate',
diff --git a/src/lib/dexie/initData.js b/src/lib/dexie/initData.js
index 6889237..ad7019e 100644
--- a/src/lib/dexie/initData.js
+++ b/src/lib/dexie/initData.js
@@ -12,6 +12,7 @@ const setting = [
     starViewMode: 'picture',
     recommendationViewMode: 'picture',
     historyViewMode: 'picture',
+    searchViewMode: 'picture',
     password: '',
     proxy: {
       type: 'none',