From 7c12c1949932d687ecfecaa42ec646d5cc361940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=80=9D=E7=BB=B4=E7=A9=BA=E9=97=B4?= <dnyz520@126.com>
Date: Fri, 7 Dec 2018 14:25:06 +0800
Subject: [PATCH 1/2] Update page.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关闭不缓存页面时将导致findIndex返回-1,从而影响到可能需要缓存的页面.

Former-commit-id: b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly b0885d788213c933368ed96896ebb80e0bfc57f5 [formerly daa045df580eea9044533854db79c4e1d2df8e81 [formerly 2376d2ff14a8d7f390957e7fc188ef969c95e233]]]]]
Former-commit-id: d96a65bf3fce18605161d186097966b5f03171c9
Former-commit-id: a20a3689e188b55e6b559bdab3706d66bc502bda
Former-commit-id: d9703316b304cbc1c67492cecd3de57252865861 [formerly 0535a169e91d3af3104f0e0ad6ca5e81de09e909]
Former-commit-id: e7eef6f66b4867bbc28ae2e369f3bfeebe213391
Former-commit-id: fd23177aa47c13b7d28e253ede8cf0e9e2f482fd
Former-commit-id: 7ef86e92237fb24d70eee9f79729b580125c909d
Former-commit-id: c608e97d7e6687a0ab67d17c750f736cf512136a
Former-commit-id: 67df9fdb44662647029a97be4f23c0277c799f60
---
 src/store/modules/d2admin/modules/page.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
index b42d384d..6a2fbe52 100644
--- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
@@ -1 +1 @@
-033fcecc7eeff02cfda00a5ded8a23cb359855f1
\ No newline at end of file
+662a8892e61c7d979c416032c9a8ea91ebdc5e12
\ No newline at end of file

From 00d9b3dba8bc91edfe66e091da85c55f60745301 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 8 Dec 2018 18:52:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?module=20index=20=E5=92=8C=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=BD=BF=E7=94=A8=E7=9B=B8=E5=90=8C=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly 2f76399b0b5aaf322a6cebd3568b4548c36c2cdf [formerly e996a77cf10a373f0e0d81721424667dca65af31] [formerly e996a77cf10a373f0e0d81721424667dca65af31 [formerly 6c1273298c08f1b9cf2505992ac7b6f0de8e4588 [formerly f64555e2dd133fe8d1b61c4502c91bdc546171e2]]]]]
Former-commit-id: aaec64a1729363181302bb856fcbe64e243f9871
Former-commit-id: 5cfded1e6acf2610eb1dc9ca11f84fcee0def4ab
Former-commit-id: 6db2d4d93f7809ff59f36381d18e660d74f73d4c [formerly 73a93e0b15176202f143a9a57794370a58d0f9cf]
Former-commit-id: 626c50b4a567eb2621e7e071aa24aa274b4d8dd4
Former-commit-id: 3f89e6c8f9e483b8b6cbab944cff1b808db6e4ef
Former-commit-id: 5d356777464c6aa5ff849c622c87ccbbc3831249
Former-commit-id: c01dae77899fdf8a5f12c0edd1d369458ccd767b
Former-commit-id: 611bd3819a80713ab49e28f4bb609eaac1f3bf01
---
 .../d2-module-index-menu/components/item.vue        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/d2-module-index-menu/components/item.vue b/src/components/d2-module-index-menu/components/item.vue
index 2331066d..957c88a2 100644
--- a/src/components/d2-module-index-menu/components/item.vue
+++ b/src/components/d2-module-index-menu/components/item.vue
@@ -1,24 +1,21 @@
 <template>
   <el-button
     class="d2-module-index-menu-item"
-    @click="handleClick">
+    @click="handleMenuSelect(menu.path)">
     {{menu.title}}
   </el-button>
 </template>
 
 <script>
+import mixinMenu from '@/layout/header-aside/components/mixin/menu'
 export default {
+  mixins: [
+    mixinMenu
+  ],
   props: {
     menu: {
       default: () => ({})
     }
-  },
-  methods: {
-    handleClick () {
-      if (this.menu.path) {
-        this.$router.push(this.menu.path)
-      }
-    }
   }
 }
 </script>