From cbedb859c3bc4cf6d8a9c68a19b76de1e4c67a88 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Thu, 17 Sep 2020 15:54:15 +0200
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=BD=B1=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=8F=E8=94=BD=E7=A6=8F=E5=88=A9=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/style.scss |  2 +-
 src/components/Film.vue    | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index 8e3607c..52303c6 100644
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -80,7 +80,7 @@
 }
 .zy-checkbox{
   position: relative;
-  display: flex;
+  display: inline-block;
   width: 200px;
   height: 30px;
   vertical-align: middle;
diff --git a/src/components/Film.vue b/src/components/Film.vue
index a3730db..cadbe1e 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -35,7 +35,7 @@
           animationEffect="fadeInUp"
           backgroundColor="rgba(0, 0, 0, 0)">
             <template slot="item" slot-scope="props">
-              <div class="card">
+              <div class="card" v-show="!setting.excludeR18Films || !containsR18Keywords(props.data.type)">
                 <div class="img">
                   <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(site, props.data)">
                   <div class="operate">
@@ -61,7 +61,7 @@
           <div class="zy-table">
             <div class="tBody">
               <ul>
-                <li v-for="(i, j) in list" :key="j" @click="detailEvent(site, i)">
+                <li v-for="(i, j) in list" :key="j" @click="detailEvent(site, i)" v-show="!setting.excludeR18Films || !containsR18Keywords(i.type)">
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
@@ -136,7 +136,9 @@ export default {
       infiniteId: +new Date(),
       searchList: [],
       searchTxt: '',
-      searchContents: []
+      searchContents: [],
+      // 福利片关键词
+      r18KeyWords: ['伦理', '倫理', '福利', '激情', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '里番']
     }
   },
   components: {
@@ -232,20 +234,12 @@ export default {
         const key = this.site.key
         // 屏蔽主分类
         const classToHide = ['电影', '电影片', '电视剧', '连续剧', '综艺', '动漫']
-        // 福利片关键词
-        const r18KeyWords = ['福利', '激情', '伦理', '理论', '写真', '情色', '美女', '街拍', '赤足', '性感', '倫理', '里番']
-
         zy.class(key).then(res => {
           var allClass = [{ name: '最新', tid: 0 }]
           res.class.forEach(element => {
             if (!classToHide.includes(element.name)) {
               if (this.setting.excludeR18Films) {
-                var containKeyWord = false
-                r18KeyWords.forEach(ele => {
-                  if (element && element.name && element.name.includes(ele)) {
-                    containKeyWord = true
-                  }
-                })
+                const containKeyWord = this.containsR18Keywords(element.name)
                 if (!containKeyWord) {
                   allClass.push(element)
                 }
@@ -264,6 +258,13 @@ export default {
         })
       })
     },
+    containsR18Keywords (name) {
+      var containKeyWord = false
+      if (!name) {
+        return containKeyWord
+      }
+      return this.r18KeyWords.some(v => name.includes(v))
+    },
     getPage () {
       return new Promise((resolve, reject) => {
         const key = this.site.key