Home Explore Help
Sign In
caimei365
/
caimei365-manager-ui
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

项目优化

yuwenjun1997 2 years ago
parent
34210f54d5
commit
4ebb0d10d8
33 changed files with 118 additions and 86 deletions
Unified View Show Diff Stats
  1. 1 0
      package.json
  2. 12 4
      pnpm-lock.yaml
  3. 3 1
      public/index.html
  4. 52 0
      src/components/AppLoading/index.vue
  5. 11 6
      src/layout/components/Sidebar/index.vue
  6. 9 4
      src/main.js
  7. 5 0
      src/permission.js
  8. 2 2
      src/router/modules/finance.js
  9. 2 2
      src/router/modules/keywordLibrary.js
  10. 2 2
      src/router/modules/product.js
  11. 3 3
      src/router/modules/sys.js
  12. 2 2
      src/router/modules/webPage.js
  13. 10 10
      src/router/modules/wechat.js
  14. 2 0
      src/store/modules/permission.js
  15. 1 1
      src/store/modules/user.js
  16. 0 0
      src/views/index.vue
  17. 0 3
      src/views/library/index.vue
  18. 1 1
      src/views/library/keyword/list.vue
  19. 0 3
      src/views/product/index.vue
  20. 0 3
      src/views/sys/menus/index.vue
  21. 0 3
      src/views/sys/roles/index.vue
  22. 0 3
      src/views/sys/users/index.vue
  23. 0 3
      src/views/web/index.vue
  24. 0 3
      src/views/wechat/caimei/article/index.vue
  25. 0 3
      src/views/wechat/caimei/index.vue
  26. 0 3
      src/views/wechat/caimei/menus/index.vue
  27. 0 3
      src/views/wechat/caimei/reply/index.vue
  28. 0 3
      src/views/wechat/caimei/text/index.vue
  29. 0 3
      src/views/wechat/hehe/article/index.vue
  30. 0 3
      src/views/wechat/hehe/index.vue
  31. 0 3
      src/views/wechat/hehe/menus/index.vue
  32. 0 3
      src/views/wechat/hehe/reply/index.vue
  33. 0 3
      src/views/wechat/hehe/text/index.vue

+ 1 - 0
package.json
View File 

@@ -35,6 +35,7 @@
 
     "screenfull": "4.2.0",
 
     "screenfull": "4.2.0",
 
     "script-loader": "0.7.2",
 
     "script-loader": "0.7.2",
 
     "sortablejs": "1.8.4",
 
     "sortablejs": "1.8.4",
 
+    "three-dots": "^0.3.2",
 
     "tui-editor": "1.3.3",
 
     "tui-editor": "1.3.3",
 
     "vue": "2.6.10",
 
     "vue": "2.6.10",
 
     "vue-count-to": "1.0.13",
 
     "vue-count-to": "1.0.13",

+ 12 - 4
pnpm-lock.yaml
View File 

@@ -47,6 +47,7 @@ specifiers:
 
   sortablejs: 1.8.4
 
   sortablejs: 1.8.4
 
   svg-sprite-loader: ^6.0.11
 
   svg-sprite-loader: ^6.0.11
 
   svgo: ^3.0.2
 
   svgo: ^3.0.2
 
+  three-dots: ^0.3.2
 
   tui-editor: 1.3.3
 
   tui-editor: 1.3.3
 
   vue: 2.6.10
 
   vue: 2.6.10
 
   vue-count-to: 1.0.13
 
   vue-count-to: 1.0.13
 
@@ -78,6 +79,7 @@ dependencies:
 
   screenfull: registry.npmmirror.com/screenfull/4.2.0
 
   screenfull: registry.npmmirror.com/screenfull/4.2.0
 
   script-loader: registry.npmmirror.com/script-loader/0.7.2
 
   script-loader: registry.npmmirror.com/script-loader/0.7.2
 
   sortablejs: registry.npmmirror.com/sortablejs/1.8.4
 
   sortablejs: registry.npmmirror.com/sortablejs/1.8.4
 
