From 9cb148e700fc135c0e7de734123e91ab32b88872 Mon Sep 17 00:00:00 2001
From: yoe <yoe0405@163.com>
Date: Thu, 7 May 2020 17:07:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                                      | 6 +++---
 package.json                                           | 2 +-
 src/router/index.js                                    | 2 +-
 src/views/{ => layout}/main-content.vue                | 0
 src/views/{ => layout}/main-navbar-update-password.vue | 0
 src/views/{ => layout}/main-navbar.vue                 | 0
 src/views/{ => layout}/main-sidebar-sub-menu.vue       | 0
 src/views/{ => layout}/main-sidebar.vue                | 0
 src/views/{ => layout}/main.vue                        | 2 +-
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename src/views/{ => layout}/main-content.vue (100%)
 rename src/views/{ => layout}/main-navbar-update-password.vue (100%)
 rename src/views/{ => layout}/main-navbar.vue (100%)
 rename src/views/{ => layout}/main-sidebar-sub-menu.vue (100%)
 rename src/views/{ => layout}/main-sidebar.vue (100%)
 rename src/views/{ => layout}/main.vue (97%)

diff --git a/package-lock.json b/package-lock.json
index 910c291..0bb4ca3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3876,9 +3876,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz",
-      "integrity": "sha512-LABKHKGUyewFNvpf9BQLecB659Wq0XYvyP1tBveZ4RWpdlPSylDfGW/RLvDYU7zuCBoRasdZAz7ryjOwq1lLNg==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.1.tgz",
+      "integrity": "sha512-jyvJmXa2c6ElRc4NOw4V1vnjHsvfzTRhbwElZ68CyF9by2F64B+AJRzujg/HJgXCimHwd2g1Av9D04EP3mWymg==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
diff --git a/package.json b/package.json
index 946a1f4..48a69c6 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "axios": "^0.19.2",
     "babel-plugin-component": "0.10.1",
     "babel-polyfill": "6.26.0",
-    "element-ui": "2.8.2",
+    "element-ui": "^2.13.1",
     "gulp": "3.9.1",
     "gulp-concat": "2.6.1",
     "gulp-load-plugins": "1.5.0",
diff --git a/src/router/index.js b/src/router/index.js
index be7d959..10f75f0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,7 @@ const globalRoutes = [
 // 主入口路由(需嵌套上左右整体布局)
 const mainRoutes = {
   path: '/',
-  component: _import('main'),
+  component: _import('layout/main'),
   name: 'main',
   redirect: { name: 'home' },
   meta: { title: '主入口整体布局' },
diff --git a/src/views/main-content.vue b/src/views/layout/main-content.vue
similarity index 100%
rename from src/views/main-content.vue
rename to src/views/layout/main-content.vue
diff --git a/src/views/main-navbar-update-password.vue b/src/views/layout/main-navbar-update-password.vue
similarity index 100%
rename from src/views/main-navbar-update-password.vue
rename to src/views/layout/main-navbar-update-password.vue
diff --git a/src/views/main-navbar.vue b/src/views/layout/main-navbar.vue
similarity index 100%
rename from src/views/main-navbar.vue
rename to src/views/layout/main-navbar.vue
diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/layout/main-sidebar-sub-menu.vue
similarity index 100%
rename from src/views/main-sidebar-sub-menu.vue
rename to src/views/layout/main-sidebar-sub-menu.vue
diff --git a/src/views/main-sidebar.vue b/src/views/layout/main-sidebar.vue
similarity index 100%
rename from src/views/main-sidebar.vue
rename to src/views/layout/main-sidebar.vue
diff --git a/src/views/main.vue b/src/views/layout/main.vue
similarity index 97%
rename from src/views/main.vue
rename to src/views/layout/main.vue
index 2d123d4..d096d71 100644
--- a/src/views/main.vue
+++ b/src/views/layout/main.vue
@@ -18,7 +18,7 @@
   import MainNavbar from './main-navbar'
   import MainSidebar from './main-sidebar'
   import MainContent from './main-content'
-  import { apiGetUserInfo } from '../api/api_user'
+  import { apiGetUserInfo } from '../../api/api_user'
 
   export default {
     provide () {