diff --git a/package.json b/package.json
index 29d834d..a6a103c 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "vue-runtime-helpers": "^1.1.2",
     "vue-simple-uploader": "^0.7.4",
     "vue-video-player": "^5.0.2",
-    "vue-wechat-title": "^2.0.5",
     "vuedraggable": "^2.23.2",
     "vuex": "^3.1.0",
     "websocket": "^1.0.34"
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index b3b3336..fa94bf6 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="global-uploader" v-wechat-title="process === -10 || process===100 || this.fileListLength === 0 ? $route.meta.title : process+'%'+' | '+$route.meta.title" >
+  <div id="global-uploader">
     <!-- 上传 -->
     <uploader
       ref="uploader"
@@ -45,7 +45,8 @@
             <li v-for="file in props.fileList" :key="file.id">
               <uploader-file ref="files" :class="'file_' + file.id" :file="file" :list="true"></uploader-file>
             </li>
-            <div v-if="!props.fileList.length" class="no-file"><i class="iconfont icon-empty-file"></i> 暂无待上传文件</div>
+            <div v-if="!props.fileList.length" class="no-file"><i class="iconfont icon-empty-file"></i> 暂无待上传文件
+            </div>
           </ul>
         </div>
       </uploader-list>
@@ -53,13 +54,13 @@
     </uploader>
 
     <div class="process-area" id="drag-ball" @click="expand" :style="processAreaClass">
-      <div class="process-anime" >
+      <div class="process-anime">
         <div class="cube-a" :style="{'top': -process-65+'%'}"></div>
         <div class="cube-b" :style="{'top': -process-65+'%'}"></div>
 
         <div v-if="process < 100" class="process-info">
-          <div class="process">{{process}}%</div>
-          <div v-if="isUploading" class="net-speed">{{netSpeed}}</div>
+          <div class="process">{{ process }}%</div>
+          <div v-if="isUploading" class="net-speed">{{ netSpeed }}</div>
         </div>
 
         <div v-if="process >= 100" class="done">
@@ -77,852 +78,883 @@
 </template>
 
 <script>
-  /**
-   *   全局上传插件
-   *   调用方法：Bus.$emit('openUploader', {}) 打开文件选择框，参数为需要传递的额外参数
-   *   监听函数：Bus.$on('fileAdded', fn); 文件选择后的回调
-   *            Bus.$on('fileSuccess', fn); 文件上传成功的回调
-   */
+/**
+ *   全局上传插件
+ *   调用方法：Bus.$emit('openUploader', {}) 打开文件选择框，参数为需要传递的额外参数
+ *   监听函数：Bus.$on('fileAdded', fn); 文件选择后的回调
+ *            Bus.$on('fileSuccess', fn); 文件上传成功的回调
+ */
 
-  // import { ACCEPT_CONFIG } from '@/assets/js/config'
-  import Bus from '@/assets/js/bus'
-  import $ from 'jquery'
-  import SparkMD5 from 'spark-md5'
-  import api from '@/api/file-api'
-  import { formatNetSpeed } from '@/utils/number'
+// import { ACCEPT_CONFIG } from '@/assets/js/config'
+import Bus from '@/assets/js/bus'
+import $ from 'jquery'
+import SparkMD5 from 'spark-md5'
+import api from '@/api/file-api'
+import {formatNetSpeed} from '@/utils/number'
 
