From 6f8f700dfc799cd8c312e8a816a2d09910d7f2d2 Mon Sep 17 00:00:00 2001
From: hunlongyu <hunlongyu@gmail.com>
Date: Tue, 14 Jul 2020 15:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=9F=20=E4=BF=AE=E5=A4=8DBUG=20?=
 =?UTF-8?q?=F0=9F=8C=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json               |  2 +-
 src/components/Film.vue    | 54 ++++++++++++++++++++++----------------
 src/components/Play.vue    |  1 -
 src/components/Setting.vue |  4 ++-
 src/components/Share.vue   | 25 +++++++++---------
 5 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index f78dbfe..6cd770d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/components/Film.vue b/src/components/Film.vue
index e107be5..a0853cd 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -28,17 +28,16 @@
       </div>
     </div>
     <div class="body zy-scroll" infinite-wrapper>
-      <div class="body-box" v-if="!show.find">
+      <div class="body-box" v-show="!show.find">
         <div class="show-img" v-if="setting.view === 'picture'">
-          <Waterfall :list="list" :gutter="20" :width="240"
+          <Waterfall ref="waterfall" :list="list" :gutter="20" :width="240"
           :breakpoints="{ 1200: { rowPerView: 4 } }"
           animationEffect="fadeInUp"
-          backgroundColor="rgba(0, 0, 0, 0)"
-          ref="wimg">
+          backgroundColor="rgba(0, 0, 0, 0)">
             <template slot="item" slot-scope="props">
               <div class="card">
                 <div class="img">
-                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.wimg.refresh()" @click="detailEvent(props.data)">
+                  <img style="width: 100%" :src="props.data.pic" alt="" @load="$refs.waterfall.refresh()" @click="detailEvent(props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
                       <span class="o-play" @click="playEvent(props.data)">播放</span>
@@ -79,7 +78,7 @@
           </div>
         </div>
       </div>
-      <div class="body-box" v-if="show.find">
+      <div class="body-box" v-show="show.find">
         <div class="show-table">
           <div class="zy-table">
             <div class="tBody">
@@ -185,9 +184,9 @@ export default {
     searchTxt () {
       this.searchChangeEvent()
     },
-    setting: {
-      handler (ov, nv) {
-        this.settingChangeEvent(ov, nv)
+    'setting.site': {
+      handler (nv) {
+        this.getAllsites(nv)
       },
       deep: true
     }
@@ -352,7 +351,7 @@ export default {
     changeView () {
       if (this.view === 'Film') {
         if (this.show.img) {
-          this.$refs.wimg.refresh()
+          this.$refs.waterfall.refresh()
         }
         this.getPage().then(() => {
           this.infiniteId += 1
@@ -371,6 +370,7 @@ export default {
       this.searchContents = []
       this.pagecount = 0
       this.show.search = false
+      this.show.find = true
       if (wd) {
         search.find({ keywords: wd }).then(res => {
           if (!res) {
@@ -389,7 +389,6 @@ export default {
           if (type === '[object Object]') {
             this.searchContents.push(res)
           }
-          this.show.find = true
         })
       } else {
         this.show.find = false
@@ -405,6 +404,7 @@ export default {
       this.pagecount = 0
       this.searchTxt = e.keywords
       this.show.search = false
+      this.show.find = true
       search.remove(e.id).then(res => {
         search.add({ keywords: e.keywords })
         this.getAllSearch()
@@ -420,7 +420,6 @@ export default {
         if (type === '[object Object]') {
           this.searchContents.push(res)
         }
-        this.show.find = true
       })
     },
     clearSearch () {
@@ -436,20 +435,29 @@ export default {
         this.searchContents = []
         this.show.find = false
         if (this.show.img) {
-          this.$refs.wimg.refresh()
+          this.$refs.waterfall.refresh()
         }
       }
     },
-    getAllsites () {
-      sites.all().then(res => {
-        this.sites = res
-        this.site = this.sites[0]
-        this.siteClick(this.site)
-      })
-    },
-    settingChangeEvent (ov, nv) {
-      console.log(ov, nv, 'ov nv')
-      this.getAllsites()
+    getAllsites (nv) {
+      if (nv) {
+        sites.all().then(res => {
+          this.sites = res
+          for (const i of res) {
+            if (i.key === nv) {
+              this.site = i
+              this.siteClick(this.site)
+              return false
+            }
+          }
+        })
+      } else {
+        sites.all().then(res => {
+          this.sites = res
+          this.site = this.sites[0]
+          this.siteClick(this.site)
+        })
+      }
     }
   },
   created () {
diff --git a/src/components/Play.vue b/src/components/Play.vue
index c2f042b..fec8448 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -210,7 +210,6 @@ 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)
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index af8aa14..92ca4e4 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -207,7 +207,9 @@ export default {
           this.$message.success('已添加成功')
           this.getSites()
           this.d.site = json[0].key
-          this.setting = this.d
+          setting.update(this.d).then(res => {
+            this.setting = this.d
+          })
         })
       })
     },
diff --git a/src/components/Share.vue b/src/components/Share.vue
index aa2d3ea..4d17e89 100644
--- a/src/components/Share.vue
+++ b/src/components/Share.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="share" id="share" @click="shareClickEvent">
     <div class="left">
-      <img :src="pic" alt="">
+      <img :src="pic" alt="" @load="picLoadEvent">
     </div>
-    <div class="right">
+    <div class="right" id="right">
       <div class="title">{{ share.info.name }}</div>
       <qrcode-vue id="qr" :value="link" :size="160" level="L" />
       <div class="tips">
@@ -79,17 +79,17 @@ export default {
             }
           }
           this.loading = false
-          this.$nextTick(() => {
-            const dom = document.getElementById('share')
-            html2canvas(dom, { useCORS: true, allowTaint: true }).then(res => {
-              const png = res.toDataURL('image/png')
-              const p = nativeImage.createFromDataURL(png)
-              clipboard.writeImage(p)
-              this.$message.success('已复制到剪贴板，快去分享吧~ 严禁传播违法资源!!!')
-            })
-          })
         }
       })
+    },
+    picLoadEvent () {
+      const dom = document.getElementById('right')
+      html2canvas(dom, { useCORS: true, allowTaint: true }).then(res => {
+        const png = res.toDataURL('image/png')
+        const p = nativeImage.createFromDataURL(png)
+        clipboard.writeImage(p)
+        this.$message.success('已复制到剪贴板，快去分享吧~ 严禁传播违法资源!!!')
+      })
     }
   },
   mounted () {
@@ -108,7 +108,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 20px;
+  padding: 0px;
   z-index: 999;
   .left, .right{
     width: 50%;
@@ -125,6 +125,7 @@ export default {
     }
   }
   .right{
+    padding: 10px;
     .title{
       font-size: 18px;
       margin-bottom: 10px;