From 75d3f3ad1af7c9a7aade18c5b51f626ced173fb0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 11 Oct 2018 22:01:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E8=B7=B3?=
 =?UTF-8?q?=E6=9D=BF=E9=A1=B5=E9=9D=A2=20=E5=B0=86=E8=B7=B3=E6=9D=BF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=86=85=E5=AE=B9=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86=E8=B7=AF=E7=94=B1=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead [formerly 328841e1f2ff4271049c0e4c2c77f604c7233332 [formerly 6c3b24af9ef2ec9aad6bf1fc831b16d4ebc231dd]]]]]
Former-commit-id: c153ece15eda3b413e055ac3ae8af347057db453
Former-commit-id: 3e0edf37e1e214be30efbfeff7e1f1eb3f8f51e5
Former-commit-id: 34f2ac943279797cb342e0fd2fe3ff06109921b1 [formerly 4c3598b0e74a65f4204655b3505cdf3c937f8a5a]
Former-commit-id: 4154c7ac3541715222ebecd2e5410f21d9aa4549
Former-commit-id: 99ce56f09a90866c95f9f10b3bec03b24c063bbc
Former-commit-id: c7b9c3c1a532582129dcaf86d0ac2b649bb253ae
Former-commit-id: 934dd2574d65647f2dda8513ab6b0407beb44abf
Former-commit-id: eb2e21a4aa92d66aa65bff40d02f0f3a33e1b6f4
---
 src/pages/redirect/index.vue        | 12 ------------
 src/router/routes.js.REMOVED.git-id |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100755 src/pages/redirect/index.vue

diff --git a/src/pages/redirect/index.vue b/src/pages/redirect/index.vue
deleted file mode 100755
index c7aa86b84..000000000
--- a/src/pages/redirect/index.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-// 跳板页面
-export default {
-  beforeCreate () {
-    const path = this.$route.params.path
-    this.$router.replace(JSON.parse(path))
-  },
-  render: function (h) {
-    return h()
-  }
-}
-</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index fdb073b83..f65ea6753 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af
\ No newline at end of file
+d79a89504ddeac52db5b28d82df86395ace9be85
\ No newline at end of file

From 9a71db1e9aacb70771b4047f21377f5fd093d0bf Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 11 Oct 2018 22:02:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390 [formerly f8e59f0ecc0f7aa56214ff5b35701a056bac588b [formerly 3a3406ca479302a9ab3b3fc09f492a4671d4c2b9]]]]]
Former-commit-id: ad230e9793d0606fa52ccde66d335b9d261a82a1
Former-commit-id: e4dd106e54d4e8cbc7d6f5872e64e40d3ceb7882
Former-commit-id: 43e27e1f950ccc293ce7fba3a9d00a6f3875647b [formerly 7179d161626876b3511c377bd2825998390b3858]
Former-commit-id: 1184787e6ce40366072e716d52be16708af95ba8
Former-commit-id: 456206006320bda3d02f016fb12da8bea7e9aab8
Former-commit-id: 50e80936133369198caa9dc3967414c926017c4a
Former-commit-id: 032ad14d7e16d54e07a2e4517bb1e6cc5d2579ba
Former-commit-id: b17adac0a557190ea1b9aa5b2e6a1f7cd825fe56
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f950b8932..3ae839c78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",