+  three-dots: registry.npmmirror.com/three-dots/0.3.2
 
   tui-editor: registry.npmmirror.com/tui-editor/1.3.3
 
   tui-editor: registry.npmmirror.com/tui-editor/1.3.3
 
   vue: registry.npmmirror.com/vue/2.6.10
 
   vue: registry.npmmirror.com/vue/2.6.10
 
   vue-count-to: registry.npmmirror.com/vue-count-to/1.0.13
 
   vue-count-to: registry.npmmirror.com/vue-count-to/1.0.13
 
@@ -119,7 +121,7 @@ devDependencies:
 
 packages:
 
 packages:
 
 
 
   github.com/adobe-webplatform/eve/eef80ed:
 
   github.com/adobe-webplatform/eve/eef80ed:
 
-    resolution: {commit: eef80ed, repo: git+ssh://git@github.com/adobe-webplatform/eve.git, type: git}
 
+    resolution: {tarball: https://codeload.github.com/adobe-webplatform/eve/tar.gz/eef80ed}
 
     name: eve
 
     name: eve
 
     version: 0.4.1
 
     version: 0.4.1
 
     dev: false
 
     dev: false
 
@@ -2118,7 +2120,7 @@ packages:
 
     version: 3.7.4
 
     version: 3.7.4
 
     dependencies:
 
     dependencies:
 
       '@types/eslint': registry.npmmirror.com/@types/eslint/8.21.1
 
       '@types/eslint': registry.npmmirror.com/@types/eslint/8.21.1
 
-      '@types/estree': registry.npmmirror.com/@types/estree/0.0.45
 
+      '@types/estree': registry.npmmirror.com/@types/estree/1.0.0
 
     dev: true
 
     dev: true
 
 
 
   registry.npmmirror.com/@types/eslint/8.21.1:
 
   registry.npmmirror.com/@types/eslint/8.21.1:
 
@@ -2126,7 +2128,7 @@ packages:
 
     name: '@types/eslint'
 
     name: '@types/eslint'
 
     version: 8.21.1
 
     version: 8.21.1
 
     dependencies:
 
     dependencies:
 
-      '@types/estree': registry.npmmirror.com/@types/estree/0.0.45
 
+      '@types/estree': registry.npmmirror.com/@types/estree/1.0.0
 
       '@types/json-schema': registry.npmmirror.com/@types/json-schema/7.0.11
 
       '@types/json-schema': registry.npmmirror.com/@types/json-schema/7.0.11
 
     dev: true
 
     dev: true
 
 
 
@@ -2140,7 +2142,6 @@ packages:
 
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz}
 
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz}
 
     name: '@types/estree'
 
     name: '@types/estree'
 
     version: 1.0.0
 
     version: 1.0.0
 
-    dev: false
 
 
 
   registry.npmmirror.com/@types/glob/7.2.0:
 
   registry.npmmirror.com/@types/glob/7.2.0:
 
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/glob/-/glob-7.2.0.tgz}
 
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/glob/-/glob-7.2.0.tgz}
 
@@ -16132,6 +16133,13 @@ packages:
 
       webpack: registry.npmmirror.com/webpack/4.46.0
 
       webpack: registry.npmmirror.com/webpack/4.46.0
 
     dev: true
 
     dev: true
 
 
 
+  registry.npmmirror.com/three-dots/0.3.2:
 
+    resolution: {integrity: sha512-N7JMhoCX+4mhgGWy4Hqy4PZ27shKwLRvaADn3YsK9+bImK5U/xA/woCUavehoHGrkNG3yyAzwQ6UnuFH0/yLVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/three-dots/-/three-dots-0.3.2.tgz}
 
+    name: three-dots
 
+    version: 0.3.2
 
+    engines: {node: '>=14'}
 
+    dev: false
 
+
 
   registry.npmmirror.com/throat/4.1.0:
 
   registry.npmmirror.com/throat/4.1.0:
 
     resolution: {integrity: sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/throat/-/throat-4.1.0.tgz}
 
     resolution: {integrity: sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/throat/-/throat-4.1.0.tgz}
 
     name: throat
 
     name: throat

