From 89c62d70f155d1c09e4545c17e33f1c81a80a9af Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Sat, 25 Apr 2020 17:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/App.vue               | 126 +++++++++++++++++++++++++++++++-
 admin/src/assets/scss/glob.scss |  89 ----------------------
 admin/src/components/home.vue   |  21 ++++++
 admin/src/main.js               |   9 ++-
 admin/src/router/index.js       |  10 +--
 5 files changed, 156 insertions(+), 99 deletions(-)
 create mode 100644 admin/src/components/home.vue

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 976a396..5254d70 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" :style="appStyle">
+  <div id="app" class="app" :style="appStyle">
     <el-container :style="mainElContainerStyle">
       <el-header :style="mainElHeaderStyle" :height="mainElHeaderStyle.height">
         <el-button class="mainMenuBtn" :style="mainMenuBtnStyle" type="text">
@@ -8,10 +8,14 @@
         <a class="mainLogoBtn" :style="mainLogoBtnStyle">
           <span>
             <i>{{mainLogo.appLogoName}}</i>
-            <!--<i>{{mainLogo.appName}}</i>-->
           </span>
         </a>
         <div class="mainMenuRightDiv">
+          <div class="login-registered-div">
+            <el-button type="text">登陆</el-button>
+            <el-button type="text">注册</el-button>
+          </div>
+          <!--
           <div class="bellDiv">
             <el-badge is-dot>
               <i class="el-icon-bell"></i>
@@ -21,6 +25,7 @@
             <el-avatar shape="square" size="large" icon="el-icon-user-solid">
             </el-avatar>
           </div>
+          -->
         </div>
       </el-header>
       <el-scrollbar style="height:100%">
@@ -28,7 +33,11 @@
           <i class="el-icon-caret-top"></i>
         </el-backtop>
         <el-main>
-          main
+          <transition name="el-zoom-in-center">
+            <keep-alive>
+              <router-view/>
+            </keep-alive>
+          </transition>
         </el-main>
       </el-scrollbar>
     </el-container>
@@ -87,3 +96,114 @@
     }
   }
 </script>
+
+<style lang="scss" scoped>
+  .app {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    font-family: 'Microsoft yahei';
+    font-size: 13px;
+    font-weight: 400;
+
+    .el-container {
+
+      .el-header {
+        box-shadow: rgba(0, 0, 0, 0.08) 0px 1px 4px 0px;
+        height: 50px;
+        margin: 0;
+        padding: 0;
+
+        .mainMenuBtn {
+          width: 50px;
+          height: 50px;
+          border-radius: 0px !important;
+          box-sizing: border-box;
+          line-height: inherit;
+          cursor: pointer;
+          font-family: inherit;
+          font-size: inherit;
+          display: inline-block;
+          vertical-align: middle;
+          text-align: center;
+          white-space: nowrap;
+          padding: 0px;
+          outline: medium;
+          text-decoration: none;
+          transition: all 0.3s ease-out;
+          border-width: initial;
+          border-style: none;
+          border-color: initial;
+          border-image: initial;
+          overflow: hidden;
+          font-size: 30px;
+        }
+
+        .mainLogoBtn {
+          height: 50px;
+          padding: 0px 12px;
+          cursor: pointer;
+
+          span {
+            font-size: 30px;
+            font-weight: bold;
+            font-family: inherit;
+            display: inline-block;
+            vertical-align: middle;
+            text-align: center;
+          }
+        }
+
+        .mainMenuRightDiv {
+          float: right;
+          height: 50px;
+
+          .mainMenuRightItemDiv {
+            height: 50px;
+            padding-right: 12px;
+            display: table-cell;
+            vertical-align: middle;
+            text-align: center;
+            cursor: pointer;
+          }
+
+          .avatarDiv {
+            height: 50px;
+            padding-right: 12px;
+            display: table-cell;
+            vertical-align: middle;
+            text-align: center;
+            cursor: pointer;
+          }
+
+          .bellDiv {
+            height: 50px;
+            padding-right: 25px;
+            display: table-cell;
+            vertical-align: middle;
+            text-align: center;
+            font-size: 18px;
+            cursor: pointer;
+          }
+
+          .login-registered-div {
+            height: 50px;
+            padding-right: 25px;
+            display: table-cell;
+            vertical-align: middle;
+            text-align: center;
+            font-size: 18px;
+            cursor: pointer;
+          }
+        }
+      }
+
+      .el-main {
+        margin: 0;
+        padding: 0;
+        overflow: hidden;
+      }
+    }
+  }
+</style>
diff --git a/admin/src/assets/scss/glob.scss b/admin/src/assets/scss/glob.scss
index 1701acd..d67a1f1 100644
--- a/admin/src/assets/scss/glob.scss
+++ b/admin/src/assets/scss/glob.scss
@@ -1,13 +1,3 @@
-#app {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  font-family: 'Microsoft yahei';
-  font-size: 13px;
-  font-weight: 400;
-}
-
 body .el-scrollbar__wrap {
   overflow-x: hidden;
 }
