From ae77c0c3a62aabbd5ffbe4959d9c80b651454e97 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 25 Jul 2018 09:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: c06ec731df4ebabb8f92d7f58c85026f0b8d4e63 [formerly c06ec731df4ebabb8f92d7f58c85026f0b8d4e63 [formerly c06ec731df4ebabb8f92d7f58c85026f0b8d4e63 [formerly c06ec731df4ebabb8f92d7f58c85026f0b8d4e63 [formerly f87896139a0ff5e9d660be579a00a689e34869b6 [formerly 72b14f63ac6b26e0008ae35a517a3800849f4c90]]]]]
Former-commit-id: 680a71c339a582051a69ce8c4b6ba1c84d74eded
Former-commit-id: 1955936db382384afff7f6f01355a652eefaaed6
Former-commit-id: 16f9bde2e3f230f42992e28f710d52a949347641 [formerly 300a1b6309e6e8e54418e1f73ac729cc8e72bcbe]
Former-commit-id: d5aac544a68fcd70f2254ab39b0dab23287dd0fa
Former-commit-id: 80c4f0656d401a798b7facc3c483815764d637a9
Former-commit-id: 5e6938f6477be280aae8ea8459c1f7fc2d4ea3f7
Former-commit-id: 3748bca5b38b02dc217ad5b330eb38063e05e030
Former-commit-id: 5fcac22be6fc574d325f6a47d5d3d21b92a27104
---
 src/main.js                                 |  8 +++---
 src/pages/error-page-is-mobile/index.js     |  3 ---
 src/pages/error-page-is-mobile/page.vue     | 28 ---------------------
 src/router/routes.js.REMOVED.git-id         |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id |  2 +-
 5 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 src/pages/error-page-is-mobile/index.js
 delete mode 100644 src/pages/error-page-is-mobile/page.vue

diff --git a/src/main.js b/src/main.js
index 9c9689c5..37870c37 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,7 +42,7 @@ new Vue({
   render: h => h(App),
   created () {
     // 处理路由 得到每一级的路由设置
-    this.getAllTagFromRoutes()
+    this.getAllPageFromRoutes()
     // 设置顶栏菜单
     this.$store.commit('d2adminMenuHeaderSet', menuHeader)
   },
@@ -79,9 +79,9 @@ new Vue({
       }
     },
     /**
-     * 处理路由 得到每一级的路由设置
+     * 处理路由 得到所有的页面
      */
-    getAllTagFromRoutes () {
+    getAllPageFromRoutes () {
       const pool = []
       const push = function (routes) {
         routes.forEach(route => {
@@ -94,7 +94,7 @@ new Vue({
         })
       }
       push(frameInRoutes)
-      this.$store.commit('d2adminpagePoolSet', pool)
+      this.$store.commit('d2adminPagePoolSet', pool)
     }
   }
 }).$mount('#app')
diff --git a/src/pages/error-page-is-mobile/index.js b/src/pages/error-page-is-mobile/index.js
deleted file mode 100644
index ddb7de83..00000000
--- a/src/pages/error-page-is-mobile/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import page from './page'
-
-export default page
diff --git a/src/pages/error-page-is-mobile/page.vue b/src/pages/error-page-is-mobile/page.vue
deleted file mode 100644
index be1b921b..00000000
--- a/src/pages/error-page-is-mobile/page.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div class="page">
-    <img src="./image/icon@2x.png" class="icon">
-    <p class="title">系统暂未对移动设备提供支持</p>
-    <p class="sub-title">请使用PC访问</p>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
-.page {
-  @extend %full;
-  @extend %flex-center-col;
-  background-color: #EDF4FA;
-  .icon {
-    width: 42px;
-  }
-  .title {
-    font-size: 14px;
-    color: #35495E;
-  }
-  .sub-title {
-    font-size: 12px;
-    color: #35495E;
-    margin: 0px;
-  }
-}
-</style>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index fd63df07..ded1bbfb 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-66aff6c09897ee543f6688caff91a0f9b44cb869
\ No newline at end of file
+445093095b390adc31eff07060327bc7baaefb07
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index bc1d53dd..3afd8c33 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-78b98e947581eb460627c3091528a74b033a25c9
\ No newline at end of file
+2b2ad59e01ff445075c4b6d63e425cba12153aec
\ No newline at end of file