Merge branch 'develop' into 'test'

README.md

+# 多彩校园综合项目
+
+内含多个子项目`customerManage`,`baseManage`,`systemManage`,`operateManage`,`statisticsManage`,`deviceManage`,`smaproManage`.
+
 # 运维替换文件
 
 打包分别有 3 种模式

src/config/index.js

@@ -24,6 +24,7 @@ export const customerTypesOptions = [
   { label: '社区领导', value: '5' },
   { label: '学校领导', value: '6' },
   { label: '单位领导', value: '7' },
+  { label: '培训人员', value: '8'}
 ];
 
 export const customerSexOptions = [

src/containers/layout/IconMenu/components/MenuItem.vue

@@ -17,7 +17,7 @@
       <div class="IconMenu-name">{{ menuName }}</div>
     </div>
     <div
-      :class="`SubmenuBox ${showSubMenus?'show':''}`"
+      :class="{SubmenuBox: true, show: showSubMenus, scroll: needScroll}"
       :style="style"
       v-if="menuList && menuList.length"
     >
@@ -78,6 +78,7 @@
 <script>
 import LikeIcon from './LikeIcon';
 
+let timers = null;
 export default {
   name: 'MenuItem',
   components: { LikeIcon },
@@ -101,6 +102,7 @@ export default {
   data() {
     return {
       showSubMenus: false,
+      needScroll: false,
       style: '',
     };
   },
@@ -123,6 +125,19 @@ export default {
   methods: {
     toggleSubmenus(visiable) {
       this.showSubMenus = visiable;
+      if (visiable) {
+        // this.$nextTick(() => {
+        // });
+        timers = setTimeout(() => {
+          this.needScroll = visiable;
+        }, 280);
+      } else {
+        if (timers) {
+          clearTimeout(timers);
+          timers = null;
+        }
+        this.needScroll = visiable;
+      }
     },
     selectHandle() {
       if (typeof this.selectRouteMenu === 'function') {
@@ -173,9 +188,12 @@ export default {
     transition: all 0.28s ease-in-out;
     overflow: hidden;
     &.show {
-      max-height: 1000px;
+      max-height: 600px;
       height: auto;
     }
+    &.scroll {
+      overflow-y: auto;
+    }
     .Submenu-title {
       width: 560px;
       height: 30px;