-  export default {
-    components: {},
-    data() {
-      return {
+export default {
+  components: {},
+  data() {
+    return {
+      username: this.$store.state.user.name,
+      options: {
+        target: api.simpleUploadURL,
+        chunkSize: 1 * 1024 * 1024,
+        // speedSmoothingFactor: 0.1,
+        // progressCallbacksInterval: 500,
+        maxChunkRetries: 5, // 最大重试次数
+        simultaneousUploads: 10, // 并发上传数
+        testChunks: true, // 是否开启服务器分片校验
+        // 服务器分片校验函数，秒传及断点续传基础
+        checkChunkUploadedByResponse: function (chunk, message) {
+          const objMessage = JSON.parse(message)
+          const res = objMessage.data
+          if (!res) {
+            return []
+          }
+          if (res.pass) {
+            // 秒传
+            return true
+          }
+          // 断点续传
+          return (res.resume || []).indexOf(chunk.offset + 1) >= 0
+        },
+        parseTimeRemaining: function (timeRemaining, parsedTimeRemaining) {
+          return parsedTimeRemaining
+            .replace(/\syears?/, '年')
+            .replace(/\days?/, '天')
+            .replace(/\shours?/, '小时')
+            .replace(/\sminutes?/, '分钟')
+            .replace(/\sseconds?/, '秒')
+        },
+        headers: {
+          'jmal-token': this.$store.state.user.token
+        },
+        query() {
+        }
+      },
+      attrs: {
+        accept: '*'
+      },
+      statusText: {
+        success: '上传成功',
+        error: '上传失败',
+        uploading: '上传中',
+        paused: '暂停中',
+        waiting: '等待中'
+      },
+      fileListLength: 0,
+      panelShow: false, // 选择文件后，展示上传panel
+      collapse: false,
+      isShrink: true,
+      process: -10,
+      pageTitle: this.$route.meta.title,
+      netSpeed: 0,
+      isUploading: false,
+      filePanel: {},
+      processAreaClass: {},
+      pc: true,
+      dragover: false,
+      isDragStart: false,
+      fileListScrollTop: 0,
+      dragoverLoop: null,
+      successMsg: null,
+      enableDragUplaod: false,// 是否启用拖拽上传
+    }
+  },
+  computed: {
+    // Uploader实例
+    uploader() {
+      return this.$refs.uploader.uploader
+    }
+  },
+  watch: {
+    $route(route) {
+      // 只有首页才启用拖拽上传
+      this.enableDragUplaod = route.path === '/'
+    }
+  },
+  mounted() {
+    this.enableDragUplaod = this.$route.path === '/'
+    let that = this
+    let dropbox = document.body
+
+    document.body.ondragstart = function (e) {
+      if (that.enableDragUplaod) {
+        if (e.target.slot === 'jmal') {
+          that.isDragStart = true
+        }
+        return e.target.slot === 'jmal' && that.fileListScrollTop === 0
+      }
+      return true
+    }
+
+    dropbox.addEventListener("dragenter", function (e) {
+      e.stopPropagation();
+      e.preventDefault();
+    }, false);
+
+    dropbox.addEventListener("dragover", function (e) {
+      e.stopPropagation();
+      e.preventDefault();
+      clearInterval(that.dragoverLoop)
+      if (!that.isDragStart) {
+        that.dragover = true
+      }
+      that.dragoverLoop = setTimeout(function () {
+        that.dragover = false
+      }, 100)
+    }, false);
+
+    dropbox.addEventListener("ondragleave", function (e) {
+      e.stopPropagation();
+      e.preventDefault();
+      that.dragover = false
+    }, false);
+
+    dropbox.addEventListener("drop", function (e) {
+      e.stopPropagation();
+      e.preventDefault();
+      that.dragover = false
+    }, false);
+
+    Bus.$on('fileListScrollTop', fileListScrollTop => {
+      this.fileListScrollTop = fileListScrollTop
+    })
+
+    Bus.$on('onDragStart', isDragStart => {
+      this.isDragStart = isDragStart
+    })
+
+    Bus.$on('openUploader', query => {
+      this.params = query || {}
+      if (this.$refs.uploadBtn) {
+        $('#global-uploader-btn').click()
+      }
+    })
+    Bus.$on('uploadFolder', query => {
+      this.params = query || {}
+      if (this.$refs.folderBtn) {
+        $('#folder-uploader-btn').click()
+      }
+    })
+
+    Bus.$on('uploadFileListBack', () => {
+      if (this.process !== -10 && this.process !== 100 && this.fileListLength !== 0) {
+        this.shrink()
+      }
+    })
+
+    this.$nextTick(() => {
+      window.uploader = this.$refs.uploader.uploader
+    })
+
+  },
+  destroyed() {
+    Bus.$off('openUploader')
+    Bus.$off('uploadFolder')
+    Bus.$off('uploadFileListBack')
+  },
+  methods: {
+    onDragenter(e) {
+      this.params = {
+        currentDirectory: this.$route.query.path || '/',
         username: this.$store.state.user.name,
-        options: {
-          target: api.simpleUploadURL,
-          chunkSize: 1 * 1024 * 1024,
-          // speedSmoothingFactor: 0.1,
-          // progressCallbacksInterval: 500,
-          maxChunkRetries: 5, // 最大重试次数
-          simultaneousUploads: 10, // 并发上传数
-          testChunks: true, // 是否开启服务器分片校验
-          // 服务器分片校验函数，秒传及断点续传基础
-          checkChunkUploadedByResponse: function(chunk, message) {
-            const objMessage = JSON.parse(message)
-            const res = objMessage.data
-            if(!res){
-              return []
-            }
-            if (res.pass) {
-              // 秒传
-              return true
-            }
-            // 断点续传
-            return (res.resume || []).indexOf(chunk.offset + 1) >= 0
-          },
-          parseTimeRemaining: function (timeRemaining, parsedTimeRemaining) {
-            return parsedTimeRemaining
-              .replace(/\syears?/, '年')
-              .replace(/\days?/, '天')
-              .replace(/\shours?/, '小时')
-              .replace(/\sminutes?/, '分钟')
-              .replace(/\sseconds?/, '秒')
-          },
-          headers: {
-            'jmal-token': this.$store.state.user.token
-          },
-          query() {}
-        },
-        attrs: {
-          accept: '*'
-        },
-        statusText: {
-          success: '上传成功',
-          error: '上传失败',
-          uploading: '上传中',
-          paused: '暂停中',
-          waiting: '等待中'
-        },
-        fileListLength: 0,
-        panelShow: false, // 选择文件后，展示上传panel
-        collapse: false,
-        isShrink: true,
-        process: -10,
-        pageTitle: this.$route.meta.title,
-        netSpeed: 0,
-        isUploading: false,
-        filePanel: {},
-        processAreaClass: {},
-        pc: true,
-        dragover: false,
-        isDragStart: false,
-        fileListScrollTop: 0,
-        dragoverLoop: null,
-        successMsg: null,
-        enableDragUplaod: false,// 是否启用拖拽上传
+        userId: this.$store.state.user.userId
       }
     },
-    computed: {
-      // Uploader实例
-      uploader() {
-        return this.$refs.uploader.uploader
+    onFilesAdded(files) {
+      if (files.length === 0) {
+        return
       }
-    },
-    watch: {
-      $route(route) {
-        // 只有首页才启用拖拽上传
-        this.enableDragUplaod = route.path === '/'
-      }
-    },
-    mounted() {
-      this.enableDragUplaod = this.$route.path === '/'
-      let that = this
-      let dropbox = document.body
-
-      document.body.ondragstart = function(e){
-        if(that.enableDragUplaod) {
-          if(e.target.slot === 'jmal') {
-            that.isDragStart = true
-          }
-          return e.target.slot === 'jmal' && that.fileListScrollTop === 0
-        }
-        return true
-      }
-
-      dropbox.addEventListener("dragenter", function(e){
-        e.stopPropagation();
-        e.preventDefault();
-      }, false);
-
-      dropbox.addEventListener("dragover", function(e){
-        e.stopPropagation();
-        e.preventDefault();
-        clearInterval(that.dragoverLoop)
-        if(!that.isDragStart){
-          that.dragover = true
-        }
-        that.dragoverLoop = setTimeout(function () {
-          that.dragover = false
-        },100)
-      }, false);
-
-      dropbox.addEventListener("ondragleave", function(e){
-        e.stopPropagation();
-        e.preventDefault();
-        that.dragover = false
-      }, false);
-
-      dropbox.addEventListener("drop", function(e){
-        e.stopPropagation();
-        e.preventDefault();
-        that.dragover = false
-      }, false);
-
-      Bus.$on('fileListScrollTop', fileListScrollTop => {
-        this.fileListScrollTop = fileListScrollTop
-      })
-
-      Bus.$on('onDragStart', isDragStart => {
-        this.isDragStart = isDragStart
-      })
-
-      Bus.$on('openUploader', query => {
-        this.params = query || {}
-        if (this.$refs.uploadBtn) {
-          $('#global-uploader-btn').click()
-        }
-      })
-      Bus.$on('uploadFolder', query => {
-        this.params = query || {}
-        if (this.$refs.folderBtn) {
-          $('#folder-uploader-btn').click()
-        }
-      })
-
-      Bus.$on('uploadFileListBack',() => {
-        if(this.process !== -10 && this.process !== 100 && this.fileListLength !== 0){
-          this.shrink()
-        }
-      })
-
-      this.$nextTick(() => {
-        window.uploader = this.$refs.uploader.uploader
-      })
-
-    },
-    destroyed() {
-      Bus.$off('openUploader')
-      Bus.$off('uploadFolder')
-      Bus.$off('uploadFileListBack')
-    },
-    methods: {
-      onDragenter(e) {
-        this.params = {
-          currentDirectory: this.$route.query.path || '/',
-          username: this.$store.state.user.name,
-          userId: this.$store.state.user.userId
-        }
-      },
-      onFilesAdded(files) {
-        if(files.length === 0){
-          return
-        }
-        this.fileListLength = this.uploader.fileList.length
-        const filePaths = this.uploader.filePaths
-        const paths = Object.keys(filePaths)
-        const pathsLength = paths.length
-        if (pathsLength > 0) {
-          paths.forEach(path => {
-            const folder = filePaths[path]
-            // 上传文件夹
-            api.uploadFolder({
-              isFolder: true,
-              folderPath: encodeURI(folder.parent.path),
-              filename: encodeURI(folder.name),
-              currentDirectory: encodeURI(this.params.currentDirectory),
-              username: this.params.username,
-              userId: this.params.userId
-            }).then(() => {
-              this.getFileList()
-            }).catch(e => {})
-          })
-        }
-        if(window.pc){
-          this.pc = true
-          this.panelShow = true
-        }else{
-          this.pc = false
-          this.shrink()
-        }
-        files.forEach(file => {
-          // 上传文件
-          Object.assign(this.uploader.opts, {
-            query: {
-              isFolder: false,
-              ...this.params
-            }
-          })
-          Bus.$emit('fileAdded')
-        })
-      },
-      onFileProgress(rootFile, file, chunk) {
-        // const fileList = window.uploader.fileList
-        // fileList.forEach(file => {
-        //   file.currentSpeed
-        // })
-        this.netSpeed = formatNetSpeed(file.currentSpeed)
-        this.process = Math.trunc(window.uploader.progress() * 100)
-        if(this.process > 0 && this.process < 100 && window.uploader.fileList.length > 0){
-          window.onbeforeunload = function() {
-            return "还有文件正在上传, 确定退出吗?";
-          }
-        }else{
-          window.onbeforeunload = null
-        }
-        this.isUploading = window.uploader.isUploading()
-        // console.log(`上传中 ${file.name}，chunk：${chunk.startByte / 1024 / 1024} ~ ${chunk.endByte / 1024 / 1024}`)
-      },
-      onFileSuccess(rootFile, file, response) {
-        const res = JSON.parse(response)
-        if(!res.data){
-          this.$message({
-            message: res.message,
-            type: 'error'
-          })
-          this.uploader.cancel()
-          this.close()
-          return;
-        }
-        const data = res.data
-        // 服务器自定义的错误（即虽返回200，但是是错误的情况），这种错误是Uploader无法拦截的
-        if (!data.upload) {
-          // this.$message({ message: res.message, type: 'error' })
-          // 文件状态设为“失败”
-          this.statusSet(file.id, 'failed')
-          return
-        } else {
-          // console.log(`上传成功 ${file.name}`)
-          this.statusSet(file.id, 'success')
-        }
-        // 如果服务端返回需要合并
-        if (data.merge) {
-          // 文件状态设为“合并中”
-          this.statusSet(file.id, 'merging')
-          api.mergeSimpleUpload({
-            filename: encodeURI(file.name),
-            relativePath: encodeURI(file.relativePath),
-            identifier: file.uniqueIdentifier,
+      this.fileListLength = this.uploader.fileList.length
+      const filePaths = this.uploader.filePaths
+      const paths = Object.keys(filePaths)
+      const pathsLength = paths.length
+      if (pathsLength > 0) {
+        paths.forEach(path => {
+          const folder = filePaths[path]
+          // 上传文件夹
+          api.uploadFolder({
+            isFolder: true,
+            folderPath: encodeURI(folder.parent.path),
+            filename: encodeURI(folder.name),
             currentDirectory: encodeURI(this.params.currentDirectory),
             username: this.params.username,
-            userId: this.params.userId,
-            totalSize: file.size,
-            isFolder: file.isFolder
+            userId: this.params.userId
           }).then(() => {
-            // console.log('文件合并成功', res)
-            // 文件合并成功
-            Bus.$emit('fileSuccess')
-            this.statusRemove(file.id)
-            this.statusSet(file.id, 'success')
-            // file.removeFile(file)
-            this.showSuccessMsg()
-          }).catch(e => {})
-          // 不需要合并
-        } else {
-          Bus.$emit('fileSuccess')
-          // 完成后从文件列表移除
-          // file.removeFile(file)
-          // console.log('上传成功')
-          this.showSuccessMsg()
-        }
-        if (file.parent == null) {
-          this.close()
-        }
-      },
-      showSuccessMsg() {
-        if(this.successMsg === null){
-          this.successMsg = this.$message({
-            message: '文件上传成功',
-            type: 'success',
-            onClose: ()=>{
-              this.successMsg = null
-            }
-          });
-        }else{
-
-        }
-        if(this.process === -10 || this.process === 100 || this.fileListLength === 0){
-          this.uploader.cancel()
-          this.panelShow = false
-        }
-      },
-      onFileError(rootFile, file, response) {
-        this.$message({
-          message: response,
-          type: 'error'
+            this.getFileList()
+          }).catch(e => {
+          })
         })
-      },
-      onFileRemoved() {
-        this.fileListLength = this.uploader.fileList.length
-      },
-      /**
-       * 计算md5，实现断点续传及秒传
-       * @param file
-       */
-      computeMD5(file) {
-        const fileReader = new FileReader()
-        // const time = new Date().getTime()
-        const blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice
-        let currentChunk = 0
-        const chunkSize = 10 * 1024 * 1024
-        const chunks = Math.ceil(file.size / chunkSize)
-        const spark = new SparkMD5.ArrayBuffer()
-
-        // 文件状态设为"计算MD5"
-        this.statusSet(file.id, 'md5')
-        file.pause()
-
-        loadNext()
-
-        fileReader.onload = e => {
-          spark.append(e.target.result)
-
-          if (currentChunk < chunks) {
-            currentChunk++
-            loadNext()
-
-            // 实时展示MD5的计算进度
-            this.$nextTick(() => {
-              $(`.myStatus_${file.id}`).text('校验MD5 ' + ((currentChunk / chunks) * 100).toFixed(0) + '%')
-            })
-          } else {
-            const md5 = spark.end()
-            this.computeMD5Success(md5, file)
-            // console.log(`MD5计算完毕：${file.name} \nMD5：${md5} \n分片：${chunks} 大小:${file.size} 用时：${new Date().getTime() - time} ms`)
-          }
-        }
-
-        fileReader.onerror = function() {
-          this.error(`文件${file.name}读取出错，请检查该文件`)
-          file.cancel()
-        }
-
-        function loadNext() {
-          const start = currentChunk * chunkSize
-          const end = ((start + chunkSize) >= file.size) ? file.size : start + chunkSize
-
-          fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end))
-        }
-      },
-
-      computeMD5Success(md5, file) {
-        // 将自定义参数直接加载uploader实例的opts上
-        // const fileName = file.name
-        // const suffix = fileName.substring(fileName.lastIndexOf('.'), fileName.length)// 后缀名
+      }
+      if (window.pc) {
+        this.pc = true
+        this.panelShow = true
+      } else {
+        this.pc = false
+        this.shrink()
+      }
+      files.forEach(file => {
+        // 上传文件
         Object.assign(this.uploader.opts, {
           query: {
             isFolder: false,
             ...this.params
           }
         })
-        file.uniqueIdentifier = md5
-        file.resume()
-        this.statusRemove(file.id)
-      },
+        Bus.$emit('fileAdded')
+      })
+    },
+    onFileProgress(rootFile, file, chunk) {
+      // const fileList = window.uploader.fileList
+      // fileList.forEach(file => {
+      //   file.currentSpeed
+      // })
+      this.netSpeed = formatNetSpeed(file.currentSpeed)
+      this.process = Math.trunc(window.uploader.progress() * 100)
+      if (this.process === -10 || this.process === 100 || this.fileListLength === 0) {
+        document.title = `${this.$route.meta.title}`
+      } else {
+        document.title = `${this.process}% | ${this.$route.meta.title}`
+      }
+      if (this.process > 0 && this.process < 100 && window.uploader.fileList.length > 0) {
+        window.onbeforeunload = function () {
+          return "还有文件正在上传, 确定退出吗?";
+        }
+      } else {
+        window.onbeforeunload = null
+      }
+      this.isUploading = window.uploader.isUploading()
+      // console.log(`上传中 ${file.name}，chunk：${chunk.startByte / 1024 / 1024} ~ ${chunk.endByte / 1024 / 1024}`)
+    },
+    onFileSuccess(rootFile, file, response) {
+      const res = JSON.parse(response)
+      if (!res.data) {
+        this.$message({
+          message: res.message,
+          type: 'error'
+        })
+        this.uploader.cancel()
+        this.close()
+        return;
+      }
+      const data = res.data
+      // 服务器自定义的错误（即虽返回200，但是是错误的情况），这种错误是Uploader无法拦截的
+      if (!data.upload) {
+        // this.$message({ message: res.message, type: 'error' })
+        // 文件状态设为“失败”
+        this.statusSet(file.id, 'failed')
+        return
+      } else {
+        // console.log(`上传成功 ${file.name}`)
+        this.statusSet(file.id, 'success')
+      }
+      // 如果服务端返回需要合并
+      if (data.merge) {
+        // 文件状态设为“合并中”
+        this.statusSet(file.id, 'merging')
+        api.mergeSimpleUpload({
+          filename: encodeURI(file.name),
+          relativePath: encodeURI(file.relativePath),
+          identifier: file.uniqueIdentifier,
+          currentDirectory: encodeURI(this.params.currentDirectory),
+          username: this.params.username,
+          userId: this.params.userId,
+          totalSize: file.size,
+          isFolder: file.isFolder
+        }).then(() => {
+          // console.log('文件合并成功', res)
+          // 文件合并成功
+          Bus.$emit('fileSuccess')
+          this.statusRemove(file.id)
+          this.statusSet(file.id, 'success')
+          // file.removeFile(file)
+          this.showSuccessMsg()
+        }).catch(e => {
+        })
+        // 不需要合并
+      } else {
+        Bus.$emit('fileSuccess')
+        // 完成后从文件列表移除
+        // file.removeFile(file)
+        // console.log('上传成功')
+        this.showSuccessMsg()
+      }
+      if (file.parent == null) {
+        this.close()
+      }
+    },
+    showSuccessMsg() {
+      if (this.successMsg === null) {
+        this.successMsg = this.$message({
+          message: '文件上传成功',
+          type: 'success',
+          onClose: () => {
+            this.successMsg = null
+          }
+        });
+      } else {
 
-      fileListShow() {
-        const $list = $('#global-uploader .file-list')
+      }
+      if (this.process === -10 || this.process === 100 || this.fileListLength === 0) {
+        this.uploader.cancel()
+        this.panelShow = false
+      }
+    },
+    onFileError(rootFile, file, response) {
+      this.$message({
+        message: response,
+        type: 'error'
+      })
+    },
+    onFileRemoved() {
+      this.fileListLength = this.uploader.fileList.length
+    },
+    /**
+     * 计算md5，实现断点续传及秒传
+     * @param file
+     */
+    computeMD5(file) {
+      const fileReader = new FileReader()
+      // const time = new Date().getTime()
+      const blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice
+      let currentChunk = 0
+      const chunkSize = 10 * 1024 * 1024
+      const chunks = Math.ceil(file.size / chunkSize)
+      const spark = new SparkMD5.ArrayBuffer()
 
-        if ($list.is(':visible')) {
-          $list.slideUp()
-          this.collapse = true
+      // 文件状态设为"计算MD5"
+      this.statusSet(file.id, 'md5')
+      file.pause()
+
+      loadNext()
+
+      fileReader.onload = e => {
+        spark.append(e.target.result)
+
+        if (currentChunk < chunks) {
+          currentChunk++
+          loadNext()
+
+          // 实时展示MD5的计算进度
+          this.$nextTick(() => {
+            $(`.myStatus_${file.id}`).text('校验MD5 ' + ((currentChunk / chunks) * 100).toFixed(0) + '%')
+          })
         } else {
-          $list.slideDown()
-          this.collapse = false
+          const md5 = spark.end()
+          this.computeMD5Success(md5, file)
+          // console.log(`MD5计算完毕：${file.name} \nMD5：${md5} \n分片：${chunks} 大小:${file.size} 用时：${new Date().getTime() - time} ms`)
         }
-      },
-      // 展开球
-      expand() {
-        if(!pc){
-          this.$router.push(`/upload/index_m`)
+      }
+
+      fileReader.onerror = function () {
+        this.error(`文件${file.name}读取出错，请检查该文件`)
+        file.cancel()
+      }
+
+      function loadNext() {
+        const start = currentChunk * chunkSize
+        const end = ((start + chunkSize) >= file.size) ? file.size : start + chunkSize
+
+        fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end))
+      }
+    },
+
+    computeMD5Success(md5, file) {
+      // 将自定义参数直接加载uploader实例的opts上
+      // const fileName = file.name
+      // const suffix = fileName.substring(fileName.lastIndexOf('.'), fileName.length)// 后缀名
+      Object.assign(this.uploader.opts, {
+        query: {
+          isFolder: false,
+          ...this.params
         }
-        this.filePanel = {
-          'width': '720px',
-          'height': '300px',
+      })
+      file.uniqueIdentifier = md5
+      file.resume()
+      this.statusRemove(file.id)
+    },
+
+    fileListShow() {
+      const $list = $('#global-uploader .file-list')
+
+      if ($list.is(':visible')) {
+        $list.slideUp()
+        this.collapse = true
+      } else {
+        $list.slideDown()
+        this.collapse = false
+      }
+    },
+    // 展开球
+    expand() {
+      if (!pc) {
+        this.$router.push(`/upload/index_m`)
+      }
+      this.filePanel = {
+        'width': '720px',
+        'height': '300px',
+      }
+      this.processAreaClass = {
+        'right': '66px',
+        'bottom': '66px',
+        'width': '0',
+        'height': '0',
+      }
+      this.isShrink = false
+    },
+    // 收缩成球
+    shrink() {
+      let width = '92px';
+      let height = '92px';
+      let right = '20px';
+      let bottom = '20px';
+      if (!pc) {
+        width = '92px';
+        height = '92px';
+        right = '10px';
+        bottom = '70px';
+      }
+      const that = this
+      this.filePanel = {
+        'color': 'white',
+        'z-index': '-1',
+        'right': '20px',
+        'bottom': '20px',
+        'width': '92px',
+        'height': '92px',
+        cursor: 'pointer',
+        'border-radius': '50%',
+      }
+      setTimeout(function () {
+        that.isShrink = true
+        that.processAreaClass = {
+          'right': right,
+          'bottom': bottom,
+          'width': width,
+          'height': height,
         }
-        this.processAreaClass = {
-          'right': '66px',
-          'bottom': '66px',
-          'width': '0',
-          'height': '0',
-        }
-        this.isShrink = false
-      },
-      // 收缩成球
-      shrink(){
-        let width = '92px';
-        let height = '92px';
-        let right = '20px';
-        let bottom = '20px';
-        if(!pc){
-          width = '92px';
-          height = '92px';
-          right = '10px';
-          bottom = '70px';
-        }
-        const that = this
-        this.filePanel = {
+        that.filePanel = {
           'color': 'white',
           'z-index': '-1',
-          'right': '20px',
-          'bottom': '20px',
-          'width': '92px',
-          'height': '92px',
+          'right': '66px',
+          'bottom': '66px',
+          'width': '0px',
+          'height': '0px',
           cursor: 'pointer',
           'border-radius': '50%',
         }
-        setTimeout(function () {
-          that.isShrink = true
-          that.processAreaClass = {
-            'right': right,
-            'bottom': bottom,
-            'width': width,
-            'height': height,
-          }
-          that.filePanel = {
-            'color': 'white',
-            'z-index': '-1',
-            'right': '66px',
-            'bottom': '66px',
-            'width': '0px',
-            'height': '0px',
-            cursor: 'pointer',
-            'border-radius': '50%',
-          }
-        },500)
-      },
-      close() {
-        if(this.process === -10 || this.process === 100 || this.fileListLength === 0){
+      }, 500)
+    },
+    close() {
+      if (this.process === -10 || this.process === 100 || this.fileListLength === 0) {
+        this.uploader.cancel()
+        this.panelShow = false
+      } else {
+        this.$confirm('还有文件正在上传, 确定要关闭吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           this.uploader.cancel()
           this.panelShow = false
-        } else {
-          this.$confirm('还有文件正在上传, 确定要关闭吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.uploader.cancel()
-            this.panelShow = false
-          })
-        }
-      },
-
-      /**
-       * 新增的自定义的状态: 'md5'、'transcoding'、'failed'
-       * @param id
-       * @param status
-       */
-      statusSet(id, status) {
-        const statusMap = {
-          md5: {
-            text: '校验MD5',
-            bgc: '#fff'
-          },
-          merging: {
-            text: '合并中',
-            bgc: '#e2eeff'
-          },
-          transcoding: {
-            text: '转码中',
-            bgc: '#e2eeff'
-          },
-          failed: {
-            text: '上传失败',
-            bgc: '#e2eeff'
-          },
-          success: {
-            text: '上传成功',
-            bgc: '#e2eeff'
-          }
-        }
-
-        this.$nextTick(() => {
-          $(`<p class="myStatus_${id}"></p>`).appendTo(`.file_${id} .uploader-file-status`).css({
-            'position': 'absolute',
-            'font-size': '13px',
-            'left': '0',
-            'right': '0',
-            'bottom': '0',
-            'zIndex': '1',
-            'marginBottom': '0',
-            'backgroundColor': statusMap[status].bgc
-          }).text(statusMap[status].text)
-        })
-      },
-      statusRemove(id) {
-        this.$nextTick(() => {
-          $(`.myStatus_${id}`).remove()
-        })
-      },
-
-      error(msg) {
-        this.$notify({
-          title: '错误',
-          message: msg,
-          type: 'error',
-          duration: 2000
         })
       }
+    },
+
+    /**
+     * 新增的自定义的状态: 'md5'、'transcoding'、'failed'
+     * @param id
+     * @param status
+     */
+    statusSet(id, status) {
+      const statusMap = {
+        md5: {
+          text: '校验MD5',
+          bgc: '#fff'
+        },
+        merging: {
+          text: '合并中',
+          bgc: '#e2eeff'
+        },
+        transcoding: {
+          text: '转码中',
+          bgc: '#e2eeff'
+        },
+        failed: {
+          text: '上传失败',
+          bgc: '#e2eeff'
+        },
+        success: {
+          text: '上传成功',
+          bgc: '#e2eeff'
+        }
+      }
+
+      this.$nextTick(() => {
+        $(`<p class="myStatus_${id}"></p>`).appendTo(`.file_${id} .uploader-file-status`).css({
+          'position': 'absolute',
+          'font-size': '13px',
+          'left': '0',
+          'right': '0',
+          'bottom': '0',
+          'zIndex': '1',
+          'marginBottom': '0',
+          'backgroundColor': statusMap[status].bgc
+        }).text(statusMap[status].text)
+      })
+    },
+    statusRemove(id) {
+      this.$nextTick(() => {
+        $(`.myStatus_${id}`).remove()
+      })
+    },
+
+    error(msg) {
+      this.$notify({
+        title: '错误',
+        message: msg,
+        type: 'error',
+        duration: 2000
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  #global-uploader {
+#global-uploader {
+  position: fixed;
+  z-index: 1002;
+  right: 15px;
+  bottom: 15px;
+
+  .uploader-drop {
+    text-align: center;
     position: fixed;
-    z-index: 1002;
-    right: 15px;
-    bottom: 15px;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #ffffff99;
 
-    .uploader-drop {
-      text-align: center;
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background-color: #ffffff99;
-      span {
-        font-size: 34px;
-        font-weight: 700;
-        color: #616161;
-        position: relative;
-        top: 48%;
+    span {
+      font-size: 34px;
+      font-weight: 700;
+      color: #616161;
+      position: relative;
+      top: 48%;
+    }
+  }
+
+  .uploader-app {
+    width: 720px;
+  }
+
+  .file-panel {
+    background-color: #fff;
+    border: 1px solid #e2e2e2;
+    box-shadow: 0 0 10px rgba(0, 0, 0, .2);
+
+    right: 2%;
+    bottom: 2%;
+    width: 720px;
+    height: 300px;
+    color: black;
+    margin: auto;
+    overflow: hidden;
+    background-size: 100% 100%;
+    border-radius: 7px 7px 0 0;
+    position: fixed;
+    -webkit-transition: all .5s ease-in-out 0s;
+    transition: all .5s ease-in-out 0s;
+
+    ul {
+      white-space: nowrap;
+      -webkit-overflow-scrolling: touch;
+      overflow-x: auto;
+      overflow-y: hidden;
+      padding: 0 0.1rem;
+      margin-bottom: -.2rem;
+      overflow: -moz-scrollbars-none;
+      overflow: -moz-scrollbars-none;
+    }
+
+    ul::-webkit-scrollbar {
+      display: none;
+    }
+
+    .file-title {
+      display: flex;
+      height: 3.5rem;
+      // line-height: 3.5rem;
+      padding: 0 10px;
+      border-bottom: 1px solid #ddd;
+
+      .files-title {
+        margin-left: 3%;
+        font-size: 20px;
+        line-height: 3.5rem;
+      }
+
+      .operate {
+        flex: 1;
+        text-align: right;
+
+        .button-collapse {
+          padding: 16px 5px;
+          font-size: 25px;
+          margin-left: 0;
+        }
       }
     }
 
-    .uploader-app {
-      width: 720px;
-    }
-
-    .file-panel {
+    .file-list {
+      position: relative;
+      max-height: 300px;
+      /*height: 49px;*/
+      overflow-x: hidden;
+      list-style-type: none;
+      overflow-y: auto;
       background-color: #fff;
-      border: 1px solid #e2e2e2;
-      box-shadow: 0 0 10px rgba(0, 0, 0, .2);
+      padding: 0;
+      margin: 0;
 
-      right: 2%;
-      bottom: 2%;
-      width: 720px;
-      height: 300px;
-      color: black;
-      margin: auto;
-      overflow: hidden;
-      background-size: 100% 100%;
-      border-radius: 7px 7px 0 0;
-      position: fixed;
-      -webkit-transition: all .5s ease-in-out 0s;
-      transition: all .5s ease-in-out 0s;
-
-      ul{
-        white-space: nowrap;
-        -webkit-overflow-scrolling: touch;
-        overflow-x: auto;
-        overflow-y: hidden;
-        padding: 0 0.1rem;
-        margin-bottom: -.2rem;
-        overflow: -moz-scrollbars-none;
-        overflow: -moz-scrollbars-none;
-      }
-      ul::-webkit-scrollbar{
-        display: none;
-      }
-
-      .file-title {
-        display: flex;
-        height: 3.5rem;
-        // line-height: 3.5rem;
-        padding: 0 10px;
-        border-bottom: 1px solid #ddd;
-        .files-title {
-          margin-left: 3%;
-          font-size: 20px;
-          line-height: 3.5rem;
-        }
-        .operate {
-          flex: 1;
-          text-align: right;
-          .button-collapse {
-            padding: 16px 5px;
-            font-size: 25px;
-            margin-left: 0;
-          }
-        }
-      }
-
-      .file-list {
-        position: relative;
-        max-height: 300px;
-        /*height: 49px;*/
-        overflow-x: hidden;
-        list-style-type: none;
-        overflow-y: auto;
+      > li {
         background-color: #fff;
-        padding: 0;
-        margin: 0;
-        > li {
-          background-color: #fff;
-        }
-      }
-      &.collapse {
-        .file-title {
-          background-color: #E7ECF2;
-        }
       }
     }
 
-    .no-file {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      font-size: 16px;
-    }
-
-    >>>.uploader-file-icon {
-      &:before {
-        content: '' !important;
+    &.collapse {
+      .file-title {
+        background-color: #E7ECF2;
       }
-      background: url(./images/file.svg);
-      &[icon=image] {
-        background: url(./images/image.svg);
-      }
-      &[icon=video] {
-        background: url(./images/video.svg);
-      }
-      &[icon=document] {
-        background: url(./images/docment.svg);
-      }
-      &[icon=audio] {
-        background: url(./images/audio.svg);
-      }
-      &[icon=folder] {
-        background: url(./images/folder.svg);
-      }
-    }
-
-    >>>.uploader-file-actions > span {
-      margin-right: 6px;
     }
   }
 
-  >>>.uploader-file-status {
-    width: 32%;
-    text-indent: 20px;
+  .no-file {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 16px;
   }
-  >>>.uploader-file-meta {
-    width: 0;
+
+  > > > .uploader-file-icon {
+    &:before {
+      content: '' !important;
+    }
+
+    background: url(./images/file.svg);
+
+    &[icon=image] {
+      background: url(./images/image.svg);
+    }
+
+    &[icon=video] {
+      background: url(./images/video.svg);
+    }
+
+    &[icon=document] {
+      background: url(./images/docment.svg);
+    }
+
+    &[icon=audio] {
+      background: url(./images/audio.svg);
+    }
+
+    &[icon=folder] {
+      background: url(./images/folder.svg);
+    }
   }
-  >>>.uploader-file-icon {
-    width: 32px;
-    height: 32px;
-    display: inline-block;
-    vertical-align: top;
-    margin-top: 8px;
-    margin-right: 8px;
-  }
-  >>>.uploader-file-actions>span {
+
+  > > > .uploader-file-actions > span {
     margin-right: 6px;
-    margin-left: 8px;
   }
+}
 
-  /* 隐藏上传按钮 */
-  #global-uploader-btn {
-    position: absolute;
-    clip: rect(0, 0, 0, 0);
+> > > .uploader-file-status {
+  width: 32%;
+  text-indent: 20px;
+}
+
+> > > .uploader-file-meta {
+  width: 0;
+}
+
+> > > .uploader-file-icon {
+  width: 32px;
+  height: 32px;
+  display: inline-block;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-right: 8px;
+}
+
+> > > .uploader-file-actions > span {
+  margin-right: 6px;
+  margin-left: 8px;
+}
+
+/* 隐藏上传按钮 */
+#global-uploader-btn {
+  position: absolute;
+  clip: rect(0, 0, 0, 0);
+}
+
+#folder-uploader-btn {
+  position: absolute;
+  clip: rect(0, 0, 0, 0);
+}
+
+
+.process-area {
+  right: 66px;
+  bottom: 66px;
+  width: 0;
+  height: 0;
+  -webkit-box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2);
+  cursor: pointer;
+  background: #eee;
+  margin: auto;
+  overflow: hidden;
+  background-size: 100% 100%;
+  border-radius: 50%;
+  position: fixed;
+  /*animation: load-process-area .5s 1 linear forwards;*/
+  /*transition: all .5s;*/
+  -webkit-transition: all .5s ease-in-out 0s;
+  transition: all .5s ease-in-out 0s;
+}
+
+.process-area .process-info {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
+}
+
+.process-area .process-info .process {
+  font-size: 1.5rem;
+}
+
+.process-area .process-info .net-speed {
+  font-size: .7rem;
+  white-space: nowrap;
+}
+
+.process-anime {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  border: 4px solid #fff;
+  transform: translate(-50%, -50%);
+  width: 90px;
+  height: 90px;
+  background: linear-gradient(45deg, #fde47c, #fdeca6);
+  border-radius: 50%;
+  overflow: hidden;
+}
+
+.process-anime .cube-a {
+  position: absolute;
+  left: 50%;
+  background: rgba(53, 53, 53, .3);
+  width: 130px;
+  height: 130px;
+  border-radius: 50px;
+  animation: fx-rotate 15s infinite linear;
+  transform-origin: 50% 50%;
+  transition: .5s;
+}
+
+.process-anime .cube-b {
+  position: absolute;
+  left: 50%;
+  background: #fff;
+  width: 130px;
+  height: 130px;
+  border-radius: 50px;
+  animation: fx-rotate 10s infinite reverse linear;
+  transform-origin: 50% 50%;
+  transition: .5s;
+}
+
+/**成功**/
+.process-anime .done {
+  position: absolute;
+  width: 45px;
+  height: 45px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) scale(2.25);
+}
+
+.process-anime .done .checkmark {
+  width: 45px;
+  height: 45px;
+  border-radius: 50%;
+  display: block;
+  stroke-width: 2;
+  stroke: #fff;
+  stroke-miterlimit: 10;
+  box-shadow: inset 0 0 0 #fdda65;
+  animation: fill-data .4s ease-in-out .4s forwards, scale-data .3s ease-in-out .9s both;
+}
+
+.process-anime .done .checkmark__check {
+  transform: translate(2px, 2px);
+  transform-origin: 50% 50%;
+  stroke-dasharray: 48;
+  stroke-dashoffset: 48;
+  animation: stroke-data .3s cubic-bezier(.65, 0, .45, 1) .8s forwards;
+}
+
+@keyframes fx-rotate {
+  0% {
+    transform: translate(-50%) rotate(0);
   }
-  #folder-uploader-btn {
-    position: absolute;
-    clip: rect(0, 0, 0, 0);
+  100% {
+    transform: translate(-50%, 2px) rotate(365deg);
   }
+}
 
+@keyframes scale-data {
+  0%, 100% {
+    transform: none;
+  }
+  50% {
+    transform: scale3d(1.1, 1.1, 1);
+  }
+}
 
+@keyframes fill-data {
+  100% {
+    box-shadow: inset 0 0 0 30px #fdda65;
+  }
+}
 
-  .process-area {
+@keyframes stroke-data {
+  100% {
+    stroke-dashoffset: 0;
+  }
+}
+
+@keyframes load-process-area {
+  0% {
     right: 66px;
     bottom: 66px;
     width: 0;
     height: 0;
-    -webkit-box-shadow: 5px 5px 10px rgba(0,0,0,0.2);
-    box-shadow: 5px 5px 10px rgba(0,0,0,0.2);
-    cursor: pointer;
-    background: #eee;
-    margin: auto;
-    overflow: hidden;
-    background-size: 100% 100%;
-    border-radius: 50%;
-    position: fixed;
-    /*animation: load-process-area .5s 1 linear forwards;*/
-    /*transition: all .5s;*/
-    -webkit-transition: all .5s ease-in-out 0s;
-    transition: all .5s ease-in-out 0s;
   }
-
-  .process-area .process-info {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-    text-align: center;
-  }
-  .process-area .process-info .process {
-    font-size: 1.5rem;
-  }
-  .process-area .process-info .net-speed {
-    font-size: .7rem;
-    white-space: nowrap;
-  }
-
-  .process-anime {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    border: 4px solid #fff;
-    transform: translate(-50%,-50%);
-    width: 90px;
-    height: 90px;
-    background: linear-gradient(45deg,#fde47c,#fdeca6);
-    border-radius: 50%;
-    overflow: hidden;
-  }
-  .process-anime .cube-a {
-    position: absolute;
-    left: 50%;
-    background: rgba(53,53,53,.3);
-    width: 130px;
-    height: 130px;
-    border-radius: 50px;
-    animation: fx-rotate 15s infinite linear;
-    transform-origin: 50% 50%;
-    transition: .5s;
-  }
-  .process-anime .cube-b {
-    position: absolute;
-    left: 50%;
-    background: #fff;
-    width: 130px;
-    height: 130px;
-    border-radius: 50px;
-    animation: fx-rotate 10s infinite reverse linear;
-    transform-origin: 50% 50%;
-    transition: .5s;
-  }
-
-  /**成功**/
-  .process-anime .done {
-    position: absolute;
-    width: 45px;
-    height: 45px;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%) scale(2.25);
-  }
-  .process-anime .done .checkmark {
-    width: 45px;
-    height: 45px;
-    border-radius: 50%;
-    display: block;
-    stroke-width: 2;
-    stroke: #fff;
-    stroke-miterlimit: 10;
-    box-shadow: inset 0 0 0 #fdda65;
-    animation: fill-data .4s ease-in-out .4s forwards,scale-data .3s ease-in-out .9s both;
-  }
-  .process-anime .done .checkmark__check {
-    transform: translate(2px,2px);
-    transform-origin: 50% 50%;
-    stroke-dasharray: 48;
-    stroke-dashoffset: 48;
-    animation: stroke-data .3s cubic-bezier(.65,0,.45,1) .8s forwards;
-  }
-
-  @keyframes fx-rotate {
-    0% {
-      transform: translate(-50%) rotate(0);
-    }
-    100% {
-      transform: translate(-50%,2px) rotate(365deg);
-    }
-  }
-
-  @keyframes scale-data {
-    0%, 100% {
-      transform: none;
-    }
-    50% {
-      transform: scale3d(1.1,1.1,1);
-    }
-  }
-  @keyframes fill-data {
-    100% {
-      box-shadow: inset 0 0 0 30px #fdda65;
-    }
-  }
-
-  @keyframes stroke-data {
-    100% {
-      stroke-dashoffset: 0;
-    }
-  }
-
-  @keyframes load-process-area {
-    0% {
-      right: 66px;
-      bottom: 66px;
-      width: 0;
-      height: 0;
-    }
-    100% {
-      right: 20px;
-      bottom: 20px;
-      width: 92px;
-      height: 92px;
-    }
+  100% {
+    right: 20px;
+    bottom: 20px;
+    width: 92px;
+    height: 92px;
   }
+}
 </style>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 541db8e..9e3771b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,13 +2,9 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <!--<img v-if="logo" :src="logo" class="sidebar-logo">-->
-<!--        <svg-icon class="sidebar-logo" icon-class="jmal-cloud"></svg-icon>-->
-        <Logo v-model="netdiskLogo" width="25"></Logo>
+        <Logo v-model="netdiskLogo" width="50" padding="8"></Logo>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link logo-expand" to="/">
-        <!--<img v-if="logo" :src="logo" class="sidebar-logo">-->
-<!--        <svg-icon class="sidebar-logo-expand" icon-class="jmal-cloud"></svg-icon>-->
         <Logo v-model="netdiskLogo" width="50" padding="8"></Logo>
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
@@ -31,11 +27,10 @@ export default {
   },
   computed: {
     title() {
-      console.log('this.$store.state.user', this.$store.state.user)
       if (this.$store.state.user.netdiskName) {
         return this.$store.state.user.netdiskName
       }
-      return 'jmalcloud'
+      return 'JmalCloud'
     },
     netdiskLogo() {
       if (this.$store.state.user.netdiskLogo) {
diff --git a/src/main.js b/src/main.js
index 740b54a..d26494b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,8 +9,6 @@ import EVueContextmenu from 'e-vue-contextmenu'
 import App from './App'
 import store from './store'
 import router from './router'
-import VueWechatTitle from 'vue-wechat-title'
-
 
 // ant-design-vue
 import { Affix } from 'ant-design-vue';
@@ -33,7 +31,7 @@ import Viewer from 'v-viewer'
 
 Vue.use(Viewer)
 
-Vue.use(VueWechatTitle)
+// Vue.use(VueWechatTitle)
 
 Vue.use(uploader)
 Vue.use(EVueContextmenu)
diff --git a/src/permission.js b/src/permission.js
index 4c47206..3a276ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,19 +3,21 @@ import store from './store'
 import NProgress from 'nprogress' // 进度条
 import 'nprogress/nprogress.css' // 进度条样式
 import { getToken } from '@/utils/auth' // 认证获取token
+import {setFavicon} from '@/utils/logo'
 import getPageTitle from '@/utils/get-page-title'
 
-import { getLogoName, getLogo } from '@/utils/logo'
-
 NProgress.configure({ showSpinner: false }) // NProgress配置
 
 const whiteList = ['/login','/s','/s/','/s_m','/s_m/'] // 白名单
 
+window.onload = function() {
+  setFavicon()
+}
+
 router.beforeEach(async(to, from, next) => {
   // 开始进度条
   NProgress.start()
   // 设置页面标题
-  console.log('to.meta.title', to.meta.title)
   document.title = getPageTitle(to.meta.title)
 
   // 确认用户是否已登录
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c4c6400..c0e95e9 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,7 @@
 import { login, logout, getInfo } from '@/api/user'
 import menuApi from '@/api/menu'
 import { getToken, setToken, getConsumerId, setConsumerId, removeToken, removeConsumerId , setRememberName, removeRememberName } from '@/utils/auth'
+import { setLogo } from '@/utils/logo'
 import { resetRouter } from '@/router'
 import router from '@/router'
 import Layout from '@/layout'
@@ -98,6 +99,7 @@ const actions = {
     const { netdiskName, netdiskLogo } = logoInfo
     commit('SET_NETDISK_NAME', netdiskName)
     commit('SET_NETDISK_LOGO', netdiskLogo)
+    setLogo(netdiskName, netdiskLogo)
   },
 
   // get user info
@@ -121,6 +123,7 @@ const actions = {
         commit('SET_USER_INFO', data)
         commit('SET_NETDISK_NAME', netdiskName)
         commit('SET_NETDISK_LOGO', netdiskLogo)
+        setLogo(netdiskName, netdiskLogo)
         sessionStorage.setItem('store', JSON.stringify(state))
         resolve(data)
       }).catch(error => {
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
index 88bf77c..cd94639 100644
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@@ -1,11 +1,16 @@
 import defaultSettings from '@/settings'
 
+import { getLogoName } from '@/utils/logo'
+
 const title = defaultSettings.title || 'Vue Admin Template'
 
 export default function getPageTitle(pageTitle) {
-  if (pageTitle) {
-    console.log('title', title)
-    return `${pageTitle} - ${title}`
+  let logoName = getLogoName()
+  if (!logoName || logoName === 'undefined') {
+    logoName = title
   }
-  return `${title}`
+  if (pageTitle) {
+    return `${pageTitle} - ${logoName}`
+  }
+  return `${logoName}`
 }
diff --git a/src/utils/logo.js b/src/utils/logo.js
index bd730cc..04c8c9c 100644
--- a/src/utils/logo.js
+++ b/src/utils/logo.js
@@ -1,25 +1,37 @@
 import Cookies from 'js-cookie'
+import fileConfig from "@/utils/file-config";
+import getPageTitle from "@/utils/get-page-title";
 
 const titleKey = 'netdisk-name'
 
 const logoKey = 'netdisk-logo'
 
 export function getLogoName() {
-  const res = Cookies.get(titleKey)
-  return !res || res === 'undefined' ? res : 'jmalcloud'
+  return Cookies.get(titleKey)
 }
 
 export function getLogo() {
-  const res = Cookies.get(logoKey)
-  return !res || res === 'undefined' ? res : ''
+  return Cookies.get(logoKey)
 }
 
-export function setLogoName(logoName, logo) {
+export function setLogo(logoName, logo) {
   Cookies.set(titleKey, logoName)
-  return Cookies.set(logoKey, logo)
+  Cookies.set(logoKey, logo)
+  setFavicon()
 }
 
 export function removeLogo() {
   Cookies.remove(titleKey)
   return Cookies.remove(logoKey)
 }
+
+export function setFavicon() {
+  const logo = getLogo()
+  if (logo && logo !== 'undefined') {
+    let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
+    link.type = 'image/x-icon'
+    link.rel = 'shortcut icon'
+    link.href = fileConfig.logoUrl(logo)
+    document.getElementsByTagName('head')[0].appendChild(link)
+  }
+}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 94ee91c..734c1e3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -13,7 +13,7 @@
             <div  class="title">
               <Logo v-model="webstieRecord.netdiskLogo" width="65"></Logo>
               <div class="jmal-cloud-name">
-                <div>{{ webstieRecord.netdiskName ? webstieRecord.netdiskName : 'jmalcloud' }}</div>
+                <div>{{ webstieRecord.netdiskName ? webstieRecord.netdiskName : 'JmalCloud' }}</div>
               </div>
             </div>
           </h3>
@@ -105,6 +105,7 @@ import { getWebstieRecord } from "@/api/setting-api";
 import { hasUser, initialization } from '@/api/user'
 import { getRememberName } from '@/utils/auth'
 import Logo from "@/components/Logo";
+import Bus from "@/assets/js/bus";
 
 export default {
   name: 'Login',
@@ -119,14 +120,12 @@ export default {
     }
     const validatePassword = (rule, value, callback) => {
       if (value.length < 6) {
-        callback(new Error('密码不能少于6位数字'))
       } else {
         callback()
       }
     }
     const confirmPassword = (rule, value, callback) => {
       if (value.length < 6) {
-        callback(new Error('密码不能少于6位数字'))
       } else if(this.loginForm.password !== value) {
         callback(new Error('密码不一致'))
       } else {
@@ -189,6 +188,9 @@ export default {
 
     getWebstieRecord().then((res) => {
       this.webstieRecord = res.data
+      if (this.webstieRecord.netdiskName || this.webstieRecord.netdiskLogo) {
+        this.$store.dispatch('user/setLogo', {netdiskName: this.webstieRecord.netdiskName, netdiskLogo: this.webstieRecord.netdiskLogo})
+      }
     })
   },
   methods: {
diff --git a/src/views/setting/articles/articleManager.vue b/src/views/setting/articles/articleManager.vue
index ce7f930..203051c 100644
--- a/src/views/setting/articles/articleManager.vue
+++ b/src/views/setting/articles/articleManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-wechat-title="title">
+  <div>
     <el-dialog
       :title="title"
       :fullscreen="true"
diff --git a/src/views/setting/articles/categoryManager.vue b/src/views/setting/articles/categoryManager.vue
index f6fdc55..3cea8f5 100644
--- a/src/views/setting/articles/categoryManager.vue
+++ b/src/views/setting/articles/categoryManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <el-dialog class="dialog-cm" width="500px" :title="dialogTitle" :close-on-click-modal="false" :visible.sync="dialogVisible">
       <el-form ref="managerForm" size="medium" :model="form" label-position="left" :rules="rules" label-width="95px">
         <el-form-item label="分类名称:" prop="name">
diff --git a/src/views/setting/articles/tagManager.vue b/src/views/setting/articles/tagManager.vue
index bb6110a..845e388 100644
--- a/src/views/setting/articles/tagManager.vue
+++ b/src/views/setting/articles/tagManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <el-dialog class="dialog-cm" width="500px" :title="dialogTitle" :close-on-click-modal="false" :visible.sync="dialogVisible">
       <el-form ref="managerForm" size="medium" :model="form" label-position="left" :rules="rules" label-width="95px">
         <el-form-item label="标签名称:" prop="name">
diff --git a/src/views/setting/cloudManager.vue b/src/views/setting/cloudManager.vue
index b3558aa..87c8743 100644
--- a/src/views/setting/cloudManager.vue
+++ b/src/views/setting/cloudManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" v-wechat-title="title">
+  <div class="app-container">
     <el-card class="box-card">
       <div slot="header">
         <div class="box-card-header">
@@ -59,6 +59,7 @@
 import settingApi, {getSetting} from "@/api/setting-api";
 import Bus from "@/assets/js/bus";
 import Logo from "@/components/Logo";
+import getPageTitle from "@/utils/get-page-title";
 
 export default {
   components: {Logo},
@@ -70,7 +71,7 @@ export default {
       resetLoading: false,
       webpEnabled: false,
       logoFileName: '',
-      netdiskName: 'jmalcloud',
+      netdiskName: 'JmalCloud',
       showAckBtn: false,
       inputNetdiskNameWidth: 150,
       logoFileTypeList: ['image/svg+xml', 'image/jpg', 'image/png', 'image/jpeg']
@@ -144,6 +145,7 @@ export default {
         settingApi.updateNetdiskName({netdiskName: this.netdiskName}).then(() => {
           this.$store.dispatch('user/setLogo', {netdiskName: this.netdiskName, netdiskLogo: this.logoFileName}).then(()=> {
             Bus.$emit('updateLogo')
+            document.title = getPageTitle(this.$route.meta.title)
           })
           this.$message.success("网盘名称 修改成功")
           this.setInputBlur()
diff --git a/src/views/setting/sys/cusomerInfo.vue b/src/views/setting/sys/cusomerInfo.vue
index 03442e8..54cac07 100644
--- a/src/views/setting/sys/cusomerInfo.vue
+++ b/src/views/setting/sys/cusomerInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <select-file title="选择头像" @select="selectedFile" :visible.sync="dialogSelectFile"></select-file>
     <el-dialog class="dialog-avatar" title="修改头像" :visible.sync="dialogAvatar" @close="handleCloseDialogAvatar">
       <cropper-dialog
diff --git a/src/views/setting/sys/cusomerManager.vue b/src/views/setting/sys/cusomerManager.vue
index 78d2439..d5ba851 100644
--- a/src/views/setting/sys/cusomerManager.vue
+++ b/src/views/setting/sys/cusomerManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <el-dialog class="dialog-form" width="600px" :title="dialogTitle" :visible.sync="dialogVisible" :close-on-click-modal="false">
       <el-form size="medium" ref="managerForm" label-width="90px"  :model="form" :rules="rules">
         <el-row :gutter="10">
diff --git a/src/views/setting/sys/menuManager.vue b/src/views/setting/sys/menuManager.vue
index 64e21d8..06a788e 100644
--- a/src/views/setting/sys/menuManager.vue
+++ b/src/views/setting/sys/menuManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <el-dialog class="dialog-form" width="600px" :title="dialogTitle" :visible.sync="dialogVisible">
       <el-form size="medium" ref="managerForm" label-width="90px"  :model="form" :rules="rules">
         <el-row :gutter="10">
diff --git a/src/views/setting/sys/roleManager.vue b/src/views/setting/sys/roleManager.vue
index b9547d5..38dc8f7 100644
--- a/src/views/setting/sys/roleManager.vue
+++ b/src/views/setting/sys/roleManager.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container" v-wechat-title="title">
+  <div class="container">
     <el-dialog class="dialog-form" width="400px" :title="dialogTitle" :visible.sync="dialogVisible">
       <el-form size="medium" ref="managerForm" label-width="90px"  :model="form" :rules="rules">
             <el-form-item label="角色名称:" prop="name">
diff --git a/vue.config.js b/vue.config.js
index 6cecd13..2bec9f9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || 'jmalCloud' // page title
+const name = defaultSettings.title || 'JmalCloud' // page title
 
 //如果您的端口设置为80，
 //使用管理员权限执行命令行。