From c5a9c9eb9b78b40c3647af3219c8296d58b99232 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Sat, 22 Dec 2018 16:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9F=B3=E4=B9=90=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _config.yml              |  8 +++++
 layout/_partial/head.ejs |  6 ++--
 layout/_partial/meta.ejs |  2 +-
 layout/_widget/music.ejs | 73 ++++++++++++++++++++++++++++++++--------
 4 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/_config.yml b/_config.yml
index b5c5450..c09f2ac 100755
--- a/_config.yml
+++ b/_config.yml
@@ -90,6 +90,14 @@ widgets:
   # 显示音乐播放器
   music:
     enable: true
+    display:           # 批量控制哪一类页面显示
+      home: false      # 在主页是否显示
+      tag: false       # 在标签页面是否显示
+      category: false  # 在分类页面是否显示
+      archive: false   # 在归档页面是否显示
+      page: false      # layout: page 的页面是否显示
+      links: true      # layout: links 的页面是否显示
+      post: true       # layout: post 的页面是否显示
     icon: fas fa-compact-disc
     title: "最近在听"
     link: 'https://music.163.com/#/user/home?id=63035382'
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index fc6093c..eb6f6ee 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -36,12 +36,10 @@
 
 
   <link href='//cdn.bootcss.com/node-waves/0.7.5/waves.min.css' rel='stylesheet'>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/meting@1.1.0/dist/Meting.min.js"></script>
+  
 
   <%- css('style.css') %>
-  <%- css('fontawesome-free-5.6.3-web/css/all.css') %>
+  <%- css('fontawesome-free-5.6.3-web/css/all.min.css') %>
   <% if (config.google_fonts){ %>
     <link href="https://fonts.googleapis.com/css?family=<%= config.import.google_fonts %>" rel="stylesheet">
   <% } %>
diff --git a/layout/_partial/meta.ejs b/layout/_partial/meta.ejs
index 2f3689c..e9924bb 100644
--- a/layout/_partial/meta.ejs
+++ b/layout/_partial/meta.ejs
@@ -4,7 +4,7 @@
   var isPostList = false;
 } %>
 <section class='meta'>
-  <% if((!isPostList && post.music) || (isPostList && post.music && post.music.enable == true)){ %>
+  <% if((!isPostList && post.music && post.music.enable) || (isPostList && post.music && post.music.enable == true)){ %>
     <div class="aplayer" data-mini=true
       data-mode="circulation" data-volume="0.7"
       data-server="<%= post.music.server %>"
diff --git a/layout/_widget/music.ejs b/layout/_widget/music.ejs
index 309f7be..fefa0a6 100755
--- a/layout/_widget/music.ejs
+++ b/layout/_widget/music.ejs
@@ -1,14 +1,59 @@
-<section class='m_widget' id='music'>
-  <header class='header <%= theme.style %>'>
-    <div><i class="<%= theme.widgets.music.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.music.title %></div>
-    <a class="rightBtn" target="_blank" rel="external nofollow noopener noreferrer" href="<%= theme.widgets.music.link %>"><i class="far fa-heart fa-fw"></i></a>
-  </header>
-  <div class='content <%= theme.style %>'>
-    <div class="aplayer" data-theme="<%= theme.widgets.music.color %>"
-      data-mode="<%= theme.widgets.music.mode %>"
-      data-server="<%= theme.widgets.music.server %>"
-      data-type="<%= theme.widgets.music.type %>"
-      data-id="<%= theme.widgets.music.id %>"
-      data-volume="<%= theme.widgets.music.volume %>"></div>
-  </div>
-</section>
+<%
+var needDisplay = false;
+if (theme.widgets.music && theme.widgets.music.display) {
+  let display = theme.widgets.music.display;
+  if (page.layout == 'page') {
+    if (display.page != false) {
+      needDisplay = true;
+    }
+  } else if (page.layout == 'post') {
+    if (display.post != false && (!page.music || page.music.enable == false)) {
+      needDisplay = true;
+    }
+  } else if (page.layout == 'links') {
+    if (display.links != false) {
+      needDisplay = true;
+    }
+  } else {
+    if (is_home()) {
+      if (display.home != false) {
+        needDisplay = true;
+      }
+    } else if (is_tag()) {
+      if (display.tag != false) {
+        needDisplay = true;
+      }
+    } else if (is_category()) {
+      if (display.category != false) {
+        needDisplay = true;
+      }
+    } else if (is_archive()) {
+      if (display.archive != false) {
+        needDisplay = true;
+      }
+    } else {
+      needDisplay = true;
+    }
+  }
+}
+%>
+
+<% if (needDisplay == true) { %>
+  <section class='m_widget' id='music'>
+    <header class='header <%= theme.style %>'>
+      <div><i class="<%= theme.widgets.music.icon %> fa-fw" aria-hidden="true"></i>&nbsp;&nbsp;<%= theme.widgets.music.title %></div>
+      <a class="rightBtn" target="_blank" rel="external nofollow noopener noreferrer" href="<%= theme.widgets.music.link %>"><i class="far fa-heart fa-fw"></i></a>
+    </header>
+    <div class='content <%= theme.style %>'>
+      <div class="aplayer" data-theme="<%= theme.widgets.music.color %>"
+        data-mode="<%= theme.widgets.music.mode %>"
+        data-server="<%= theme.widgets.music.server %>"
+        data-type="<%= theme.widgets.music.type %>"
+        data-id="<%= theme.widgets.music.id %>"
+        data-volume="<%= theme.widgets.music.volume %>"></div>
+    </div>
+  </section>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.css">
+  <script src="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/meting@1.1.0/dist/Meting.min.js"></script>
+<% } %>