From 384ae104751998cf94891364f5ac1bef19e270bc Mon Sep 17 00:00:00 2001
From: buvta <12312540+buvta@users.noreply.github.com>
Date: Fri, 20 Nov 2020 22:50:57 +0800
Subject: [PATCH] =?UTF-8?q?iptv=E7=A7=BB=E5=88=B0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=92=AD=E6=94=BE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E8=BD=BD=E8=A7=86=E9=A2=91=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=B9=E5=87=BA=E9=A2=91=E9=81=93=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                | 2 +-
 src/components/Aside.vue   | 7 -------
 src/components/Play.vue    | 7 ++++++-
 src/components/Setting.vue | 8 ++++++++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2cf0493..38aaff5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,10 +5,10 @@
       <Frame />
       <Film v-show="view === 'Film'" />
       <Play v-show="view === 'Play'" />
-      <IPTV v-show="view === 'IPTV'" />
       <Star v-show="view === 'Star'" />
       <History v-show="view === 'History'" />
       <Setting v-show="view === 'Setting'" />
+      <IPTV v-if="view === 'IPTV'" />
       <EditSites v-if="view === 'EditSites'"/>
       <Recommendation v-show="view === 'Recommendation'" />
     </div>
diff --git a/src/components/Aside.vue b/src/components/Aside.vue
index 8cbdd33..cc68295 100644
--- a/src/components/Aside.vue
+++ b/src/components/Aside.vue
@@ -21,13 +21,6 @@
       <path d="M4,18 L4,9"/>
       </svg>
     </span>
-    <span :class="[view === 'IPTV' ? 'active ': ''] + 'zy-svg'" @click="changeView('IPTV')">
-      <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="tvIconTitle">
-        <title id="tvIconTitle">电视直播</title>
-        <polygon points="20 8 20 20 4 20 4 8"></polygon>
-        <polyline stroke-linejoin="round" points="8 4 12 7.917 16 4"></polyline>
-      </svg>
-    </span>
     <span :class="[view === 'Play' ? 'active ': ''] + 'zy-svg'" @click="changeView('Play')">
       <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="playIconTitle">
         <title id="playIconTitle">播放</title>
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 6dd750e..705cf68 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -386,6 +386,10 @@ export default {
     view () {
       this.right.show = false
       this.right.type = ''
+      if (this.view === 'Play') {
+        this.getChannelList()
+        if (this.video.key === '') this.channelListShow = true
+      }
     },
     video: {
       handler () {
@@ -471,6 +475,7 @@ export default {
     },
     async getUrls () {
       if (this.video.key === '') {
+        this.channelListShow = true
         return false
       }
       this.name = ''
@@ -484,7 +489,6 @@ export default {
 
       if (this.video.iptv) {
         // 是直播源，直接播放
-        await this.getChannelList()
         this.playChannel(this.video.iptv)
       } else {
         this.iptvMode = false
@@ -1371,6 +1375,7 @@ export default {
   },
   created () {
     this.getAllhistory()
+    this.getChannelList()
     this.mtEvent()
   },
   async mounted () {
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index 4979ec1..4cca9f4 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -72,6 +72,14 @@
             </div>
           </div>
       </div>
+      <div class="site">
+        <div class="title">直播源管理</div>
+        <div class="site-box">
+          <div class="zy-select">
+            <div class="vs-placeholder vs-noAfter" @click="view = 'IPTV'">编辑直播源</div>
+          </div>
+        </div>
+      </div>
       <div class="site">
         <div class="title">源管理</div>
         <div class="site-box">