From 81a7222605ba56f941e0cbc065ecf67994368001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BA=AD=E5=BB=B7?= <admin@admindeiMac.local>
Date: Tue, 21 Jul 2020 15:14:17 +0800
Subject: [PATCH] fix and add

---
 web_src/src/components/attachment/Index.vue   |   2 +-
 web_src/src/components/catalog/Index.vue      |   2 +-
 web_src/src/components/common/Header.vue      | 182 +++++++++++++-
 web_src/src/components/item/Index.vue         | 140 +----------
 web_src/src/components/item/Password.vue      |   2 +-
 web_src/src/components/item/add/Index.vue     |   2 +-
 web_src/src/components/item/export/Index.vue  |   2 +-
 web_src/src/components/item/setting/Index.vue |   2 +-
 web_src/src/components/item/show/Index.vue    |   2 -
 .../item/show/show_regular_item/Index.vue     |  15 +-
 .../item/show/show_regular_item/LeftMenu.vue  |   2 +-
 .../item/show/show_regular_item/OpBar.vue     |   6 +-
 .../item/show/show_single_page_item/Index.vue |   2 +-
 web_src/src/components/notice/Index.vue       |   2 +-
 web_src/src/components/page/Diff.vue          |   2 +-
 web_src/src/components/page/Index.vue         |   2 +-
 .../components/page/edit/AttachmentList.vue   |   2 +-
 .../components/page/edit/HistoryVersion.vue   |   2 +-
 web_src/src/components/page/edit/Index.vue    |   2 +-
 .../src/components/page/edit/PasteTable.vue   |   2 +-
 web_src/src/components/page/edit/SortPage.vue |   2 +-
 .../src/components/page/edit/TemplateList.vue |   2 +-
 web_src/src/components/team/Index.vue         |   2 +-
 web_src/src/components/team/Item.vue          |   2 +-
 web_src/src/components/team/Member.vue        |   2 +-
 web_src/src/components/user/Login.vue         |   2 +-
 web_src/src/components/user/Register.vue      |   2 +-
 .../components/user/ResetPasswordByUrl.vue    |   2 +-
 web_src/src/components/user/Setting.vue       |   2 +-
 web_src/src/router/index.js                   | 228 +++++++++---------
 30 files changed, 337 insertions(+), 284 deletions(-)

