From a2d22156469738d3ad5b530edb38ea26172b5332 Mon Sep 17 00:00:00 2001
From: hunlongyu <hunlongyu@gmail.com>
Date: Tue, 14 Jul 2020 00:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=86=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE=E7=9A=84?=
 =?UTF-8?q?BUG=20=F0=9F=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail.vue |  2 +-
 src/components/Film.vue   | 22 ++++++++++++++++------
 src/components/Play.vue   |  5 +++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/components/Detail.vue b/src/components/Detail.vue
index 044ae8d..ff74bab 100644
--- a/src/components/Detail.vue
+++ b/src/components/Detail.vue
@@ -123,7 +123,7 @@ export default {
         if (res) {
           this.video = { key: res.site, info: { id: res.ids, name: res.name, index: n } }
         } else {
-          this.video = { key: this.detail.key, info: { id: this.detail.info.ids, name: this.detail.info.name, index: n } }
+          this.video = { key: this.detail.key, info: { id: this.detail.info.id, name: this.detail.info.name, index: n } }
         }
       })
 
diff --git a/src/components/Film.vue b/src/components/Film.vue
index 9e513b3..e107be5 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -34,11 +34,11 @@
           :breakpoints="{ 1200: { rowPerView: 4 } }"
           animationEffect="fadeInUp"
           backgroundColor="rgba(0, 0, 0, 0)"
-          ref="waterfall">
+          ref="wimg">
             <template slot="item" slot-scope="props">
               <div class="card">
                 <div class="img">
-                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(props.data)">
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.wimg.refresh()" @click="detailEvent(props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
                       <span class="o-play" @click="playEvent(props.data)">播放</span>
@@ -186,8 +186,8 @@ export default {
       this.searchChangeEvent()
     },
     setting: {
-      handler () {
-        this.settingChangeEvent()
+      handler (ov, nv) {
+        this.settingChangeEvent(ov, nv)
       },
       deep: true
     }
@@ -351,9 +351,13 @@ export default {
     },
     changeView () {
       if (this.view === 'Film') {
-        this.$refs.waterfall.refresh()
+        if (this.show.img) {
+          this.$refs.wimg.refresh()
+        }
         this.getPage().then(() => {
           this.infiniteId += 1
+          if (this.show.img || this.show.table) {
+          }
         })
       }
     },
@@ -429,6 +433,11 @@ export default {
         this.show.class = false
       } else {
         this.show.class = true
+        this.searchContents = []
+        this.show.find = false
+        if (this.show.img) {
+          this.$refs.wimg.refresh()
+        }
       }
     },
     getAllsites () {
@@ -438,7 +447,8 @@ export default {
         this.siteClick(this.site)
       })
     },
-    settingChangeEvent () {
+    settingChangeEvent (ov, nv) {
+      console.log(ov, nv, 'ov nv')
       this.getAllsites()
     }
   },
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 0940ab8..c2f042b 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -5,7 +5,7 @@
         <span v-if="this.right.list.length > 1">『第 {{(video.info.index + 1)}} 集』</span>{{name}}
       </div>
       <div class="player">
-        <div id="xg"></div>
+        <div id="xgplayer"></div>
       </div>
       <div class="more">
         <span class="zy-svg" @click="nextEvent" v-show="showNext">
@@ -118,7 +118,7 @@ export default {
         history: []
       },
       config: {
-        id: 'xg',
+        id: 'xgplayer',
         url: '',
         lang: 'zh-cn',
         width: '100%',
@@ -210,6 +210,7 @@ export default {
   methods: {
     ...mapMutations(['SET_VIEW', 'SET_DETAIL', 'SET_VIDEO', 'SET_SHARE']),
     getUrls () {
+      console.log(this.video, 'this.video')
       this.name = ''
       if (this.timer !== null) {
         clearInterval(this.timer)