From cbed31eafd4404e9d584fb3ac1919f447ec77eca Mon Sep 17 00:00:00 2001
From: LightZhang <978854603@qq.com>
Date: Sun, 28 Oct 2018 19:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E9=97=9C=E4=BB=A3=E7=A2=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/static/config.js                 | 22 +++++-----
 src/components/leftMenu.vue                 |  2 +
 src/router.js                               | 48 +++++++++++++++++++--
 src/views/aboutUs/cooperateWithUs.vue       | 28 ++++++++++++
 src/views/aboutUs/propystTechnology.vue     | 28 ++++++++++++
 src/views/fulEdge/mobileSolution.vue        | 28 ++++++++++++
 src/views/fulEdge/other.vue                 | 28 ++++++++++++
 src/views/infoDtl.vue                       |  2 +-
 src/views/ourPlan/estateManagement.vue      |  2 +-
 src/views/ourPlan/facilityManagement.vue    |  2 +-
 src/views/ourPlan/iot.vue                   |  2 +-
 src/views/ourPlan/reaEstate.vue             |  2 +-
 src/views/ourPlan/technologyIntegration.vue |  2 +-
 13 files changed, 176 insertions(+), 20 deletions(-)

diff --git a/src/assets/static/config.js b/src/assets/static/config.js
index d919578..fc1db30 100644
--- a/src/assets/static/config.js
+++ b/src/assets/static/config.js
@@ -6,39 +6,39 @@ window.config = {
         },
         {
             name: "我们的方案",
-            url: "/facilityManagement",
+            url: "/ourPlan",
             child: [{
                     name: "设施管理",
-                    url: "/facilityManagement",
+                    url: "/ourPlan/facilityManagement",
                 },
                 {
                     name: "房地产",
-                    url: "/reaEstate",
+                    url: "/ourPlan/reaEstate",
                 },
                 {
                     name: "物业管理",
-                    url: "/estateManagement",
+                    url: "/ourPlan/estateManagement",
                 },
                 {
                     name: "系统智能建筑和物联网（iot）",
-                    url: "/iot",
+                    url: "/ourPlan/iot",
                 },
                 {
                     name: "技术和集成",
-                    url: "/technologyIntegration",
+                    url: "/ourPlan/technologyIntegration",
                 },
             ]
         },
         {
             name: "前沿",
-            url: "/mobileSolution",
+            url: "/fulEdge/mobileSolution",
             child: [{
                     name: "移动解决方案",
-                    url: "/mobileSolution",
+                    url: "/fulEdge/mobileSolution",
                 },
                 {
                     name: "其他",
-                    url: "/other",
+                    url: "/fulEdge/other",
                 }
             ]
         },
@@ -47,11 +47,11 @@ window.config = {
             url: "/aboutUs",
             child: [{
                     name: "与我们合作",
-                    url: "/acooperateWithUs",
+                    url: "/aboutUs/acooperateWithUs",
                 },
                 {
                     name: "丙维科技",
-                    url: "/PropystTechnology",
+                    url: "/aboutUs/PropystTechnology",
                 },
             ]
         },
diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue
index 6222375..64e5ed5 100644
--- a/src/components/leftMenu.vue
+++ b/src/components/leftMenu.vue
@@ -63,6 +63,8 @@
 
 </template>
 <script>
+import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/router.js b/src/router.js
index 535d0f4..4eae070 100644
--- a/src/router.js
+++ b/src/router.js
@@ -2,7 +2,23 @@ import Vue from 'vue'
 import Router from "vue-router"
 
 import index from './views/index'
-import infoDtl from './views/infoDtl'
+
+import cooperateWithUs from './views/aboutUs/cooperateWithUs'
+import propystTechnology from './views/aboutUs/propystTechnology'
+
+
+import mobileSolution from './views/fulEdge/mobileSolution'
+import other from './views/fulEdge/other'
+
+
+import estateManagement from './views/ourPlan/estateManagement'
+import facilityManagement from './views/ourPlan/facilityManagement'
+import iot from './views/ourPlan/iot'
+import reaEstate from './views/ourPlan/reaEstate'
+import technologyIntegration from './views/ourPlan/technologyIntegration'
+
+
+
 
 Vue.use(Router);
 
@@ -22,8 +38,34 @@ export default new Router({
       component: index
     },
     {
-      path: '/infoDtl',
-      component: infoDtl
+      path: '/aboutUs',
+      component: facilityManagement,
+      children: [
+        { path: 'cooperateWithUs', component: cooperateWithUs },
+        { path: 'propystTechnology', component: propystTechnology },
+
+      ]
     },
+    {
+      path: '/fulEdge',
+      component: mobileSolution,
+      children: [
+        { path: 'mobileSolution', component: mobileSolution },
+        { path: 'other', component: other },
+
+      ]
+    },
+    {
+      path: '/ourPlan',
+      component: estateManagement,
+      children: [
+        { path: 'estateManagement', component: estateManagement },
+        { path: 'facilityManagement', component: facilityManagement },
+        { path: 'iot', component: iot },
+        { path: 'reaEstate', component: reaEstate },
+        { path: 'technologyIntegration', component: technologyIntegration }
+       
+      ]
+    }
   ]
 })
diff --git a/src/views/aboutUs/cooperateWithUs.vue b/src/views/aboutUs/cooperateWithUs.vue
index e69de29..9d7b711 100644
--- a/src/views/aboutUs/cooperateWithUs.vue
+++ b/src/views/aboutUs/cooperateWithUs.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/aboutUs/propystTechnology.vue b/src/views/aboutUs/propystTechnology.vue
index e69de29..9d7b711 100644
--- a/src/views/aboutUs/propystTechnology.vue
+++ b/src/views/aboutUs/propystTechnology.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/fulEdge/mobileSolution.vue b/src/views/fulEdge/mobileSolution.vue
index e69de29..9d7b711 100644
--- a/src/views/fulEdge/mobileSolution.vue
+++ b/src/views/fulEdge/mobileSolution.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/fulEdge/other.vue b/src/views/fulEdge/other.vue
index e69de29..9d7b711 100644
--- a/src/views/fulEdge/other.vue
+++ b/src/views/fulEdge/other.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    	<i_head></i_head>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<i_content></i_content>
+	</div>
+	</div>
+  	<i_footer></i_footer>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/infoDtl.vue b/src/views/infoDtl.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/infoDtl.vue
+++ b/src/views/infoDtl.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/views/ourPlan/estateManagement.vue b/src/views/ourPlan/estateManagement.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/ourPlan/estateManagement.vue
+++ b/src/views/ourPlan/estateManagement.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/views/ourPlan/facilityManagement.vue b/src/views/ourPlan/facilityManagement.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/ourPlan/facilityManagement.vue
+++ b/src/views/ourPlan/facilityManagement.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/views/ourPlan/iot.vue b/src/views/ourPlan/iot.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/ourPlan/iot.vue
+++ b/src/views/ourPlan/iot.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/views/ourPlan/reaEstate.vue b/src/views/ourPlan/reaEstate.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/ourPlan/reaEstate.vue
+++ b/src/views/ourPlan/reaEstate.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {
diff --git a/src/views/ourPlan/technologyIntegration.vue b/src/views/ourPlan/technologyIntegration.vue
index 6c9a22d..9d7b711 100644
--- a/src/views/ourPlan/technologyIntegration.vue
+++ b/src/views/ourPlan/technologyIntegration.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import "../assets/css/content_pages.css";
+
 export default {
   data() {
     return {