diff --git a/web_src/src/components/attachment/Index.vue b/web_src/src/components/attachment/Index.vue
index 29e75fe23..83c4a9cc1 100644
--- a/web_src/src/components/attachment/Index.vue
+++ b/web_src/src/components/attachment/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="hor-center-card">
diff --git a/web_src/src/components/catalog/Index.vue b/web_src/src/components/catalog/Index.vue
index c3f7e080c..b1752993a 100644
--- a/web_src/src/components/catalog/Index.vue
+++ b/web_src/src/components/catalog/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/common/Header.vue b/web_src/src/components/common/Header.vue
index d6111cde2..20fcc3d9c 100644
--- a/web_src/src/components/common/Header.vue
+++ b/web_src/src/components/common/Header.vue
@@ -1,16 +1,194 @@
-<template></template>
+<template>
+  <div>
+    <div class="header">
+      <el-container class="header-narrow">
+        <el-row class="masthead">
+          <div class="logo-title">
+            <h2 class="muted">
+              <img src="static/logo/b_64.png" style="width:50px;height:50px;margin-bottom:-10px;" alt />ShowDoc
+            </h2>
+          </div>
+          <div class="header-btn-group pull-right">
+            <el-tooltip class="item" effect="dark" :content="$t('feedback')" placement="top">
+              <router-link to>
+                <i @click="feedback" class="el-icon-phone-outline"></i>
+              </router-link>
+            </el-tooltip>
+
+            <el-tooltip
+              v-if="lang =='zh-cn'"
+              class="item"
+              effect="dark"
+              content="客户端"
+              placement="top"
+            >
+              <a target="_blank" href="https://www.showdoc.cc/clients">
+                <i class="el-icon-mobile-phone"></i>
+              </a>
+            </el-tooltip>
+
+            <el-tooltip
+              v-if="lang =='zh-cn'"
+              class="item"
+              effect="dark"
+              content="接口开发调试工具RunApi"
+              placement="top"
+            >
+              <a target="_blank" href="https://www.showdoc.cc/runapi">
+                <i class="el-icon-connection"></i>
+              </a>
+            </el-tooltip>
+
+            <el-tooltip class="item" effect="dark" :content="$t('team_mamage')" placement="top">
+              <router-link to="/team/index">
+                <i class="el-icon-s-flag"></i>
+              </router-link>
+            </el-tooltip>
+
+            <el-tooltip
+              v-if="isAdmin"
+              class="item"
+              effect="dark"
+              :content="$t('background')"
+              placement="top"
+            >
+              <router-link to="/admin/index">
+                <i class="el-icon-s-tools"></i>
+              </router-link>
+            </el-tooltip>&nbsp;&nbsp;
+            <el-tooltip class="item" effect="dark" :content="$t('more')" placement="top">
+              <el-dropdown @command="dropdown_callback" trigger="click">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-caret-bottom el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>
+                    <router-link to="/user/setting">{{$t("Logged")}}:{{username}}</router-link>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <router-link to="/attachment/index">{{$t("my_attachment")}}</router-link>
+                  </el-dropdown-item>
+                  <el-dropdown-item :command="logout">{{$t("logout")}}</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-tooltip>
+          </div>
+        </el-row>
+      </el-container>
+    </div>
+    <router-view  style="padding-top: 100px"/>
+  </div>
+</template>
 
 <script>
 export default {
   name: 'Header',
   data() {
     return {
-      msg: '头部'
+      msg: '头部',
+      isAdmin: false,
+      lang: '',
+      username: ''
     }
+  },
+
+  methods: {
+    dropdown_callback(data) {
+      if (data) {
+        data()
+      }
+    },
+    feedback() {
+      if (DocConfig.lang == 'en') {
+        window.open('https://github.com/star7th/showdoc/issues')
+      } else {
+        var msg =
+          '你正在使用免费开源版showdoc，如有问题或者建议，请到github提issue：'
+        msg +=
+          "<a href='https://github.com/star7th/showdoc/issues' target='_blank'>https://github.com/star7th/showdoc/issues</a><br>"
+        msg +=
+          '如果你觉得showdoc好用，不妨给开源项目点一个star。良好的关注度和参与度有助于开源项目的长远发展。'
+        this.$alert(msg, {
+          dangerouslyUseHTMLString: true
+        })
+      }
+    },
+    logout() {
+      var that = this
+      var url = DocConfig.server + '/api/user/logout'
+
+      var params = new URLSearchParams()
+
+      that.axios.get(url, params).then(function(response) {
+        if (response.data.error_code === 0) {
+          that.$router.push({
+            path: '/'
+          })
+        } else {
+          that.$alert(response.data.error_message)
+        }
+      })
+    },
+  },
+  mounted() {
+    this.lang = DocConfig.lang
+    this.get_user_info(response => {
+      if (response.data.error_code === 0) {
+        this.username = response.data.data.username
+        if (response.data.data.groupid == 1) {
+          that.isAdmin = true
+        }
+      }
+    })
+  },
+  beforeDestroy() {
+    this.$message.closeAll()
   }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
+.header{
+  width: 100%;
+  background: rgb(44, 96, 106);
+  position: fixed;
+  top: 0;
+  height: 82px;
+  margin-bottom: 20px;
+  z-index: 100;
+}
+.header-narrow{
+  margin: 0 auto;
+  max-width: 1030px;
+  color: #fff;
+  width: 100%;
+}
+.masthead {
+  width: 100%;
+}
+.header-btn-group {
+  margin-top: -38px;
+  font-size: 18px;
+}
+
+.header-btn-group a {
+  color: #333;
+  margin-left: 25px;
+}
+.header-btn-group i {
+  color: #fff;
+}
+.el-dropdown {
+  font-size: 18px;
+}
+.el-dropdown-link,
+a {
+  color: #333;
+}
+.logo-title {
+  margin-left: 0px;
+}
+
+
 </style>
diff --git a/web_src/src/components/item/Index.vue b/web_src/src/components/item/Index.vue
index 1301b377b..e8f6f8811 100644
--- a/web_src/src/components/item/Index.vue
+++ b/web_src/src/components/item/Index.vue
@@ -1,82 +1,5 @@
 <template>
   <div class="hello">
-    <Header></Header>
-
-    <el-container class="container-narrow">
-      <el-row class="masthead">
-        <div class="logo-title">
-          <h2 class="muted">
-            <img src="static/logo/b_64.png" style="width:50px;height:50px;margin-bottom:-10px;" alt />ShowDoc
-          </h2>
-        </div>
-        <div class="header-btn-group pull-right">
-          <el-tooltip class="item" effect="dark" :content="$t('feedback')" placement="top">
-            <router-link to>
-              <i @click="feedback" class="el-icon-phone-outline"></i>
-            </router-link>
-          </el-tooltip>
-
-          <el-tooltip
-            v-if="lang =='zh-cn'"
-            class="item"
-            effect="dark"
-            content="客户端"
-            placement="top"
-          >
-            <a target="_blank" href="https://www.showdoc.cc/clients">
-              <i class="el-icon-mobile-phone"></i>
-            </a>
-          </el-tooltip>
-
-          <el-tooltip
-            v-if="lang =='zh-cn'"
-            class="item"
-            effect="dark"
-            content="接口开发调试工具RunApi"
-            placement="top"
-          >
-            <a target="_blank" href="https://www.showdoc.cc/runapi">
-              <i class="el-icon-connection"></i>
-            </a>
-          </el-tooltip>
-
-          <el-tooltip class="item" effect="dark" :content="$t('team_mamage')" placement="top">
-            <router-link to="/team/index">
-              <i class="el-icon-s-flag"></i>
-            </router-link>
-          </el-tooltip>
-
-          <el-tooltip
-            v-if="isAdmin"
-            class="item"
-            effect="dark"
-            :content="$t('background')"
-            placement="top"
-          >
-            <router-link to="/admin/index">
-              <i class="el-icon-s-tools"></i>
-            </router-link>
-          </el-tooltip>&nbsp;&nbsp;
-          <el-tooltip class="item" effect="dark" :content="$t('more')" placement="top">
-            <el-dropdown @command="dropdown_callback" trigger="click">
-              <span class="el-dropdown-link">
-                <i class="el-icon-caret-bottom el-icon--right"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <router-link to="/user/setting">{{$t("Logged")}}:{{username}}</router-link>
-                </el-dropdown-item>
-                <el-dropdown-item>
-                  <router-link to="/attachment/index">{{$t("my_attachment")}}</router-link>
-                </el-dropdown-item>
-                <el-dropdown-item :command="logout">{{$t("logout")}}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-tooltip>
-        </div>
-      </el-row>
-    </el-container>
-
     <el-container class="container-narrow">
       <div class="container-thumbnails">
         <div class="search-box-div" v-if="itemList.length > 9">
@@ -168,34 +91,9 @@
   margin: 0 auto;
   max-width: 930px;
 }
