From db613f23620b5649ccb8bd432c1283f9fc6777d1 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 20 May 2020 11:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9A=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=A6=96=E6=AC=A1=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                      | 12 ++----------
 src/components/SimpleUploader/globalUploader.vue |  6 ++----
 src/layout/index.vue                             | 10 +++++++++-
 src/views/public/articles/index.vue              |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7741b47..e59450b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,25 +1,17 @@
 <template>
   <div id="app">
     <router-view />
-    <!-- 全局音乐播放 -->
-    <audio-preview></audio-preview>
-    <!-- 将上传组件全局注册 -->
-    <global-uploader></global-uploader>
   </div>
 </template>
 
 <script>
 
-import AudioPreview from "@/components/preview/AudioPreview";
-import globalUploader from '@/components/SimpleUploader/globalUploader.vue'
 
 export default {
   name: 'App',
-  components: {
-    AudioPreview,globalUploader
-  },
+  components: {},
   watch: {
-    $route: function(to, from) {
+    $route: function(to) {
       const path = to.path
       if (path.indexOf('/login') < 0) {
         if (path === '/_m' && this.$pc) {
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 44788b0..42877d1 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -93,7 +93,7 @@
 
   export default {
     components: {},
-    data($this) {
+    data() {
       return {
         username: this.$store.state.user.name,
         options: {
@@ -127,7 +127,7 @@
               .replace(/\sseconds?/, '秒')
           },
           headers: {
-            'jmal-token': $this.$store.state.user.token
+            'jmal-token': this.$store.state.user.token
           },
           query() {}
         },
@@ -166,7 +166,6 @@
     },
     watch: {},
     mounted() {
-
       let that = this
       let dropbox = document.body
 
@@ -243,7 +242,6 @@
     },
     methods: {
       onDragenter(e) {
-        console.log('onDragenter',e)
         this.params = {
           currentDirectory: this.$route.query.path || '/',
           username: this.$store.state.user.name,
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 0221de3..827207d 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -8,6 +8,10 @@
       </div>
       <app-main />
     </div>
+     <!--全局音乐播放 -->
+    <audio-preview></audio-preview>
+    <!-- 将上传组件全局注册 -->
+    <global-uploader></global-uploader>
   </div>
 </template>
 
@@ -15,13 +19,17 @@
 import { Navbar, Sidebar, AppMain } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { getToken } from '@/utils/auth'
+import AudioPreview from "@/components/preview/AudioPreview";
+import globalUploader from '@/components/SimpleUploader/globalUploader.vue'
 
 export default {
   name: 'Layout',
   components: {
     Navbar,
     Sidebar,
-    AppMain
+    AppMain,
+    AudioPreview,
+    globalUploader
   },
   data() {
     return {
diff --git a/src/views/public/articles/index.vue b/src/views/public/articles/index.vue
index b89730c..490efe2 100644
--- a/src/views/public/articles/index.vue
+++ b/src/views/public/articles/index.vue
@@ -39,7 +39,7 @@
                     </h2>
                     <div class="new-meta-box">
                       <div class="new-meta-item author">
-                        <a href="http://blog.jmal.com" rel="nofollow">
+                        <a href="http://www.jmal.top" rel="nofollow">
                           <img :src="imageUrl+article.avatar" :data-original="imageUrl+article.avatar">
                           <p>{{article.username}}</p>
                         </a>
@@ -77,7 +77,7 @@
                 <a href="" class="social fas fa-rss flat-btn waves-effect waves-button" target="_blank" rel="external nofollow noopener noreferrer">
                   <svg-icon icon-class="widget-subscription"></svg-icon>
                 </a>
-                <a href="mailto:zhushilun163@084.com" class="social fas fa-envelope flat-btn waves-effect waves-button" target="_blank" rel="external nofollow noopener noreferrer">
+                <a href="mailto:zhushilun084@163.com" class="social fas fa-envelope flat-btn waves-effect waves-button" target="_blank" rel="external nofollow noopener noreferrer">
                   <svg-icon icon-class="widget-email"></svg-icon>
                 </a>
                 <a href="https://github.com/jamebal" class="social fab fa-github flat-btn waves-effect waves-button" target="_blank" rel="external nofollow noopener noreferrer">