Merge branch 'master' into myblog

layout/_third-party/aplayer.ejs

@@ -10,6 +10,6 @@
     data-id="<%= aplayer_id != undefined ? aplayer_id : theme.music.id %>"
     data-volume="<%= aplayer_volume != undefined ? aplayer_volume : theme.music.volume %>">
   </div>
-  <script async src="https://cdn.jsdelivr.net/npm/aplayer@1.7.0/dist/APlayer.min.js"></script>
-  <script async src="https://cdn.jsdelivr.net/npm/meting@1.1.0/dist/Meting.min.js"></script>
+  <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>
 <% } %>

layout/_widget/music.ejs

@@ -3,6 +3,9 @@ var needDisplay = true;
 if (page.music && page.music.autoplay) {
   needDisplay = false;
 }
+if (page.widget && page.widget.music == false) {
+  needDisplay = false;
+}
 %>
 
 <% if (theme.services && theme.services.music == true && needDisplay == true) { %>

layout/archive.ejs

@@ -24,7 +24,7 @@
                 <% } else if (post.date) { %>
                   <%= date(post.date, config.date_format) %>
                 <% } %>
-                <% if((post.music && post.music.autoplay) || (post.video)){ %>
+                <% if(post.music || post.video){ %>
                   &nbsp;<i class="music fas fa-headphones-alt" aria-hidden="true"></i>
                 <% } %>
               </span>