From f876b863e7e84d7fa8fb9c0b8ace13bbd1d18839 Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Sat, 21 Nov 2020 13:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=8D=A2=E6=BA=90=E6=97=B6?=
 =?UTF-8?q?=E5=8F=AF=E9=9A=90=E8=97=8F=E9=A2=91=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/theme/dark.scss  |  8 ++++++++
 src/assets/scss/theme/green.scss |  8 ++++++++
 src/assets/scss/theme/light.scss |  8 ++++++++
 src/assets/scss/theme/pink.scss  |  8 ++++++++
 src/components/Play.vue          | 29 ++++++++++++++++++++++++-----
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss
index 398c029..7240b37 100644
--- a/src/assets/scss/theme/dark.scss
+++ b/src/assets/scss/theme/dark.scss
@@ -207,6 +207,14 @@
             }
           }
         }
+        .list-channels{
+          .btn{
+            color: var(--d-fc-1);
+            &:hover{
+              text-decoration:underline;
+            }
+          }
+        }
         .list-history{
           li{
             .title{
diff --git a/src/assets/scss/theme/green.scss b/src/assets/scss/theme/green.scss
index ad4f05f..e5a43a5 100644
--- a/src/assets/scss/theme/green.scss
+++ b/src/assets/scss/theme/green.scss
@@ -207,6 +207,14 @@
             }
           }
         }
+        .list-channels{
+          .btn{
+            color: var(--g-fc-1);
+            &:hover{
+              text-decoration:underline;
+            }
+          }
+        }
         .list-history{
           li{
             .title{
diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss
index 8880668..8ebb330 100644
--- a/src/assets/scss/theme/light.scss
+++ b/src/assets/scss/theme/light.scss
@@ -207,6 +207,14 @@
             }
           }
         }
+        .list-channels{
+          .btn{
+            color: var(--l-fc-1);
+            &:hover{
+              text-decoration:underline;
+            }
+          }
+        }
         .list-history{
           li{
             .title{
diff --git a/src/assets/scss/theme/pink.scss b/src/assets/scss/theme/pink.scss
index 6ad7645..8e747e4 100644
--- a/src/assets/scss/theme/pink.scss
+++ b/src/assets/scss/theme/pink.scss
@@ -207,6 +207,14 @@
             }
           }
         }
+        .list-channels{
+          .btn{
+            color: var(--p-fc-1);
+            &:hover{
+              text-decoration:underline;
+            }
+          }
+        }
         .list-history{
           li{
             .title{
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 705cf68..fc61b14 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -111,7 +111,7 @@
             <line x1="7" y1="17" x2="7" y2="17"></line>
           </svg>
         </span>
-        <span class="zy-svg" @click="otherEvent" v-if="right.sources.length > 1">
+        <span class="zy-svg" @click="otherEvent">
           <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="coloursIconTitle">
             <title id="coloursIconTitle">换源</title>
             <circle cx="12" cy="9" r="5"></circle>
@@ -173,14 +173,17 @@
             <li v-if="right.other.length === 0">无数据</li>
             <li @click="otherItemEvent(m)" v-for="(m, n) in right.other" :key="n"><span class="title">{{m.name}} - [{{m.site.name}}]</span></li>
           </ul>
-          <ul v-if="right.type === 'sources'" class="list-other" v-on-clickaway="closeListEvent">
-            <li v-if="right.sources.length === 0">无数据</li>
-            <li @click="playChannel(channel)" v-for="(channel, index) in right.sources" :key="index">
-              <span class="title">{{ channel.id === video.iptv.id ? channel.name + '[当前]' : channel.name }}</span>
+          <ul v-if="right.type === 'sources'" class="list-channels" v-on-clickaway="closeListEvent">
+            <li v-if="right.sources.length === 0">当前频道已关闭</li>
+            <li v-for="(channel, index) in right.sources" :key="index">
+              <span @click="playChannel(channel)" class="title">{{ channel.id === video.iptv.id ? channel.name + '[当前]' : channel.name }}</span>
+              <span @click="disableChannel(channel)" class="btn" title="关闭频道">隐藏</span>
             </li>
           </ul>
         </div>
       </div>
+    </transition>
+    <transition name="slideX">
       <div v-if="channelListShow" class="list">
          <div class="list-top">
           <span class="list-top-title">频道列表</span>
@@ -506,6 +509,17 @@ export default {
         this.playVideo(index, time)
       }
     },
+    disableChannel (channel) {
+      const index = this.right.sources.indexOf(channel)
+      this.right.sources.splice(index, 1)
+      const ele = this.channelList.find(e => e.id === channel.channelID)
+      const origin = ele.channels.find(e => e.id === channel.id)
+      origin.isActive = false
+      ele.isActive = ele.channels.some(e => e.isActive)
+      channelList.remove(ele.id)
+      channelList.add(ele)
+      this.getChannelList()
+    },
     playChannel (channel) {
       if (channel.channels) {
         this.right.sources = channel.channels.filter(e => e.isActive)
@@ -972,6 +986,7 @@ export default {
         this.getOtherSites()
         this.right.currentTime = this.xg.currentTime
       } else {
+        this.channelListShow = false
         this.right.type = 'sources'
       }
       this.right.show = true
@@ -1602,6 +1617,7 @@ export default {
           padding-left: 10px;
           font-size: 14px;
           cursor: pointer;
+          display: flex;
           .title{
             display: inline-block;
             overflow: hidden;
@@ -1609,6 +1625,9 @@ export default {
             white-space: nowrap;
             width: 231px;
           }
+          .btn{
+            display: inline-block;
+          }
           .detail-delete{
             display: none;
             position: absolute;