-
-.masthead {
-  width: 100%;
-  margin-top: 30px;
-}
-
-.header-btn-group {
-  margin-top: -38px;
-  font-size: 18px;
-}
-
-.header-btn-group a {
-  color: #333;
-  margin-left: 25px;
-}
-
-.el-dropdown {
-  font-size: 18px;
-}
-.el-dropdown-link,
 a {
   color: #333;
 }
-
-.logo-title {
-  margin-left: 0px;
-}
-
 .container-thumbnails {
   margin-top: 30px;
   max-width: 1000px;
@@ -344,21 +242,7 @@ export default {
         }
       })
     },
-    feedback() {
-      if (DocConfig.lang == 'en') {
-        window.open('https://github.com/star7th/showdoc/issues')
-      } else {
-        var msg =
-          '你正在使用免费开源版showdoc，如有问题或者建议，请到github提issue：'
-        msg +=
-          "<a href='https://github.com/star7th/showdoc/issues' target='_blank'>https://github.com/star7th/showdoc/issues</a><br>"
-        msg +=
-          '如果你觉得showdoc好用，不妨给开源项目点一个star。良好的关注度和参与度有助于开源项目的长远发展。'
-        this.$alert(msg, {
-          dangerouslyUseHTMLString: true
-        })
-      }
-    },
+    
     item_top_class(top) {
       if (top) {
         return 'el-icon-arrow-down'
@@ -416,22 +300,6 @@ export default {
         })
       })
     },
