From 8ea52857a5ba39562c381e2269a75467919080ca Mon Sep 17 00:00:00 2001
From: hunlongyu <hunlongyu@gmail.com>
Date: Wed, 22 Apr 2020 13:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B2=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9BBug,=20=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E4=B8=8B=E4=B8=80=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/theme.scss       |  6 +++---
 src/assets/scss/theme/dark.scss  | 18 ++++++++++++++++--
 src/assets/scss/theme/light.scss | 18 ++++++++++++++++--
 src/components/Film.vue          |  1 -
 src/components/Play.vue          |  5 +++++
 src/components/Share.vue         |  5 -----
 src/locales/zh-cn.json           |  2 +-
 7 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/theme.scss b/src/assets/scss/theme.scss
index 8af7eb9..7271ce9 100644
--- a/src/assets/scss/theme.scss
+++ b/src/assets/scss/theme.scss
@@ -9,7 +9,7 @@
   --l-c-9: #823aa099;
   --l-fc-1: #808695;
   --l-fc-2: #332f5c;
-  --l-fc-3: #332f5c88;
+  --l-fc-3: #823aa0;
   --l-bgc-1: #ffffff;
   --l-bgc-2: #f2f6f9;
   --l-bsc: 0 3px 1px -2px #8e8da233, 0 2px 2px 0 #8e8da224, 0 1px 5px 0 #8e8da21f;
@@ -26,8 +26,8 @@
   --d-c-8: #38dd7788;
   --d-c-9: #38dd7799;
   --d-fc-1: #808695;
-  --d-fc-2: #808080;
-  --d-fc-3: #acacac;
+  --d-fc-2: #acacac;
+  --d-fc-3: #38dd77;
   --d-bgc-1: #222222;
   --d-bgc-2: #2f2f2f;
   --d-bsc: 0 3px 1px -2px #38dd7733, 0 2px 2px 0 #38dd7722, 0 1px 5px 0 #38dd7711;
diff --git a/src/assets/scss/theme/dark.scss b/src/assets/scss/theme/dark.scss
index d8dc3f1..1a2f759 100644
--- a/src/assets/scss/theme/dark.scss
+++ b/src/assets/scss/theme/dark.scss
@@ -62,8 +62,8 @@
         li{
           border-bottom-color: var(--d-c-2);
           &:hover{
-            animation: tableHoverAni 0.2s ease both;
-            @keyframes tableHoverAni {
+            animation: d-tableHoverAni 0.2s ease both;
+            @keyframes d-tableHoverAni {
               to{
                 box-shadow: var(--d-bsc-hover);
               }
@@ -325,4 +325,18 @@
       }
     }
   }
+  .share{
+    background-color: var(--d-bgc-1);
+    color: var(--d-fc-1);
+    border: 1px solid var(--d-c-8);
+    .right{
+      color: var(--d-fc-1);
+      .tops{
+        color: var(--d-fc-2);
+      }
+    }
+    .share-mask{
+      background-color: var(--d-bgc-1);
+    }
+  }
 }
diff --git a/src/assets/scss/theme/light.scss b/src/assets/scss/theme/light.scss
index 11d5f59..643103d 100644
--- a/src/assets/scss/theme/light.scss
+++ b/src/assets/scss/theme/light.scss
@@ -53,8 +53,8 @@
         li{
           border-bottom-color: var(--l-c-2);
           &:hover{
-            animation: tableHoverAni 0.2s ease both;
-            @keyframes tableHoverAni {
+            animation: l-tableHoverAni 0.2s ease both;
+            @keyframes l-tableHoverAni {
               to{
                 box-shadow: var(--l-bsc-hover);
               }
@@ -316,4 +316,18 @@
       }
     }
   }
+  .share{
+    background-color: var(--l-bgc-1);
+    color: var(--l-fc-1);
+    border: 1px solid var(--l-c-8);
+    .right{
+      color: var(--l-fc-1);
+      .tops{
+        color: var(--l-fc-2);
+      }
+    }
+    .share-mask{
+      background-color: var(--l-bgc-1);
+    }
+  }
 }
diff --git a/src/components/Film.vue b/src/components/Film.vue
index b495b30..f100f16 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -21,7 +21,6 @@
       </div>
       <!-- type -->
       <div class="zy-select" @mouseleave="show.type = false" v-if="site.tags[tag].children.length > 0">
-        <!-- <div class="vs-placeholder" @click="show.type = true">{{site.tags[tag].children[type].title}}</div> -->
         <div class="vs-placeholder" @click="show.type = true">{{typeName}}</div>
         <div class="vs-options" v-show="show.type">
           <ul>
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 3554953..53a0bfe 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -225,6 +225,11 @@ export default {
           this.xg.play()
         }
         this.onPlayVideo()
+        this.xg.once('ended', () => {
+          if (res.m3u8_urls.length > 1 && (res.m3u8_urls.length - 1 > this.video.index)) {
+            this.video.index++
+          }
+        })
       }).catch(err => {
         this.$m.error(err)
       })
diff --git a/src/components/Share.vue b/src/components/Share.vue
index aa33e30..4d019ff 100644
--- a/src/components/Share.vue
+++ b/src/components/Share.vue
@@ -103,12 +103,10 @@ export default {
   right: 20px;
   width: 540px;
   height: 360px;
-  background-color: #fff;
   border-radius: 2px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  border: 1px solid #cfcfcf;
   padding: 20px;
   z-index: 888;
   .left, .right{
@@ -128,7 +126,6 @@ export default {
   .right{
     .title{
       font-size: 18px;
-      color: #666;
       margin-bottom: 10px;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -140,7 +137,6 @@ export default {
     .tips{
       font-size: 14px;
       text-align: center;
-      color: #808695;
       img{
         width: 50px;
       }
@@ -158,7 +154,6 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    background-color: #fff;
     .loader {
       color: #823aa055;
       font-size: 8px;
diff --git a/src/locales/zh-cn.json b/src/locales/zh-cn.json
index ccda208..e0b2aa1 100644
--- a/src/locales/zh-cn.json
+++ b/src/locales/zh-cn.json
@@ -39,7 +39,7 @@
     "last_video": "这已经是最后一集了。",
     "qr_tips": "长按二维码，识别播放。",
     "zy_tips": "『ZY Player』技术支持，严禁传播违法资源。",
-    "share_tips": "已复制到剪贴板，快去分享吧~",
+    "share_tips": "已复制到剪贴板，快去分享吧~ 严禁传播违法资源!!!",
     "not_support_search": "这个网站不支持搜索。",
     "copy_success": "已复制，快去下载吧。",
     "async_failed": "同步成功, 未查询到更新。",