From fedf6da3801def47a8d32c9db20cb8ac8f7ed354 Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Tue, 7 Jul 2020 18:47:30 +0800
Subject: [PATCH] =?UTF-8?q?menu=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue        |   6 +-
 src/layout/components/Sidebar/Logo.vue  |   9 +-
 src/layout/components/Sidebar/index.vue |   7 +-
 src/router/index.js                     |  26 ++++--
 src/router/modules/application.js       |  67 ++++++++------
 src/router/modules/logistics.js         |   2 +-
 src/router/modules/meta.js              |   2 +-
 src/router/modules/operations.js        |   2 +-
 src/router/modules/order.js             |   2 +-
 src/router/modules/prod.js              |   2 +-
 src/router/modules/recommend.js         |   2 +-
 src/router/modules/staff.js             |   2 +-
 src/router/modules/user.js              |   2 +-
 src/views/application/appManage.vue     | 154 +++++++++++++++++++++++---------
 14 files changed, 198 insertions(+), 87 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index df40ee7..2331833 100755
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
@@ -56,7 +56,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+// import Hamburger from '@/components/Hamburger'
 import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
@@ -66,7 +66,7 @@ import Search from '@/components/HeaderSearch'
 export default {
   components: {
     Breadcrumb,
-    Hamburger,
+    // Hamburger,
     ErrorLog,
     Screenfull,
     SizeSelect,
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 6715be8..155621b 100755
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -44,12 +44,17 @@ export default {
 
 .sidebar-logo-container {
   position: relative;
-  width: 100%;
+  // width: 100%;
+  width: 154px;
   height: 50px;
   line-height: 50px;
-  background: #2b2f3a;
+  // background: #2b2f3a;
+  background:rgb(48, 65, 86);
   text-align: center;
   overflow: hidden;
+  z-index: 1;
+  float:left;
+  margin-right:54px;
 
   & .sidebar-logo-link {
     height: 100%;
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index e8f7252..0e2c7a0 100755
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -11,7 +11,7 @@
       :collapse-transition="false"
       mode="horizontal"
     >
-      <el-menu-item v-for="route in permission_routes" :key="route.path">
+      <el-menu-item v-for="route in activeRoute" :key="route.path">
         <sidebar-item :key="route.path" :item="route" :base-path="route.path" />
       </el-menu-item>
 
@@ -33,6 +33,11 @@ export default {
       'permission_routes',
       'sidebar'
     ]),
+    activeRoute() {
+      return this.permission_routes.filter((route) => {
+        return !route.hidden
+      })
+    },
     activeMenu() {
       const route = this.$route
       const { meta, path } = route
diff --git a/src/router/index.js b/src/router/index.js
index 9cf0642..11f7839 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,12 +12,12 @@ import Layout from '@/layout'
 // import tableRouter from './modules/table'
 // import nestedRouter from './modules/nested'
 import userRouter from './modules/user'// 用户
-import systemRouter from './modules/system'// 系统设置
+// import systemRouter from './modules/system'// 系统设置
 import prodRouter from './modules/prod'// 产品
 import orderRouter from './modules/order'// 订单
 import metaRouter from './modules/meta'// 元定义
 // import sitesRouter from './modules/sites'
-import applicationRouter from './modules/application'// 应用
+// import applicationRouter from './modules/application'// 应用
 import operationsRouter from './modules/operations'// 运营官
 import logisticsRouter from './modules/logistics'// 物流路由
 import staffRouter from './modules/staff'// 员工
@@ -56,7 +56,8 @@ export const constantRoutes = [{
   hidden: true,
   children: [{
     path: '/redirect/:path*',
-    component: () => import('@/views/redirect/index')
+    component: () => import('@/views/redirect/index'),
+    hidden: true
   }]
 },
 {
@@ -98,7 +99,22 @@ export const constantRoutes = [{
       affix: true
     }
   }]
+},
+{
+  path: '/application',
+  component: Layout,
+  redirect: '/application',
+  children: [
+    {
+      path: 'appManage',
+      component: () => import('@/views/application/appManage'),
+      name: 'appManage',
+      meta: { title: '应用管理', icon: 'component', affix: true },
+      roles: ['admin', 'assistant']
+    }
+  ]
 }
+
 // {
 //   path: '/documentation',
 //   component: Layout,
@@ -190,7 +206,7 @@ export const asyncRoutes = [
   //   ]
   // },
   // tableRouter,
-  applicationRouter, // 应用
+  // applicationRouter, // 应用
   operationsRouter, // 运营官
   // manufacturerRouter,
   userRouter, // 用户
@@ -201,7 +217,7 @@ export const asyncRoutes = [
   recommendRouter, // 推荐
   metaRouter, // 元定义
   // sitesRouter,
-  systemRouter, // 系统设置
+  // systemRouter, // 系统设置
   // componentsRouter,
   // chartsRouter,
   // nestedRouter,
diff --git a/src/router/modules/application.js b/src/router/modules/application.js
index 45ff27b..3fa554b 100644
--- a/src/router/modules/application.js
+++ b/src/router/modules/application.js
@@ -3,34 +3,49 @@ import Layout from '@/layout'
 const applicationRouter = {
   path: '/application',
   component: Layout,
-  redirect: '/application/page',
+  redirect: '/application',
   alwaysShow: true, // will always show the root menu
-  name: 'Application',
-  meta: {
-    title: '应用',
-    icon: 'component',
-    roles: ['admin', 'assistant'] // you can set roles in root nav
-  },
-  children: [{
-    path: 'appManage',
-    component: () => import('@/views/application/appManage'), // 应用管理/添加
-    name: 'appManage',
-    meta: {
-      title: '应用管理',
-      icon: 'component',
-      roles: ['admin', 'assistant'] // or you can only set roles in sub nav
+  children: [
+    {
+      path: 'appManage',
+      name: 'appManage',
+      component: () => import('@/views/application/appManage'),
+      meta: { title: '应用管理', icon: 'component',
+        roles: ['admin', 'assistant'] }
     }
-  },
-  {
-    path: 'appList',
-    component: () => import('@/views/application/appList'), // 应用列表
-    name: 'appList',
-    meta: {
-      title: '应用列表',
-      icon: 'list',
-      roles: ['admin', 'assistant'] // or you can only set roles in sub nav
-    }
-  }
   ]
 }
+// const applicationRouter = {
+//   path: '/application',
+//   component: Layout,
+//   redirect: '/application',
+//   alwaysShow: true, // will always show the root menu
+//   name: 'Application',
+//   meta: {
+//     title: '应用',
+//     icon: 'component',
+//     roles: ['admin', 'assistant'] // you can set roles in root nav
+//   },
+//   children: [{
+//     path: 'appManage',
+//     component: () => import('@/views/application/appManage'), // 应用管理/添加
+//     name: 'appManage',
+//     meta: {
+//       title: '应用管理',
+//       icon: 'component',
+//       roles: ['admin', 'assistant'] // or you can only set roles in sub nav
+//     }
+//   },
+//   {
+//     path: 'appList',
+//     component: () => import('@/views/application/appList'), // 应用列表
+//     name: 'appList',
+//     meta: {
+//       title: '应用列表',
+//       icon: 'list',
+//       roles: ['admin', 'assistant'] // or you can only set roles in sub nav
+//     }
+//   }
+//   ]
+// }
 export default applicationRouter
diff --git a/src/router/modules/logistics.js b/src/router/modules/logistics.js
index df14fcd..9347ac9 100644
--- a/src/router/modules/logistics.js
+++ b/src/router/modules/logistics.js
@@ -4,7 +4,7 @@ const logisticsRouter = {
   path: '/logistics',
   component: Layout,
   redirect: '/logistics/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'logistics',
   meta: {
     title: '物流',
diff --git a/src/router/modules/meta.js b/src/router/modules/meta.js
index 0444b2e..5ddb9b2 100644
--- a/src/router/modules/meta.js
+++ b/src/router/modules/meta.js
@@ -4,7 +4,7 @@ const metaRouter = {
   path: '/meta',
   component: Layout,
   redirect: '/meta/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'Meta',
   meta: {
     title: '元定义',
diff --git a/src/router/modules/operations.js b/src/router/modules/operations.js
index 1f59b64..55703a7 100644
--- a/src/router/modules/operations.js
+++ b/src/router/modules/operations.js
@@ -4,7 +4,7 @@ const operationsRouter = {
   path: '/operations',
   component: Layout,
   redirect: '/operations/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'operations',
   meta: {
     title: '运营官',
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 48b0527..b37b742 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -6,7 +6,7 @@ const orderRouter = {
   path: '/orders',
   component: Layout,
   redirect: '/order/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'Order',
   meta: {
     title: 'orders',
diff --git a/src/router/modules/prod.js b/src/router/modules/prod.js
index 4ff042a..e406502 100644
--- a/src/router/modules/prod.js
+++ b/src/router/modules/prod.js
@@ -6,7 +6,7 @@ const prodRouter = {
   path: '/prod',
   component: Layout,
   redirect: '/prod/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'Prod',
   meta: {
     title: 'prods.prod_menu', // 会自动被i18n替换
diff --git a/src/router/modules/recommend.js b/src/router/modules/recommend.js
index b384d7b..9b7f8b3 100644
--- a/src/router/modules/recommend.js
+++ b/src/router/modules/recommend.js
@@ -4,7 +4,7 @@ const recommendRouter = {
   path: '/recommend',
   component: Layout,
   redirect: '/recommend/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'recommend',
   meta: {
     title: '推荐',
diff --git a/src/router/modules/staff.js b/src/router/modules/staff.js
index 86104dd..10325d6 100644
--- a/src/router/modules/staff.js
+++ b/src/router/modules/staff.js
@@ -4,7 +4,7 @@ const staffRouter = {
   path: '/staff',
   component: Layout,
   redirect: '/staff/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'staff',
   meta: {
     title: '员工',
diff --git a/src/router/modules/user.js b/src/router/modules/user.js
index 2554925..737df45 100644
--- a/src/router/modules/user.js
+++ b/src/router/modules/user.js
@@ -6,7 +6,7 @@ const chartsRouter = {
   path: '/users',
   component: Layout,
   redirect: '/users/page',
-  alwaysShow: true, // will always show the root menu
+  // alwaysShow: true, // will always show the root menu
   name: 'Users',
   meta: {
     title: 'users.people',
diff --git a/src/views/application/appManage.vue b/src/views/application/appManage.vue
index ba75ff5..e0d4cf0 100644
--- a/src/views/application/appManage.vue
+++ b/src/views/application/appManage.vue
@@ -1,51 +1,79 @@
 <template>
   <el-container class="app-container">
-    <el-header>
-      添加一个新应用（管理员不允许直接添加应用）
-    </el-header>
-    <el-main>
-      <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item label="app_name">
-          <el-input v-model="form.app_name" />
-        </el-form-item>
+    <el-aside width="250px" style="background-color: rgb(238, 241, 246)">
+      <el-menu :default-openeds="['1','2', '3']">
+        <el-menu-item index="1">
+          <template slot="title"><i class="el-icon-message" />应用管理</template>
+        </el-menu-item>
+        <el-submenu index="2">
+          <template slot="title"><i class="el-icon-message" />非常戴镜</template>
+          <el-menu-item v-for="(item,i) in nav_menu_data" :key="i" :index="item.name">{{ item.title }}</el-menu-item>
+        </el-submenu>
+        <el-submenu index="3">
+          <template slot="title"><i class="el-icon-menu" />亚当光学</template>
+          <el-menu-item index="2-1">产品列表</el-menu-item>
+          <el-menu-item index="2-2">订单列表</el-menu-item>
+          <el-menu-item index="2-3">用户列表</el-menu-item>
+          <el-menu-item index="2-4">运行分析</el-menu-item>
+        </el-submenu>
+        <el-submenu index="4">
+          <template slot="title"><i class="el-icon-setting" />秀野光学</template>
+          <el-menu-item index="3-1">产品列表</el-menu-item>
+          <el-menu-item index="3-2">订单列表</el-menu-item>
+          <el-menu-item index="3-3">用户列表</el-menu-item>
+          <el-menu-item index="3-4">运行分析</el-menu-item>
+        </el-submenu>
+      </el-menu>
+    </el-aside>
 
-        <el-form-item label="app_type">
-          <el-radio-group v-model="form.app_type">
-            <el-radio label="自建站" />
-            <el-radio label="自营小程序" />
-            <el-radio label="淘宝店" />
-            <el-radio label="微店" />
-            <el-radio label="亚马逊店" />
-            <el-radio label="易贝店" />
-            <el-radio label="拼多多店" />
-            <el-radio label="抖音店" />
-            <el-radio label="朋友圈店" />
-          </el-radio-group>
-        </el-form-item>
+    <el-container class="app-container">
+      <el-header>
+        添加一个新应用（管理员不允许直接添加应用）
+      </el-header>
+      <el-main>
+        <el-form ref="form" :model="form" label-width="120px">
+          <el-form-item label="app_name">
+            <el-input v-model="form.app_name" />
+          </el-form-item>
 
-        <el-form-item label="app_desc">
-          <el-input v-model="form.app_desc" type="textarea" />
-        </el-form-item>
-        <el-form-item label="app_api_key">
-          <el-input v-model="form.app_api_key" />
-        </el-form-item>
-        <el-form-item label="app_user_defined">
-          <el-input v-model="form.app_user_defined" />
-        </el-form-item>
+          <el-form-item label="app_type">
+            <el-radio-group v-model="form.app_type">
+              <el-radio label="自建站" />
+              <el-radio label="自营小程序" />
+              <el-radio label="淘宝店" />
+              <el-radio label="微店" />
+              <el-radio label="亚马逊店" />
+              <el-radio label="易贝店" />
+              <el-radio label="拼多多店" />
+              <el-radio label="抖音店" />
+              <el-radio label="朋友圈店" />
+            </el-radio-group>
+          </el-form-item>
 
-        <el-form-item label="app_area_defined">
-          <el-input v-model="form.app_area_defined" />
-        </el-form-item>
+          <el-form-item label="app_desc">
+            <el-input v-model="form.app_desc" type="textarea" />
+          </el-form-item>
+          <el-form-item label="app_api_key">
+            <el-input v-model="form.app_api_key" />
+          </el-form-item>
+          <el-form-item label="app_user_defined">
+            <el-input v-model="form.app_user_defined" />
+          </el-form-item>
 
-        <el-form-item label="app_lang_defined">
-          <el-input v-model="form.app_lang_defined" />
-        </el-form-item>
+          <el-form-item label="app_area_defined">
+            <el-input v-model="form.app_area_defined" />
+          </el-form-item>
 
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">添加</el-button>
-        </el-form-item>
-      </el-form>
-    </el-main>
+          <el-form-item label="app_lang_defined">
+            <el-input v-model="form.app_lang_defined" />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">添加</el-button>
+          </el-form-item>
+        </el-form>
+      </el-main>
+    </el-container>
   </el-container>
 </template>
 
@@ -61,12 +89,54 @@ export default {
         app_user_defined: '',
         app_area_defined: '',
         app_lang_defined: ''
-      }
+      },
+      activeName: 'second',
+      path: '',
+      nav_menu_data: [{
+        title: '产品列表',
+        name: 'appList'
+      }, {
+        title: '订单列表',
+        name: 'orderList'
+      }, {
+        title: '用户列表',
+        name: 'userList'
+      }, {
+        title: '运营分析',
+        name: 'analys'
+      }],
+      prodListTableData: [{
+        prodInfo: 'pic',
+        prodTag: '非常带劲',
+        stock: '102'
+      },
+      {
+        prodInfo: 'pic',
+        prodTag: '非常带劲',
+        stock: '4531'
+      },
+      {
+        prodInfo: 'pic',
+        prodTag: '非常带劲',
+        stock: '531'
+      },
+      {
+        prodInfo: 'pic',
+        prodTag: '非常带劲',
+        stock: '768'
+      }]
     }
   },
   methods: {
     onSubmit() {
       this.$message('submit!')
+    },
+    onRouteChanged() {
+      const that = this
+      that.path = that.$route.path
+    },
+    handleClick(tab, event) {
+      console.log(tab, event)
     }
   }
 }
-- 
2.0.0