-    logout() {
-      var that = this
-      var url = DocConfig.server + '/api/user/logout'
-
-      var params = new URLSearchParams()
-
-      that.axios.get(url, params).then(function(response) {
-        if (response.data.error_code === 0) {
-          that.$router.push({
-            path: '/'
-          })
-        } else {
-          that.$alert(response.data.error_message)
-        }
-      })
-    },
 
     user_info() {
       var that = this
@@ -443,11 +311,7 @@ export default {
         }
       })
     },
-    dropdown_callback(data) {
-      if (data) {
-        data()
-      }
-    },
+    
 
     sort_item(data) {
       var that = this
diff --git a/web_src/src/components/item/Password.vue b/web_src/src/components/item/Password.vue
index c05ce4a2a..885e47867 100644
--- a/web_src/src/components/item/Password.vue
+++ b/web_src/src/components/item/Password.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card" onkeydown="if(event.keyCode==13)return false;">
diff --git a/web_src/src/components/item/add/Index.vue b/web_src/src/components/item/add/Index.vue
index 3ffebbc35..2533b2f75 100644
--- a/web_src/src/components/item/add/Index.vue
+++ b/web_src/src/components/item/add/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/item/export/Index.vue b/web_src/src/components/item/export/Index.vue
index 200e823cd..51ca74c66 100644
--- a/web_src/src/components/item/export/Index.vue
+++ b/web_src/src/components/item/export/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/item/setting/Index.vue b/web_src/src/components/item/setting/Index.vue
index f2efb2111..f019ac9dc 100644
--- a/web_src/src/components/item/setting/Index.vue
+++ b/web_src/src/components/item/setting/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/item/show/Index.vue b/web_src/src/components/item/show/Index.vue
index f193650aa..891a52821 100644
--- a/web_src/src/components/item/show/Index.vue
+++ b/web_src/src/components/item/show/Index.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="hello">
-    <Header></Header>
-
     <!-- 展示常规项目 -->
     <ShowRegularItem
       :item_info="item_info"
diff --git a/web_src/src/components/item/show/show_regular_item/Index.vue b/web_src/src/components/item/show/show_regular_item/Index.vue
index c36fab19c..ef34a9ad8 100644
--- a/web_src/src/components/item/show/show_regular_item/Index.vue
+++ b/web_src/src/components/item/show/show_regular_item/Index.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="hello" v-if="showComp">
-    <Header></Header>
-    <div id="header"></div>
-
     <div class="container doc-container" id="doc-container">
       <div id="left-side">
         <LeftMenu
@@ -159,8 +156,8 @@ export default {
       var doc_container = document.getElementById('doc-container')
       doc_container.style.width = '95%'
       doc_container.style.padding = '5px'
-      var header = document.getElementById('header')
-      header.style.height = '10px'
+      // var header = document.getElementById('header')
+      // header.style.height = '10px'
       var docTitle = document.getElementById('doc-title-box')
       docTitle.style.marginTop = '40px'
       this.showToc = false
@@ -171,8 +168,8 @@ export default {
       doc_container.style.width = 'calc( 95% - 300px )'
       doc_container.style.marginLeft = '300px'
       doc_container.style.padding = '20px'
-      var header = document.getElementById('header')
-      header.style.height = '20px'
+      // var header = document.getElementById('header')
+      // header.style.height = '20px'
       var docTitle = document.getElementById('doc-title-box')
       docTitle.style.marginTop = '30px'
     },
@@ -291,6 +288,10 @@ export default {
   height: 80px;
 }
 
+#right-side{
+  position: relative;
+}
+
 #doc-body {
   width: 95%;
   margin: 0 auto;
diff --git a/web_src/src/components/item/show/show_regular_item/LeftMenu.vue b/web_src/src/components/item/show/show_regular_item/LeftMenu.vue
index 79b849542..8f93d2bed 100644
--- a/web_src/src/components/item/show/show_regular_item/LeftMenu.vue
+++ b/web_src/src/components/item/show/show_regular_item/LeftMenu.vue
@@ -37,7 +37,7 @@
         ></el-input>
 
         <!-- 一级页面 -->
-        <template v-if="menu.pages.length ">
+        <template v-if="menu.pages && menu.pages.length ">
           <el-menu-item v-for="(page ) in menu.pages" :index="page.page_id" :key="page.page_id">
             <i class="el-icon-document"></i>
             <span :title="page.page_title">{{page.page_title}}</span>
diff --git a/web_src/src/components/item/show/show_regular_item/OpBar.vue b/web_src/src/components/item/show/show_regular_item/OpBar.vue
index 1b01616cd..dbb6dfbd8 100644
--- a/web_src/src/components/item/show/show_regular_item/OpBar.vue
+++ b/web_src/src/components/item/show/show_regular_item/OpBar.vue
@@ -220,10 +220,10 @@ a {
 
 #header-right-btn {
   font-size: 20px;
-  top: 15px;
-  right: 5%;
+  top: -15px;
+  right: 1%;
   cursor: pointer;
-  position: fixed;
+  position: absolute;
 }
 
 .el-dropdown-link {
diff --git a/web_src/src/components/item/show/show_single_page_item/Index.vue b/web_src/src/components/item/show/show_single_page_item/Index.vue
index c4c44ef14..be32b7bcf 100644
--- a/web_src/src/components/item/show/show_single_page_item/Index.vue
+++ b/web_src/src/components/item/show/show_single_page_item/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello grey-bg">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <div id="header"></div>
     <div class="container doc-container" id="doc-container">
diff --git a/web_src/src/components/notice/Index.vue b/web_src/src/components/notice/Index.vue
index 7f9f3dcdb..99a921ca1 100644
--- a/web_src/src/components/notice/Index.vue
+++ b/web_src/src/components/notice/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/page/Diff.vue b/web_src/src/components/page/Diff.vue
index 9225c11d5..74e4fa0dd 100644
--- a/web_src/src/components/page/Diff.vue
+++ b/web_src/src/components/page/Diff.vue
@@ -1,7 +1,7 @@
 <!-- 更多模板 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
     <link href="static/diff/diffview.css" rel="stylesheet" />
     <el-container class="container-narrow">
       <div class="textInput">
diff --git a/web_src/src/components/page/Index.vue b/web_src/src/components/page/Index.vue
index 734898eca..80d19a66a 100644
--- a/web_src/src/components/page/Index.vue
+++ b/web_src/src/components/page/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <div id="header"></div>
     <div class="container doc-container" id="doc-container">
diff --git a/web_src/src/components/page/edit/AttachmentList.vue b/web_src/src/components/page/edit/AttachmentList.vue
index ef06deb8b..6825a1515 100644
--- a/web_src/src/components/page/edit/AttachmentList.vue
+++ b/web_src/src/components/page/edit/AttachmentList.vue
@@ -1,7 +1,7 @@
 <!-- 附件 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-dialog
diff --git a/web_src/src/components/page/edit/HistoryVersion.vue b/web_src/src/components/page/edit/HistoryVersion.vue
index 01802316c..6b204078d 100644
--- a/web_src/src/components/page/edit/HistoryVersion.vue
+++ b/web_src/src/components/page/edit/HistoryVersion.vue
@@ -1,7 +1,7 @@
 <!-- 更多模板 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-dialog
diff --git a/web_src/src/components/page/edit/Index.vue b/web_src/src/components/page/edit/Index.vue
index 66be74fbb..e263bb642 100644
--- a/web_src/src/components/page/edit/Index.vue
+++ b/web_src/src/components/page/edit/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello" @keydown.ctrl.83.prevent="save" @keydown.meta.83.prevent="save">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-row class="masthead">
diff --git a/web_src/src/components/page/edit/PasteTable.vue b/web_src/src/components/page/edit/PasteTable.vue
index 2bbd51119..6bee455da 100644
--- a/web_src/src/components/page/edit/PasteTable.vue
+++ b/web_src/src/components/page/edit/PasteTable.vue
@@ -1,7 +1,7 @@
 <!-- 更多模板 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-dialog
diff --git a/web_src/src/components/page/edit/SortPage.vue b/web_src/src/components/page/edit/SortPage.vue
index 84a3aa466..9ec4facf1 100644
--- a/web_src/src/components/page/edit/SortPage.vue
+++ b/web_src/src/components/page/edit/SortPage.vue
@@ -1,7 +1,7 @@
 <!-- 页面排序 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-dialog
diff --git a/web_src/src/components/page/edit/TemplateList.vue b/web_src/src/components/page/edit/TemplateList.vue
index bd96698b1..1e7673a49 100644
--- a/web_src/src/components/page/edit/TemplateList.vue
+++ b/web_src/src/components/page/edit/TemplateList.vue
@@ -1,7 +1,7 @@
 <!-- 更多模板 -->
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container class="container-narrow">
       <el-dialog
diff --git a/web_src/src/components/team/Index.vue b/web_src/src/components/team/Index.vue
index 6ec024b31..ddf892d6e 100644
--- a/web_src/src/components/team/Index.vue
+++ b/web_src/src/components/team/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/team/Item.vue b/web_src/src/components/team/Item.vue
index 0411513c4..dd37b8d01 100644
--- a/web_src/src/components/team/Item.vue
+++ b/web_src/src/components/team/Item.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/team/Member.vue b/web_src/src/components/team/Member.vue
index 272a983f0..ce1ffd309 100644
--- a/web_src/src/components/team/Member.vue
+++ b/web_src/src/components/team/Member.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/user/Login.vue b/web_src/src/components/user/Login.vue
index 3264e2475..c64a731b1 100644
--- a/web_src/src/components/user/Login.vue
+++ b/web_src/src/components/user/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/user/Register.vue b/web_src/src/components/user/Register.vue
index 7c472ac25..5ab9f2379 100644
--- a/web_src/src/components/user/Register.vue
+++ b/web_src/src/components/user/Register.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/user/ResetPasswordByUrl.vue b/web_src/src/components/user/ResetPasswordByUrl.vue
index dc8dfe744..a11546715 100644
--- a/web_src/src/components/user/ResetPasswordByUrl.vue
+++ b/web_src/src/components/user/ResetPasswordByUrl.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/components/user/Setting.vue b/web_src/src/components/user/Setting.vue
index 0010c7921..b6bd19ab8 100644
--- a/web_src/src/components/user/Setting.vue
+++ b/web_src/src/components/user/Setting.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="hello">
-    <Header></Header>
+    <!-- <Header></Header> -->
 
     <el-container>
       <el-card class="center-card">
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index dfe59bd00..cf58f6b37 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import Header from '@/components/common/Header'
 import Index from '@/components/Index'
 import UserLogin from '@/components/user/Login'
 import UserSetting from '@/components/user/Setting'
@@ -24,6 +25,10 @@ import TeamItem from '@/components/team/Item'
 import Attachment from '@/components/attachment/Index'
 
 Vue.use(Router)
+const originalReplace = Router.prototype.replace
+Router.prototype.replace = function replace(location) {
+  return originalReplace.call(this, location).catch(err => err)
+}
 
 export default new Router({
   routes: [
@@ -33,114 +38,121 @@ export default new Router({
       component: Index
     },
     {
-      path: '/user/login',
-      name: 'UserLogin',
-      component: UserLogin
-    },
-    {
-      path: '/user/setting',
-      name: 'UserSetting',
-      component: UserSetting
-    },
-    {
-      path: '/user/register',
-      name: 'UserRegister',
-      component: UserRegister
-    },
-    {
-      path: '/user/resetPassword',
-      name: 'UserResetPassword',
-      component: UserResetPassword
-    },
-    {
-      path: '/user/ResetPasswordByUrl',
-      name: 'ResetPasswordByUrl',
-      component: ResetPasswordByUrl
-    },
-    {
-      path: '/item/index',
-      name: 'ItemIndex',
-      component: ItemIndex
-    },
-    {
-      path: '/item/add',
-      name: 'ItemAdd',
-      component: ItemAdd
-    },
-    {
-      path: '/item/password/:item_id',
-      name: 'ItemPassword',
-      component: ItemPassword
-    },
-    {
-      path: '/:item_id',
-      name: 'ItemShow',
-      component: ItemShow
-    },
-    {
-      path: '/item/export/:item_id',
-      name: 'ItemExport',
-      component: ItemExport
-    },
-    {
-      path: '/item/setting/:item_id',
-      name: 'ItemSetting',
-      component: ItemSetting
-    },
-    {
-      path: '/page/:page_id',
-      name: 'PageIndex',
-      component: PageIndex
-    },
-    {
-      path: '/p/:unique_key',
-      name: 'PageIndex',
-      component: PageIndex
-    },
-    {
-      path: '/page/edit/:item_id/:page_id',
-      name: 'PageEdit',
-      component: PageEdit
-    },
-    {
-      path: '/page/diff/:page_id/:page_history_id',
-      name: 'PageDiff',
-      component: PageDiff
-    },
-    {
-      path: '/catalog/:item_id',
-      name: 'Catalog',
-      component: Catalog
-    },
-    {
-      path: '/notice/index',
-      name: 'Notice',
-      component: Notice
-    },
-    {
-      path: '/admin/index',
-      name: 'Admin',
-      component: Admin
-    },
-    {
-      path: '/team/index',
-      name: 'Team',
-      component: Team
-    },
-    {
-      path: '/team/member/:team_id',
-      name: 'TeamMember',
-      component: TeamMember
-    },
-    {
-      path: '/team/item/:team_id',
-      name: 'TeamItem',
-      component: TeamItem
-    },
-    {
-      path: '/attachment/index',
-      name: 'Attachment',
-      component: Attachment
+      path: '',
+      name: 'Header',
+      component: Header,
+      children: [
+        {
+          path: '/user/login',
+          name: 'UserLogin',
+          component: UserLogin
+        },
+        {
+          path: '/user/setting',
+          name: 'UserSetting',
+          component: UserSetting
+        },
+        {
+          path: '/user/register',
+          name: 'UserRegister',
+          component: UserRegister
+        },
+        {
+          path: '/user/resetPassword',
+          name: 'UserResetPassword',
+          component: UserResetPassword
+        },
+        {
+          path: '/user/ResetPasswordByUrl',
+          name: 'ResetPasswordByUrl',
+          component: ResetPasswordByUrl
+        },
+        {
+          path: '/item/index',
+          name: 'ItemIndex',
+          component: ItemIndex
+        },
+        {
+          path: '/item/add',
+          name: 'ItemAdd',
+          component: ItemAdd
+        },
+        {
+          path: '/item/password/:item_id',
+          name: 'ItemPassword',
+          component: ItemPassword
+        },
+        {
+          path: '/:item_id',
+          name: 'ItemShow',
+          component: ItemShow
+        },
+        {
+          path: '/item/export/:item_id',
+          name: 'ItemExport',
+          component: ItemExport
+        },
+        {
+          path: '/item/setting/:item_id',
+          name: 'ItemSetting',
+          component: ItemSetting
+        },
+        {
+          path: '/page/:page_id',
+          name: 'PageIndex',
+          component: PageIndex
+        },
+        {
+          path: '/p/:unique_key',
+          name: 'PageIndex',
+          component: PageIndex
+        },
+        {
+          path: '/page/edit/:item_id/:page_id',
+          name: 'PageEdit',
+          component: PageEdit
+        },
+        {
+          path: '/page/diff/:page_id/:page_history_id',
+          name: 'PageDiff',
+          component: PageDiff
+        },
+        {
+          path: '/catalog/:item_id',
+          name: 'Catalog',
+          component: Catalog
+        },
+        {
+          path: '/notice/index',
+          name: 'Notice',
+          component: Notice
+        },
+        {
+          path: '/admin/index',
+          name: 'Admin',
+          component: Admin
+        },
+        {
+          path: '/team/index',
+          name: 'Team',
+          component: Team
+        },
+        {
+          path: '/team/member/:team_id',
+          name: 'TeamMember',
+          component: TeamMember
+        },
+        {
+          path: '/team/item/:team_id',
+          name: 'TeamItem',
+          component: TeamItem
+        },
+        {
+          path: '/attachment/index',
+          name: 'Attachment',
+          component: Attachment
+        }
+      ]
     }
   ]
 })