From a9401cf0a61bc9f7a174db4da0187e205aed49ba Mon Sep 17 00:00:00 2001
From: klausY <emosick@qq.com>
Date: Tue, 21 Jul 2020 11:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9D=83=E6=A0=87=E8=AF=86=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/layout/bottomInfo/bottomInfo.vue | 37 +++++++++++++++++++
 web/src/view/layout/index.vue                 |  9 ++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 web/src/view/layout/bottomInfo/bottomInfo.vue

diff --git a/web/src/view/layout/bottomInfo/bottomInfo.vue b/web/src/view/layout/bottomInfo/bottomInfo.vue
new file mode 100644
index 00000000..889136fe
--- /dev/null
+++ b/web/src/view/layout/bottomInfo/bottomInfo.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="bottom-info">
+    <div>
+      <span>Powered by</span>
+      <span>
+      <a href="https://github.com/flipped-aurora/gin-vue-admin">gin-vue-admin</a>
+      </span>
+      <el-divider direction="vertical"></el-divider>
+      <span>Copyright</span>
+      <span>
+      <a href="https://github.com/flipped-aurora">flipped-aurora团队</a>
+      </span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name:"BottomInfo"
+}
+</script>
+<style lang="scss">
+.bottom-info {
+  color: #888;
+  height: 30px;
+  line-height: 12px;
+  a {
+    color: #888;
+  }
+  div {
+    display: flex;
+    justify-content: center;
+    span{
+      margin: 0 3px;
+    }
+  }
+}
+</style>
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index 85df0b76..64df2c29 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -64,6 +64,7 @@
         <transition mode="out-in" name="el-fade-in-linear">
           <router-view class="admin-box" v-if="!$route.meta.keepAlive"></router-view>
         </transition>
+       <BottomInfo />
       </el-main>
     </el-container>
     <el-dialog :visible.sync="showPassword" @close="clearPassword" title="修改密码" width="360px">
@@ -91,6 +92,7 @@ import Aside from '@/view/layout/aside'
 import HistoryComponent from '@/view/layout/aside/historyComponent/history'
 import Screenfull from '@/view/layout/screenfull'
 import Search from '@/view/layout/search/search'
+import BottomInfo from '@/view/layout/bottomInfo/bottomInfo'
 import { mapGetters, mapActions } from 'vuex'
 import { changePassword } from '@/api/user'
 export default {
@@ -135,7 +137,8 @@ export default {
     Aside,
     HistoryComponent,
     Screenfull,
-    Search
+    Search,
+    BottomInfo
   },
   methods: {
     ...mapActions('user', ['LoginOut']),
@@ -241,6 +244,7 @@ $mainHight: 100vh;
   z-index: 999;
 }
 .admin-box {
+  min-height: calc(100vh - 240px);
   background-color: rgb(255, 255, 255);
   margin-top: 100px;
 }
@@ -272,7 +276,7 @@ $mainHight: 100vh;
       // padding: 6px;
       // border-bottom: 1px solid #eee;
     }
-   
+
     &.el-main {
       overflow: auto;
       background: #fff;
@@ -366,6 +370,7 @@ $mainHight: 100vh;
   }
 }
 
+
 .screenfull {
   display: inline-block;
 }
-- 
GitLab