Merge branch 'master' of https://github.com/Hunlongyu/ZY-Player

src/components/Film.vue

@@ -480,7 +480,7 @@ export default {
           this.list = []
         } else {
           this.sites = res.filter((item, index, self) => {
-            return self.indexOf(item) >= 0
+            return self.indexOf(item) >= 0 && item.isActive
           })
           this.site = this.sites[0]
           this.siteClick(this.site)

src/components/Play.vue

@@ -687,6 +687,7 @@ export default {
       if (this.video.iptv) {
         var channel = this.iptvList[n]
         this.video.iptv = channel
+        this.name = this.video.iptv.name
         // 是直播源，直接播放
         this.playUrl(channel.url)
       } else {