+ 3 - 1
public/index.html
View File 

@@ -12,7 +12,9 @@
 
     <title><%= webpackConfig.name %></title>
 
     <title><%= webpackConfig.name %></title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app"></div>
 
+    <div id="app">
 
+      <div id="app-loading"></div>
 
+    </div>
 
     <!-- built files will be auto injected -->
 
     <!-- built files will be auto injected -->
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 52 - 0
src/components/AppLoading/index.vue
View File 

@@ -0,0 +1,52 @@
 
+<template>
 
+  <div class="app-container">
 
+    <img src="/favicon.svg" alt="">
 
+    <div class="dot-wrapper dot-carousel" />
 
+    <h2>采美管理系统</h2>
 
+  </div>
 
+</template>
 
+<script>
 
+export default {
 
+  data() {
 
+    return {}
 
+  }
 
+}
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+@use 'three-dots' with (
 
+  $dot-width: 16px,
 
+  $dot-height: 16px,
 
+  $dot-color: #e95504
 
+);
 
+
 
+.app-container {
 
+  width: 100vw;
 
+  height: 100vh;
 
+  position: absolute;
 
+  left: 0;
 
+  top: 0;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  flex-direction: column;
 
+  user-select: none;
 
+
 
+  .dot-wrapper {
 
+    margin: 32px 0;
 
+  }
 
+
 
+  img {
 
+    width: 128px;
 
+    height: 128px;
 
+    display: block;
 
+  }
 
+
 
+  h2 {
 
+    font-size: 32px;
 
+    font-weight: normal;
 
+    color: #666;
 
+    margin: 0;
 
+  }
 
+}
 
+</style>

+ 11 - 6
src/layout/components/Sidebar/index.vue
View File 

@@ -1,13 +1,14 @@
 
 <template>
 
 <template>
 
-  <div :class="{'has-logo':showLogo}">
 
+  <div :class="{ 'has-logo': showLogo }">
 
     <logo v-if="showLogo" :collapse="isCollapse" />
 
     <logo v-if="showLogo" :collapse="isCollapse" />
 
     <el-scrollbar wrap-class="scrollbar-wrapper">
 
     <el-scrollbar wrap-class="scrollbar-wrapper">
 
       <el-menu
 
       <el-menu
 
+        ref="menu"
 
         :default-active="activeMenu"
 
         :default-active="activeMenu"
 
         :collapse="isCollapse"
 
         :collapse="isCollapse"
 
         :background-color="variables.menuBg"
 
         :background-color="variables.menuBg"
 
         :text-color="variables.menuText"
 
         :text-color="variables.menuText"
 
-        :unique-opened="false"
 
+        :unique-opened="true"
 
         :active-text-color="variables.menuActiveText"
 
         :active-text-color="variables.menuActiveText"
 
         :collapse-transition="false"
 
         :collapse-transition="false"
 
         mode="vertical"
 
         mode="vertical"
 
