From 3a499766afcb9dd1d98b36db21b533f70c9dc6fc Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Fri, 14 Aug 2020 22:07:04 +0200
Subject: [PATCH] playEvent starEvent shareEvent downloadEvent all take site as
 the input argument

---
 src/components/Film.vue | 56 ++++++++++++++++++++---------------------
 src/components/Star.vue | 14 +++++------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/components/Film.vue b/src/components/Film.vue
index 67e2361..4cb7a5d 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -27,7 +27,7 @@
         </div>
       </div>
       <div class="zy-checkbox">
-        搜索所有资源<input type="checkbox" v-model="searchAllSites" class="search-all-check-input">
+        <input type="checkbox" v-model="searchAllSites" class="search-all-check-input" >搜索所有资源
       </div>
     </div>
     <div class="body zy-scroll" infinite-wrapper>
@@ -40,16 +40,16 @@
             <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.waterfall.refresh()" @click="detailEvent(site, props.data)">
                   <div class="operate">
                     <div class="operate-wrap">
-                      <span class="o-play" @click="playEvent(props.data)">播放</span>
-                      <span class="o-star" @click="starEvent(props.data)">收藏</span>
-                      <span class="o-share" @click="shareEvent(props.data)">分享</span>
+                      <span class="o-play" @click="playEvent(site, props.data)">播放</span>
+                      <span class="o-star" @click="starEvent(site, props.data)">收藏</span>
+                      <span class="o-share" @click="shareEvent(site, props.data)">分享</span>
                     </div>
                   </div>
                 </div>
-                <div class="name" @click="detailEvent(props.data)">{{props.data.name}}</div>
+                <div class="name" @click="detailEvent(site, props.data)">{{props.data.name}}</div>
                 <div class="info">
                   <span>{{props.data.year}}</span>
                   <span>{{props.data.type}}</span>
@@ -63,16 +63,16 @@
           <div class="zy-table">
             <div class="tBody">
               <ul>
-                <li v-for="(i, j) in list" :key="j" @click="detailEvent(i)">
+                <li v-for="(i, j) in list" :key="j" @click="detailEvent(site, i)">
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
                   <span class="last">{{i.last}}</span>
                   <span class="operate">
-                    <span class="btn" @click.stop="playEvent(i)">播放</span>
-                    <span class="btn" @click.stop="starEvent(i)">收藏</span>
-                    <span class="btn" @click.stop="shareEvent(i)">分享</span>
-                    <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                    <span class="btn" @click.stop="playEvent(site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(site, i)">下载</span>
                   </span>
                 </li>
               </ul>
@@ -86,7 +86,7 @@
           <div class="zy-table">
             <div class="tBody">
               <ul>
-                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i)">
+                <li v-for="(i, j) in searchContents" :key="j" @click="detailEvent(i.site, i)">
                   <span class="name">{{i.name}}</span>
                   <span class="type">{{i.type}}</span>
                   <span class="time">{{i.year}}</span>
@@ -94,10 +94,10 @@
                   <span class="site">{{i.site.name}}</span>
                   <span class="note">{{i.note}}</span>
                   <span class="operate">
-                    <span class="btn" @click.stop="playEvent(i)">播放</span>
-                    <span class="btn" @click.stop="starEvent(i)">收藏</span>
-                    <span class="btn" @click.stop="shareEvent(i)">分享</span>
-                    <span class="btn" @click.stop="downloadEvent(i)">下载</span>
+                    <span class="btn" @click.stop="playEvent(i.site, i)">播放</span>
+                    <span class="btn" @click.stop="starEvent(i.site, i)">收藏</span>
+                    <span class="btn" @click.stop="shareEvent(i.site, i)">分享</span>
+                    <span class="btn" @click.stop="downloadEvent(i.site, i)">下载</span>
                   </span>
                 </li>
               </ul>
@@ -281,30 +281,30 @@ export default {
         }
       })
     },
-    detailEvent (e) {
+    detailEvent (site, e) {
       this.detail = {
         show: true,
-        key: this.site.key,
+        key: site.key,
         info: e
       }
     },
-    playEvent (e) {
-      history.find({ site: this.site.key, ids: e.id }).then(res => {
+    playEvent (site, e) {
+      history.find({ site: site.key, ids: e.id }).then(res => {
         if (res) {
           this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
         } else {
-          this.video = { key: this.site.key, info: { id: e.id, name: e.name, index: 0 } }
+          this.video = { key: site.key, info: { id: e.id, name: e.name, index: 0 } }
         }
       })
       this.view = 'Play'
     },
-    starEvent (e) {
-      star.find({ site: this.site.key, ids: e.id }).then(res => {
+    starEvent (site, e) {
+      star.find({ site: site.key, ids: e.id }).then(res => {
         if (res) {
           this.$message.info('已存在')
         } else {
           const docs = {
-            site: this.site.key,
+            site: site,
             ids: e.id,
             name: e.name,
             type: e.type,
@@ -320,15 +320,15 @@ export default {
         this.$message.warning('收藏失败')
       })
     },
-    shareEvent (e) {
+    shareEvent (site, e) {
       this.share = {
         show: true,
-        key: this.site.key,
+        key: site.key,
         info: e
       }
     },
-    downloadEvent (e) {
-      zy.download(this.site.key, e.id).then(res => {
+    downloadEvent (site, e) {
+      zy.download(site.key, e.id).then(res => {
         if (res.length > 0) {
           const text = res.dl.dd._t
           if (text) {
diff --git a/src/components/Star.vue b/src/components/Star.vue
index 882757c..d6ef016 100644
--- a/src/components/Star.vue
+++ b/src/components/Star.vue
@@ -11,7 +11,7 @@
               <span class="name">{{i.name}}</span>
               <span class="type">{{i.type}}</span>
               <span class="time">{{i.year}}</span>
-              <span class="from">{{i.site}}</span>
+              <span class="from">{{i.site.name}}</span>
               <span class="note">{{i.note}}</span>
               <span class="operate" style="width: 220px">
                 <span class="btn" @click.stop="playEvent(i)">播放</span>
@@ -83,7 +83,7 @@ export default {
     detailEvent (e) {
       this.detail = {
         show: true,
-        key: e.site,
+        key: e.site.key,
         info: {
           id: e.ids,
           name: e.name
@@ -91,11 +91,11 @@ export default {
       }
     },
     playEvent (e) {
-      history.find({ site: e.site, ids: e.ids }).then(res => {
+      history.find({ site: e.site.key, ids: e.ids }).then(res => {
         if (res) {
           this.video = { key: res.site, info: { id: res.ids, name: res.name, index: res.index } }
         } else {
-          this.video = { key: e.site, info: { id: e.ids, name: e.name, index: 0 } }
+          this.video = { key: e.site.key, info: { id: e.ids, name: e.name, index: 0 } }
         }
       })
       this.view = 'Play'
@@ -113,12 +113,12 @@ export default {
     shareEvent (e) {
       this.share = {
         show: true,
-        key: e.site,
+        key: e.site.key,
         info: e
       }
     },
     updateEvent (e) {
-      zy.detail(e.site, e.ids).then(res => {
+      zy.detail(e.site.key, e.ids).then(res => {
         if (e.last === res.last) {
           var msg = `同步"${e.name}"成功, 未查询到更新。`
           this.$message.info(msg)
@@ -150,7 +150,7 @@ export default {
       })
     },
     downloadEvent (e) {
-      zy.download(e.site, e.ids).then(res => {
+      zy.download(e.site.key, e.ids).then(res => {
         if (res) {
           const text = res.dl.dd._t
           if (text) {