@@ -17,83 +7,4 @@ body .el-scrollbar__wrap {
 }
 
 
-.el-container {
 
-  .el-header {
-    box-shadow: rgba(0, 0, 0, 0.08) 0px 1px 4px 0px;
-    height: 50px;
-    margin: 0;
-    padding: 0;
-
-    .mainMenuBtn {
-      width: 50px;
-      height: 50px;
-      border-radius: 0px !important;
-      box-sizing: border-box;
-      line-height: inherit;
-      cursor: pointer;
-      font-family: inherit;
-      font-size: inherit;
-      display: inline-block;
-      vertical-align: middle;
-      text-align: center;
-      white-space: nowrap;
-      padding: 0px;
-      outline: medium;
-      text-decoration: none;
-      transition: all 0.3s ease-out;
-      border-width: initial;
-      border-style: none;
-      border-color: initial;
-      border-image: initial;
-      overflow: hidden;
-      font-size: 30px;
-    }
-
-    .mainLogoBtn {
-      height: 50px;
-      padding: 0px 12px;
-      cursor: pointer;
-
-      span {
-        font-size: 30px;
-        font-weight: bold;
-        font-family: inherit;
-        display: inline-block;
-        vertical-align: middle;
-        text-align: center;
-      }
-    }
-
-    .mainMenuRightDiv {
-      float: right;
-      height: 50px;
-
-      .avatarDiv {
-        height: 50px;
-        padding-right: 12px;
-        display: table-cell;
-        vertical-align: middle;
-        text-align: center;
-        cursor: pointer;
-      }
-
-      .bellDiv {
-        height: 50px;
-        padding-right: 25px;
-        display: table-cell;
-        vertical-align: middle;
-        text-align: center;
-        font-size: 18px;
-        cursor: pointer;
-      }
-    }
-  }
-
-  .el-main {
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-  }
-
-}
diff --git a/admin/src/components/home.vue b/admin/src/components/home.vue
new file mode 100644
index 0000000..ee8cd2e
--- /dev/null
+++ b/admin/src/components/home.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="home">
+    <el-card>
+      <h1 class="text-center">网站正在建设中</h1>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "home"
+  }
+</script>
+
+<style lang="scss" scoped>
+  .home {
+    padding-top: 20px;
+    max-width: 1200px;
+    margin: auto!important;
+  }
+</style>
diff --git a/admin/src/main.js b/admin/src/main.js
index 0d85453..352598a 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -4,17 +4,22 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import ElementUI from 'element-ui';
+import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 import axios from 'axios';
 import VueAxios from 'vue-axios';
-import Glob from './assets/js/glob.js';
-import 'element-ui/lib/theme-chalk/index.css';
 import './assets/css/reset.css';
+import 'element-ui/lib/theme-chalk/index.css';
+import 'bootstrap/dist/css/bootstrap.css';
+import 'bootstrap-vue/dist/bootstrap-vue.css';
 import './assets/scss/glob.scss';
 import './assets/scss/element-variables.scss';
+import Glob from './assets/js/glob.js';
 
 //use
 Vue.config.productionTip = false;
 Vue.use(ElementUI);
+Vue.use(BootstrapVue);
+Vue.use(IconsPlugin);
 Vue.use(VueAxios, axios);
 //init
 Glob.inti();
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 1e89130..e84188b 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -5,10 +5,10 @@ Vue.use(Router)
 
 export default new Router({
   routes: [
-    // {
-    //   path: '/',
-    //   name: 'HelloWorld',
-    //   component: HelloWorld
-    // }
+    {
+      path: '/',
+      name: 'home',
+      component: () => import('../components/home'),
+    }
   ]
 })