Merge branch 'develop' into 'test'

src/components/Dialog/UserDialogWrap.js

@@ -73,6 +73,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showMoney: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -123,6 +127,7 @@ export default {
         {...updateVisible}
         customerId={this.customerId}
         visible={this.visible}
+        showMoney={this.showMoney}
         title={this.title}
         fullscreen={this.fullscreen}
         top={this.top}
@@ -146,6 +151,7 @@ export default {
         {...updateVisible}
         customerId={this.customerId}
         visible={this.visible}
+        showMoney={this.showMoney}
         title={this.title}
         fullscreen={this.fullscreen}
         top={this.top}

src/containers/layout/IconMenu/IconMenu.vue

@@ -122,30 +122,7 @@ export default {
   },
   data() {
     return {
-      menuList: [
-        {
-          path: '/OperLog',
-          name: '19',
-          meta: { title: '后台操作日志', icon: '' },
-        },
-        {
-          path: '/interface',
-          name: '27',
-          meta: { title: '接口管理', icon: '' },
-          children: [
-            {
-              path: '/interface/interfaceApp',
-              name: '29',
-              meta: { title: 'APP接口', icon: '' },
-            },
-            {
-              path: '/interface/interfaceManager',
-              name: '30',
-              meta: { title: '后台接口', icon: '' },
-            },
-          ],
-        },
-      ],
+      collectRouteList: [],
     };
   },
   computed: {
@@ -175,24 +152,35 @@ export default {
       );
       return item ? true : false;
     },
-    collectRouteList() {
-      if (
-        this.routers &&
-        this.routers.length &&
-        this.collectList &&
-        this.collectList.length
-      ) {
-        let item = this.collectList.map(item => {
-          let id = item.menuId;
-          return getFilterMenu(this.routers, id);
-        });
-        return item ? formatRouteLink(item) : null;
-      } else {
-        return null;
-      }
+    // collectRouteList() {
+    //   let list = this.collectList.map(item => {
+    //     let id = item.menuId;
+    //     return getFilterMenu(this.routers, id);
+    //   });
+    //   list = list.filter(item => !!item);
+    //   return list ? formatRouteLink(list) : null;
+    // },
+  },
+  watch: {
+    collectList(val) {
+      this.getCollectList(val);
     },
   },
+  mounted() {
+    this.getCollectList(this.collectList);
+  },
   methods: {
+    getCollectList(val) {
+      let list = val.map(item => {
+        let id = item.menuId;
+        return getFilterMenu(this.routers, id);
+      });
+      console.log(list);
+      list = list.filter(item => !!item);
+      console.log(list);
+
+      this.collectRouteList = list && list.length ? formatRouteLink(list) : [];
+    },
     clickHandle() {
       if (this.dashboardVisiable) {
         this.$router.go(-1);

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

@@ -2,8 +2,8 @@
   <div
     ref="MenuItem"
     :class="`MenuItem ${showSubMenus?'Selected':''}`"
-    @mouseenter="toggleSubmenus"
-    @mouseleave="toggleSubmenus"
+    @mouseenter="toggleSubmenus(true)"
+    @mouseleave="toggleSubmenus(false)"
   >
     <div
       class="IconMenu"
@@ -116,8 +116,8 @@ export default {
     }
   },
   methods: {
-    toggleSubmenus() {
-      this.showSubMenus = !this.showSubMenus;
+    toggleSubmenus(visiable) {
+      this.showSubMenus = visiable;
     },
     selectHandle() {
       if (typeof this.selectRouteMenu === 'function') {

src/store/modules/app/collect.js

@@ -35,7 +35,7 @@ const actions = {
     return addCollect({
       data: { ...entity, sortId: getters.collectList.length + 1 },
     }).then(res => {
-      commit(ADD_COLLECT_LIST, entity.menuId);
+      commit(ADD_COLLECT_LIST, Number(entity.menuId));
     });
   },
   delCollect({ commit }, entity) {