Przeglądaj źródła

improve: 浮动菜单跳转//菜单展开闪烁

From-wh 2 lat temu
rodzic
commit
7ca5e03fe1

+ 7 - 1
template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="custom-bread-crumb">
     <Breadcrumb :style="{ fontSize: `${fontSize}px` }">
-      <BreadcrumbItem v-for="(item,index) in list" :key="`${item.path}`" :to="index !== 1 ? item.path : ''" v-if="listLast[0].path !== homePath">
+      <BreadcrumbItem
+        v-for="(item, index) in list"
+        :key="`${item.path}`"
+        :to="index !== 1 ? item.path : ''"
+        v-if="listLast[0].path !== homePath"
+      >
         <common-icon style="margin-right: 4px" :type="item.icon || ''" />
         {{ item.title }}
       </BreadcrumbItem>
@@ -65,6 +70,7 @@ export default {
 </script>
 <style lang="less">
 .ivu-breadcrumb-item-link {
+  font-weight: 400;
   .ivu-icon {
     line-height: 14px;
   }

+ 7 - 2
template/admin/src/components/main/components/side-menu/collapsed-menu.vue

@@ -43,6 +43,7 @@
 import mixin from './mixin';
 import itemMixin from './item-mixin';
 import { findNodeUpperByClasses } from '@/libs/util';
+import settings from '@/setting';
 
 export default {
   name: 'CollapsedMenu',
@@ -72,7 +73,12 @@ export default {
       this.$emit('on-click', name, this.activeMenuPath);
     },
     handClick(name) {
+      console.log(name, this.activeMenuPath);
       this.$emit('on-click', name, this.activeMenuPath);
+
+      // if (name == settings.routePre + '/home/') {
+      //   this.$emit('on-click', name, this.activeMenuPath);
+      // }
     },
     handleMousemove(event, children) {
       const { pageY } = event;
@@ -91,7 +97,7 @@ export default {
 @import './side-menu.less';
 
 /deep/ .collased-menu-dropdown {
-  width: 100%;
+  width: @side-width;
 }
 
 .child-menu {
@@ -108,7 +114,6 @@ export default {
   font-size: 14px;
   line-height: 14px;
   padding: 14px 20px;
-
 }
 .ivu-dropdown-menu /deep/ .ivu-dropdown-item {
   width: 140px !important;

+ 2 - 0
template/admin/src/components/main/components/side-menu/side-menu.vue

@@ -229,6 +229,7 @@ export default {
 @import './side-menu.less';
 .ivu-layout-sider {
   overflow: unset !important;
+  transition: all 0.3s ease !important;
 }
 .ivu-menu {
   .side-menu-wrapper {
@@ -415,6 +416,7 @@ export default {
   left: 95px !important;
 }
 .menu-collapsed {
+  width: @side-width;
   .side-menu-wrapper a.drop-menu-a {
     display: flex;
     align-items: center;

+ 1 - 0
template/admin/src/components/main/components/tags-nav/tags-nav.less

@@ -21,6 +21,7 @@
   margin-bottom: 14px;
   background-color: #fff;
   box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.06);
+  z-index: 8;
 }
 .tags-nav {
   position: relative;

+ 1 - 1
template/admin/src/components/main/components/tags-nav/tags-nav.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="tags-nav">
     <div class="close-con">
-      <Dropdown transfer @on-click="handleTagsOption" style="margin-top: 7px">
+      <Dropdown transfer @on-click="handleTagsOption" style="margin-top: 10px">
         <Button size="small" type="text">
           <Icon :size="18" type="ios-close-circle-outline" />
         </Button>

+ 6 - 3
template/admin/src/router/modules/frameOut.js

@@ -8,14 +8,14 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +---------------------------------------------------------------------
 
-import setting  from '@/setting'
+import setting from '@/setting';
 let routePre = setting.routePre;
 const pre = 'kefu_';
 
 export default [
   // 登录
   {
-    path: routePre+'/login',
+    path: routePre + '/login',
     name: 'login',
     meta: {
       title: '登录',
@@ -25,13 +25,16 @@ export default [
   },
   // 客服
   {
-    path: '/kefu',
+    path: routePre + '/kefu',
     name: `${pre}index`,
     meta: {
       auth: true,
       title: '客服管理',
       kefu: true,
     },
+    redirect: {
+      name: `setting_service`,
+    },
     component: () => import('@/pages/kefu/index'),
   },
   {

+ 11 - 3
template/admin/src/router/modules/setting.js

@@ -9,7 +9,7 @@
 // +---------------------------------------------------------------------
 
 import BasicLayout from '@/components/main';
-import setting  from '@/setting'
+import setting from '@/setting';
 let routePre = setting.routePre;
 
 const meta = {
@@ -19,11 +19,11 @@ const meta = {
 const pre = 'setting_';
 
 export default {
-  path: routePre+'/setting',
+  path: routePre + '/setting',
   name: 'setting',
   header: 'setting',
   redirect: {
-    name: `${pre}systemRole`,
+    name: `${pre}setSystem`,
   },
   component: BasicLayout,
   children: [
@@ -385,6 +385,14 @@ export default {
       },
       component: () => import('@/pages/setting/themeStyle/index'),
     },
+    {
+      path: 'pages',
+      name: `${pre}page`,
+      header: 'setting',
+      redirect: {
+        name: `${pre}devise`,
+      },
+    },
     {
       path: 'pages/devise',
       name: `${pre}devise`,