Merge branch 'hotfix/page' into develop

Former-commit-id: 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly db54af4fb10820f9de0e551f42d6f0c6c56ae35a [formerly fe50631d02c53628454fb5307a38b03afd25be72]]]]] Former-commit-id: 74292978506f3cdbcef6dfd123a4bc8194099319 Former-commit-id: f9c3dfee12e7a5fcfd3dd9d26720a4b5db290760 Former-commit-id: 5a4ebc59b7418a73cf4e16bca192412be442af71 [formerly 4f648425c3026c7b4266746e069ad47b6556b465] Former-commit-id: 99cd2d1da3766ca94ddbd3cab92da59ea92cf853 Former-commit-id: 3ed3c5e45656a3dc7a1f75877f2ba06f5f81bde4 Former-commit-id: b0b87e981c8bbcbb82f3a37fcc277a482aca0da9 Former-commit-id: a8a7218a60510186abd15b622d72b74e8c0556d9 Former-commit-id: d730a30170baebf0f5f9f73b458795317ee2bf24
2018-10-11 22:02:34 +08:00
parent 7cc3ac5425 9a71db1e9a
commit b1f00ed726
3 changed files with 2 additions and 14 deletions
--- 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",
--- a/src/pages/redirect/index.vue
+++ b/src/pages/redirect/index.vue
@@ -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>
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af
+d79a89504ddeac52db5b28d82df86395ace9be85