From b17e39304766bdd9c5b2e2cabaef995847fae299 Mon Sep 17 00:00:00 2001 From: Lu Chaohai Date: Wed, 26 Dec 2018 17:22:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0elementUI=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 54824e04f0c909a889a632cb24bdb8fae65d3ca8 [formerly 54824e04f0c909a889a632cb24bdb8fae65d3ca8 [formerly 54824e04f0c909a889a632cb24bdb8fae65d3ca8 [formerly 54824e04f0c909a889a632cb24bdb8fae65d3ca8 [formerly 7199419e32743a3e9160ee952739c3a38d19c825 [formerly 6dc8c5fb0842b0bca62fb5273d2d16333b6e64b8]]]]] Former-commit-id: 5bd691722a41eaf11573af763fafdc59c2d680d8 Former-commit-id: 664be2b981e2f506468b53f1712f6842c1b67cd5 Former-commit-id: c6ef13ef8a82e7339d03c247bb6a1431a8a8c53e [formerly 2caabfcfc06967f2e14f1257fc78f57d29417313] Former-commit-id: 0d18eebd6d05f911bf81ec48f9a284053176db96 Former-commit-id: cec9589a2659ae878bd2e1d89942f647eba73fcf Former-commit-id: b0b6f7486a22685e5494a6c86dd7e81458c94d64 Former-commit-id: 750bf2dda0a41fc39f21a73c188f63ffcc73d65e Former-commit-id: 1527692ed03683279c837a40ca9bd75c73ebdf75 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f446025a..025ed2d7 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "countup.js": "^1.9.3", "dayjs": "^1.6.7", "echarts": "^4.1.0", - "element-ui": "^2.4.4", + "element-ui": "^2.4.11", "flex.css": "^1.1.7", "fuse.js": "^3.2.1", "github-markdown-css": "^2.10.0", From cdec7a41d5b5b9ab7a1d398001221d40658fcf2f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 9 Jan 2019 21:02:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AE=80=E5=8C=96=20router.afterEach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: e37d5a155c9772de29bb647221ff993a887e8185 [formerly e37d5a155c9772de29bb647221ff993a887e8185 [formerly e37d5a155c9772de29bb647221ff993a887e8185 [formerly e37d5a155c9772de29bb647221ff993a887e8185 [formerly 6a3490d46f5c9595d09741deaee5b34796c61903 [formerly 3beb1c13ee2af49c2975ac8aadd8e413f0d29135]]]]] Former-commit-id: 9de1022cc43b80005315f4703b68a8c9109f1599 Former-commit-id: 18eda686d55ee9c57e0b9d6bbaead557964429b1 Former-commit-id: bedb6aad72568401b68f5baac479b2045400ff51 [formerly 6a1a7179f6c3fa06df2ac841b5ac6bc0f98e3106] Former-commit-id: 9596207321ac05ac6a6ed7e2a023ca000cf1d935 Former-commit-id: cd3d9dd322990590d041a377da52e5a9b7bde1d4 Former-commit-id: a12fba441335abda4eced39599f044ac1e80e930 Former-commit-id: c2b52d201954573792f7c38711fa2a3eb89df6a3 Former-commit-id: 033910146e8809daf5aa73d93090e6b6c738098d --- src/router/index.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index cb588ddb..41763cd5 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,16 +53,13 @@ router.beforeEach((to, from, next) => { } }) -router.afterEach(to => { +router.afterEach(({ name, params, query, fullPath, meta }) => { // 进度条 NProgress.done() - // 需要的信息 - const app = router.app - const { name, params, query, fullPath } = to // 多页控制 打开新的页面 - app.$store.dispatch('d2admin/page/open', { name, params, query, fullPath }) + store.dispatch('d2admin/page/open', { name, params, query, fullPath }) // 更改标题 - util.title(to.meta.title) + util.title(meta.title) }) export default router From f4e21c21065934ed282d8c9dad10a6feade55f0c Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 9 Jan 2019 21:10:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 0170af60406756d8c145f8b9af5abf625740fb42 [formerly 0170af60406756d8c145f8b9af5abf625740fb42 [formerly 0170af60406756d8c145f8b9af5abf625740fb42 [formerly 0170af60406756d8c145f8b9af5abf625740fb42 [formerly 6e2e948a0fc5d8fb4cf882643d73b0336c553c88 [formerly 6cfc342a4057a7a5b5936964a9be9279909f621f]]]]] Former-commit-id: 62af7ef804b4be0825b0005f475c2902a2eba013 Former-commit-id: 903c41cd1f30444cb99990c18ebb525922bf1a54 Former-commit-id: d864cb60e9c48046f7001300d5cbb87fcf64119d [formerly 83153bdb0ba2d30bab1abeeb7c0d969cbf25cfa0] Former-commit-id: 8d201035ecafac579186e5a8571d55595bf0fa6f Former-commit-id: 939f19e446a9694cbb5d89d280a6ff390f8f9482 Former-commit-id: c3c58b8982ccac7c8c410e672e8e2f71e8de6501 Former-commit-id: 4fef8192adc04c6a80232d806411c573c4a7fc1d Former-commit-id: f5ab055ae3c77c5790eebab995d4d21de4e4bf8e --- src/router/index.js | 6 +++--- src/store/modules/d2admin/modules/page.js.REMOVED.git-id | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 41763cd5..05536f7f 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,13 +53,13 @@ router.beforeEach((to, from, next) => { } }) -router.afterEach(({ name, params, query, fullPath, meta }) => { +router.afterEach((to) => { // 进度条 NProgress.done() // 多页控制 打开新的页面 - store.dispatch('d2admin/page/open', { name, params, query, fullPath }) + store.dispatch('d2admin/page/open', to) // 更改标题 - util.title(meta.title) + util.title(to.meta.title) }) export default router 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 6a2fbe52..49b142e9 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 @@ -662a8892e61c7d979c416032c9a8ea91ebdc5e12 \ No newline at end of file +d4654c5862cfee5616a6cd51013c7ce2cdeeef46 \ No newline at end of file