@@ -27,10 +28,7 @@ import variables from '@/styles/variables.scss'
 
 export default {
 
 export default {
 
   components: { SidebarItem, Logo },
 
   components: { SidebarItem, Logo },
 
   computed: {
 
   computed: {
 
-    ...mapGetters([
 
-      'permission_routes',
 
-      'sidebar'
 
-    ]),
 
+    ...mapGetters(['permission_routes', 'sidebar']),
 
     activeMenu() {
 
     activeMenu() {
 
       const route = this.$route
 
       const route = this.$route
 
       const { meta, path } = route
 
       const { meta, path } = route
 
@@ -38,6 +36,13 @@ export default {
 
       if (meta.activeMenu) {
 
       if (meta.activeMenu) {
 
         return meta.activeMenu
 
         return meta.activeMenu
 
       }
 
       }
 
+      if (meta.hidden && route.redirectedFrom) {
 
+        return route.redirectedFrom
 
+      }
 
+      if (meta.hidden) {
 
+        const item = route.matched && route.matched.find((item) => item.redirect === route.path)
 
+        if (item) return item.path
 
+      }
 
       return path
 
       return path
 
     },
 
     },
 
     showLogo() {
 
     showLogo() {

+ 9 - 4
src/main.js
View File 

@@ -11,6 +11,7 @@ import './styles/element-variables.scss'
 
 import '@/styles/index.scss' // global css
 
 import '@/styles/index.scss' // global css
 
 
 
 import App from './App'
 
 import App from './App'
 
+import AppLoading from './components/AppLoading'
 
 import store from './store'
 
 import store from './store'
 
 import router from './router'
 
 import router from './router'
 
 
 
@@ -37,6 +38,12 @@ import permission from './directive/permission'
 
 //   mockXHR()
 
 //   mockXHR()
 
 // }
 
 // }
 
 
 
+Vue.config.productionTip = false
 
+
 
+// app loading
 
+const appLoading = new Vue({ render: (h) => h(AppLoading) })
 
+appLoading.$mount('#app-loading')
 
+
 
 Vue.use(Element, {
 
 Vue.use(Element, {
 
   size: Cookies.get('size') || 'medium' //, // set element-ui default size
 
   size: Cookies.get('size') || 'medium' //, // set element-ui default size
 
   // locale: enLang // 如果使用中文，无需设置，请删除
 
   // locale: enLang // 如果使用中文，无需设置，请删除
 
@@ -50,11 +57,9 @@ Object.keys(filters).forEach((key) => {
 
   Vue.filter(key, filters[key])
 
   Vue.filter(key, filters[key])
 
 })
 
 })
 
 
 
-Vue.config.productionTip = false
 
-
 
-new Vue({
 
-  el: '#app',
 
+const app = new Vue({
 
   router,
 
   router,
 
   store,
 
   store,
 
   render: (h) => h(App)
 
   render: (h) => h(App)
 
 })
 
 })
 
+app.$mount('#app')

+ 5 - 0
src/permission.js
View File 

@@ -18,6 +18,11 @@ router.beforeEach(async(to, from, next) => {
 
   document.title = getPageTitle(to.meta.title)
 
   document.title = getPageTitle(to.meta.title)
 
 
 
   // determine whether the user has logged in
 
   // determine whether the user has logged in
 
+  if (to.query.token) {
 
+    store.commit('user/SET_TOKEN', to.query.token)
 
+    delete to.query.token
 
+    next({ ...to })
 
+  }
 
   const hasToken = getToken()
 
   const hasToken = getToken()
 
 
 
   if (hasToken) {
 
   if (hasToken) {

+ 2 - 2
src/router/modules/finance.js
View File 

@@ -10,7 +10,7 @@ const financeRouter = {
 
   children: [
 
   children: [
 
     {
 
     {
 
       path: 'receipt',
 
       path: 'receipt',
 
-      component: () => import('@/views/finance/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/finance/receipt/list',
 
       redirect: '/finance/receipt/list',
 
       name: 'ReceiptManage',
 
       name: 'ReceiptManage',
 
       meta: { title: '收款列表', icon: 'documentation' },
 
       meta: { title: '收款列表', icon: 'documentation' },
 
@@ -33,7 +33,7 @@ const financeRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'receipts',
 
       path: 'receipts',
 
-      component: () => import('@/views/finance/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/finance/receipts/users',
 
       redirect: '/finance/receipts/users',
 
       name: 'ReceiptUserManage',
 
       name: 'ReceiptUserManage',
 
       meta: { title: '收款人权限', icon: 'documentation' },
 
       meta: { title: '收款人权限', icon: 'documentation' },

+ 2 - 2
src/router/modules/keywordLibrary.js
View File 

@@ -14,7 +14,7 @@ const keywordLibraryRouter = {
 
       path: 'keyword',
 
       path: 'keyword',
 
       name: 'KeywordMenu',
 
       name: 'KeywordMenu',
 
       redirect: '/library/keyword/list',
 
       redirect: '/library/keyword/list',
 
-      component: () => import('@/views/library/index'),
 
+      component: () => import('@/views/index'),
 
       meta: { title: '关键词统计' },
 
       meta: { title: '关键词统计' },
 
       children: [
 
       children: [
 
         {
 
         {
 
@@ -35,7 +35,7 @@ const keywordLibraryRouter = {
 
       path: 'tag',
 
       path: 'tag',
 
       name: 'TagMenu',
 
       name: 'TagMenu',
 
       redirect: '/library/tag/list',
 
       redirect: '/library/tag/list',
 
-      component: () => import('@/views/library/index'),
 
+      component: () => import('@/views/index'),
 
       meta: { title: '标签库', useDefault: true },
 
       meta: { title: '标签库', useDefault: true },
 
       children: [
 
       children: [
 
         {
 
         {

+ 2 - 2
src/router/modules/product.js
View File 

@@ -10,7 +10,7 @@ const productRouter = {
 
   children: [
 
   children: [
 
     {
 
     {
 
       path: 'product',
 
       path: 'product',
 
-      component: () => import('@/views/product/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/product/product/list',
 
       redirect: '/product/product/list',
 
       name: 'ProductManage',
 
       name: 'ProductManage',
 
       meta: { title: '商品管理', icon: 'documentation' },
 
       meta: { title: '商品管理', icon: 'documentation' },
 
@@ -40,7 +40,7 @@ const productRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'classify',
 
       path: 'classify',
 
-      component: () => import('@/views/product/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/product/classify/list',
 
       redirect: '/product/classify/list',
 
       name: 'ClassifyManage',
 
       name: 'ClassifyManage',
 
       meta: { title: '分类管理', icon: 'documentation' },
 
       meta: { title: '分类管理', icon: 'documentation' },

+ 3 - 3
src/router/modules/sys.js
View File 

@@ -12,7 +12,7 @@ const sysRouter = {
 
   children: [
 
   children: [
 
     {
 
     {
 
       path: 'menus',
 
       path: 'menus',
 
-      component: () => import('@/views/sys/menus/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/sys/menus/list',
 
       redirect: '/sys/menus/list',
 
       name: 'SysMenus',
 
       name: 'SysMenus',
 
       meta: { title: '菜单管理', icon: 'el-icon-menu' },
 
       meta: { title: '菜单管理', icon: 'el-icon-menu' },
 
@@ -42,7 +42,7 @@ const sysRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'roles',
 
       path: 'roles',
 
-      component: () => import('@/views/sys/roles/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/sys/roles/list',
 
       redirect: '/sys/roles/list',
 
       name: 'SysRoles',
 
       name: 'SysRoles',
 
       meta: { title: '角色管理', icon: 'lock' },
 
       meta: { title: '角色管理', icon: 'lock' },
 
@@ -72,7 +72,7 @@ const sysRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'users',
 
       path: 'users',
 
-      component: () => import('@/views/sys/users/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/sys/users/list',
 
       redirect: '/sys/users/list',
 
       name: 'SysUsers',
 
       name: 'SysUsers',
 
       meta: { title: '用户管理', icon: 'user' },
 
       meta: { title: '用户管理', icon: 'user' },

+ 2 - 2
src/router/modules/webPage.js
View File 

@@ -10,7 +10,7 @@ const webPageRouter = {
 
   children: [
 
   children: [
 
     {
 
     {
 
       path: 'page',
 
       path: 'page',
 
-      component: () => import('@/views/web/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/web/page/list',
 
       redirect: '/web/page/list',
 
       name: 'WebPages',
 
       name: 'WebPages',
 
       meta: { title: '页面管理', icon: 'documentation' },
 
       meta: { title: '页面管理', icon: 'documentation' },
 
@@ -40,7 +40,7 @@ const webPageRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'help',
 
       path: 'help',
 
-      component: () => import('@/views/web/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/web/help/list',
 
       redirect: '/web/help/list',
 
       name: 'HelpPages',
 
       name: 'HelpPages',
 
       meta: { title: '帮助页设置', icon: 'documentation' },
 
       meta: { title: '帮助页设置', icon: 'documentation' },

+ 10 - 10
src/router/modules/wechat.js
View File 

@@ -12,14 +12,14 @@ const wechatRouter = {
 
   children: [
 
   children: [
 
     {
 
     {
 
       path: 'caimei',
 
       path: 'caimei',
 
-      component: () => import('@/views/wechat/caimei/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/wechat/caimei/menus',
 
       redirect: '/wechat/caimei/menus',
 
       name: 'WeChatCaimei',
 
       name: 'WeChatCaimei',
 
       meta: { title: '采美网公众号', icon: 'component' },
 
       meta: { title: '采美网公众号', icon: 'component' },
 
       children: [
 
       children: [
 
         {
 
         {
 
           path: 'menus',
 
           path: 'menus',
 
-          component: () => import('@/views/wechat/caimei/menus/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/caimei/menus/list',
 
           redirect: '/wechat/caimei/menus/list',
 
           name: 'WeChatCmMenus',
 
           name: 'WeChatCmMenus',
 
           meta: { title: '菜单管理' },
 
           meta: { title: '菜单管理' },
 
@@ -49,7 +49,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'reply',
 
           path: 'reply',
 
-          component: () => import('@/views/wechat/caimei/reply/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/caimei/reply/list',
 
           redirect: '/wechat/caimei/reply/list',
 
           name: 'WeChatCmReply',
 
           name: 'WeChatCmReply',
 
           meta: { title: '回复配置' },
 
           meta: { title: '回复配置' },
 
@@ -79,7 +79,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'text',
 
           path: 'text',
 
-          component: () => import('@/views/wechat/caimei/text/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/caimei/text/list',
 
           redirect: '/wechat/caimei/text/list',
 
           name: 'WeChatCmText',
 
           name: 'WeChatCmText',
 
           meta: { title: '文本素材管理' },
 
           meta: { title: '文本素材管理' },
 
@@ -109,7 +109,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'article',
 
           path: 'article',
 
-          component: () => import('@/views/wechat/caimei/article/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/caimei/article/list',
 
           redirect: '/wechat/caimei/article/list',
 
           name: 'WeChatCmArticle',
 
           name: 'WeChatCmArticle',
 
           meta: { title: '图文素材管理' },
 
           meta: { title: '图文素材管理' },
 
@@ -141,14 +141,14 @@ const wechatRouter = {
 
     },
 
     },
 
     {
 
     {
 
       path: 'hehe',
 
       path: 'hehe',
 
-      component: () => import('@/views/wechat/hehe/index'),
 
+      component: () => import('@/views/index'),
 
       redirect: '/wechat/hehe/menus',
 
       redirect: '/wechat/hehe/menus',
 
       name: 'WeChatHehe',
 
       name: 'WeChatHehe',
 
       meta: { title: '呵呵商城公众号', icon: 'component' },
 
       meta: { title: '呵呵商城公众号', icon: 'component' },
 
       children: [
 
       children: [
 
         {
 
         {
 
           path: 'menus',
 
           path: 'menus',
 
-          component: () => import('@/views/wechat/hehe/menus/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/hehe/menus/list',
 
           redirect: '/wechat/hehe/menus/list',
 
           name: 'WeChatHeMenus',
 
           name: 'WeChatHeMenus',
 
           meta: { title: '菜单管理' },
 
           meta: { title: '菜单管理' },
 
@@ -178,7 +178,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'reply',
 
           path: 'reply',
 
-          component: () => import('@/views/wechat/hehe/reply/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/hehe/reply/list',
 
           redirect: '/wechat/hehe/reply/list',
 
           name: 'WeChatHeReply',
 
           name: 'WeChatHeReply',
 
           meta: { title: '回复配置' },
 
           meta: { title: '回复配置' },
 
@@ -208,7 +208,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'text',
 
           path: 'text',
 
-          component: () => import('@/views/wechat/hehe/text/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/hehe/text/list',
 
           redirect: '/wechat/hehe/text/list',
 
           name: 'WeChatHeText',
 
           name: 'WeChatHeText',
 
           meta: { title: '文本素材管理' },
 
           meta: { title: '文本素材管理' },
 
@@ -238,7 +238,7 @@ const wechatRouter = {
 
         },
 
         },
 
         {
 
         {
 
           path: 'article',
 
           path: 'article',
 
-          component: () => import('@/views/wechat/hehe/article/index'),
 
+          component: () => import('@/views/index'),
 
           redirect: '/wechat/hehe/article/list',
 
           redirect: '/wechat/hehe/article/list',
 
           name: 'WeChatHeArticle',
 
           name: 'WeChatHeArticle',
 
           meta: { title: '图文素材管理' },
 
           meta: { title: '图文素材管理' },

+ 2 - 0
src/store/modules/permission.js
View File 

@@ -33,6 +33,8 @@ export function filterAsyncRoutes(routes, menus) {
 
       if (!tmp.hidden) {
 
       if (!tmp.hidden) {
 
         tmp.meta.title = meun.title
 
         tmp.meta.title = meun.title
 
         tmp.sort = meun.sort
 
         tmp.sort = meun.sort
 
+      } else {
 
+        tmp.meta.hidden = true
 
       }
 
       }
 
       if (meun.icon) {
 
       if (meun.icon) {
 
         tmp.meta.icon = meun.icon
 
         tmp.meta.icon = meun.icon

+ 1 - 1
src/store/modules/user.js
View File 

@@ -15,6 +15,7 @@ const state = {
 
 const mutations = {
 
 const mutations = {
 
   SET_TOKEN: (state, token) => {
 
   SET_TOKEN: (state, token) => {
 
     state.token = token
 
     state.token = token
 
+    setToken(token)
 
   },
 
   },
 
   SET_USERID: (state, userId) => {
 
   SET_USERID: (state, userId) => {
 
     state.userId = userId
 
     state.userId = userId
 
@@ -54,7 +55,6 @@ const actions = {
 
         .then(response => {
 
         .then(response => {
 
           const { data } = response
 
           const { data } = response
 
           commit('SET_TOKEN', data.token)
 
           commit('SET_TOKEN', data.token)
 
-          setToken(data.token)
 
           resolve()
 
           resolve()
 
         })
 
         })
 
         .catch(error => {
 
         .catch(error => {

+ 0 - 0
src/views/finance/index.vue → src/views/index.vue
View File


+ 0 - 3
src/views/library/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 1 - 1
src/views/library/keyword/list.vue
View File 

@@ -45,7 +45,7 @@
 
       <el-table-column width="140" label="标签库状态" align="center">
 
       <el-table-column width="140" label="标签库状态" align="center">
 
         <template>未添加</template>
 
         <template>未添加</template>
 
       </el-table-column>
 
       </el-table-column>
 
-      <el-table-column label="操作" align="center">
 
+      <el-table-column label="操作" align="center" width="240">
 
         <template slot-scope="{ row }">
 
         <template slot-scope="{ row }">
 
           <el-button v-permission="'keyword:list:join'" type="primary" size="mini" @click="handleAddLibrary(row)">
 
           <el-button v-permission="'keyword:list:join'" type="primary" size="mini" @click="handleAddLibrary(row)">
 
             加入标签库
 
             加入标签库

+ 0 - 3
src/views/product/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/sys/menus/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/sys/roles/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/sys/users/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/web/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/caimei/article/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/caimei/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/caimei/menus/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/caimei/reply/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/caimei/text/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/hehe/article/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/hehe/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/hehe/menus/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/hehe/reply/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>

+ 0 - 3
src/views/wechat/hehe/text/index.vue
View File 

@@ -1,3 +0,0 @@
 
-<template>
 
-  <router-view />
 
-</template>