From 2c37287d94d0d22d112941ae15c4c4f2f76e3fec Mon Sep 17 00:00:00 2001
From: LightZhang <978854603@qq.com>
Date: Sun, 28 Oct 2018 20:00:56 +0800
Subject: [PATCH] s

---
 src/assets/static/config.js                  |  4 ++--
 src/component.js                             | 12 ++++++------
 src/components/i_content.vue                 |  0
 src/components/icontent.vue                  | 19 +++++++++++++++++++
 src/components/{i_footer.vue => ifooter.vue} |  0
 src/components/{i_head.vue => ihead.vue}     |  0
 src/main.js                                  |  2 +-
 src/router.js                                |  2 +-
 src/views/aboutUs/cooperateWithUs.vue        | 10 +++++++---
 src/views/aboutUs/propystTechnology.vue      |  6 +++---
 src/views/fulEdge/mobileSolution.vue         |  6 +++---
 src/views/fulEdge/other.vue                  |  6 +++---
 src/views/index.vue                          |  4 ++--
 src/views/infoDtl.vue                        |  6 +++---
 src/views/ourPlan/estateManagement.vue       |  6 +++---
 src/views/ourPlan/facilityManagement.vue     |  6 +++---
 src/views/ourPlan/iot.vue                    |  6 +++---
 src/views/ourPlan/reaEstate.vue              |  6 +++---
 src/views/ourPlan/technologyIntegration.vue  |  6 +++---
 19 files changed, 65 insertions(+), 42 deletions(-)
 delete mode 100644 src/components/i_content.vue
 create mode 100644 src/components/icontent.vue
 rename src/components/{i_footer.vue => ifooter.vue} (100%)
 rename src/components/{i_head.vue => ihead.vue} (100%)

diff --git a/src/assets/static/config.js b/src/assets/static/config.js
index fc1db30..b8b215d 100644
--- a/src/assets/static/config.js
+++ b/src/assets/static/config.js
@@ -47,11 +47,11 @@ window.config = {
             url: "/aboutUs",
             child: [{
                     name: "与我们合作",
-                    url: "/aboutUs/acooperateWithUs",
+                    url: "/aboutUs/cooperateWithUs",
                 },
                 {
                     name: "丙维科技",
-                    url: "/aboutUs/PropystTechnology",
+                    url: "/aboutUs/propystTechnology",
                 },
             ]
         },
diff --git a/src/component.js b/src/component.js
index 631b551..0e5daa1 100644
--- a/src/component.js
+++ b/src/component.js
@@ -1,16 +1,16 @@
 import Vue from 'vue'
-import i_head from './components/i_head.vue'
-import i_footer from './components/i_footer.vue'
-import i_content from './components/i_content.vue'
+import ihead from './components/ihead.vue'
+import ifooter from './components/ifooter.vue'
+import icontent from './components/icontent.vue'
 import leftMenu from './components/leftMenu.vue'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 
 class Component {
 
     register() {
-        Vue.component("i_head", i_head);
-        Vue.component("i_footer", i_footer);
-        Vue.component("i_content", i_content);
+        Vue.component("ihead", ihead);
+        Vue.component("ifooter", ifooter);
+        Vue.component("icontent", icontent);
         Vue.component("leftMenu", leftMenu);
         Vue.component("swiper", swiper);
         Vue.component("swiperSlide", swiperSlide);
diff --git a/src/components/i_content.vue b/src/components/i_content.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/icontent.vue b/src/components/icontent.vue
new file mode 100644
index 0000000..c00a1de
--- /dev/null
+++ b/src/components/icontent.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+        <slot></slot>
+  </div>
+
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/components/i_footer.vue b/src/components/ifooter.vue
similarity index 100%
rename from src/components/i_footer.vue
rename to src/components/ifooter.vue
diff --git a/src/components/i_head.vue b/src/components/ihead.vue
similarity index 100%
rename from src/components/i_head.vue
rename to src/components/ihead.vue
diff --git a/src/main.js b/src/main.js
index d910a85..d8358c0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,7 @@ import 'swiper/dist/css/swiper.css'
 
 import './assets/static/config.js'
 import './assets/static/jquery.js'
-import './assets/static/common.js'
+
 import 'es6-promise/auto'
 
 
diff --git a/src/router.js b/src/router.js
index 4eae070..276fa99 100644
--- a/src/router.js
+++ b/src/router.js
@@ -39,7 +39,7 @@ export default new Router({
     },
     {
       path: '/aboutUs',
-      component: facilityManagement,
+      component: cooperateWithUs,
       children: [
         { path: 'cooperateWithUs', component: cooperateWithUs },
         { path: 'propystTechnology', component: propystTechnology },
diff --git a/src/views/aboutUs/cooperateWithUs.vue b/src/views/aboutUs/cooperateWithUs.vue
index 9d7b711..73f8c4e 100644
--- a/src/views/aboutUs/cooperateWithUs.vue
+++ b/src/views/aboutUs/cooperateWithUs.vue
@@ -1,14 +1,18 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent>
+            
+
+
+        </icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/aboutUs/propystTechnology.vue b/src/views/aboutUs/propystTechnology.vue
index 9d7b711..25db7b1 100644
--- a/src/views/aboutUs/propystTechnology.vue
+++ b/src/views/aboutUs/propystTechnology.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/fulEdge/mobileSolution.vue b/src/views/fulEdge/mobileSolution.vue
index 9d7b711..25db7b1 100644
--- a/src/views/fulEdge/mobileSolution.vue
+++ b/src/views/fulEdge/mobileSolution.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/fulEdge/other.vue b/src/views/fulEdge/other.vue
index 9d7b711..25db7b1 100644
--- a/src/views/fulEdge/other.vue
+++ b/src/views/fulEdge/other.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/index.vue b/src/views/index.vue
index c3c2b83..4bdd826 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-	<i_head></i_head>
+	<ihead></ihead>
 <div class="banner">
 <swiper  ref="swiper" :options="swiperOption" >
     <swiper-slide v-for="banner in banners" :key="banner.img" >
@@ -46,7 +46,7 @@
 			<router-link :to="product.url">	</router-link>
 		</div>
 	</div>
-		<i_footer></i_footer>
+		<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/infoDtl.vue b/src/views/infoDtl.vue
index 9d7b711..25db7b1 100644
--- a/src/views/infoDtl.vue
+++ b/src/views/infoDtl.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/ourPlan/estateManagement.vue b/src/views/ourPlan/estateManagement.vue
index 9d7b711..25db7b1 100644
--- a/src/views/ourPlan/estateManagement.vue
+++ b/src/views/ourPlan/estateManagement.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/ourPlan/facilityManagement.vue b/src/views/ourPlan/facilityManagement.vue
index 9d7b711..25db7b1 100644
--- a/src/views/ourPlan/facilityManagement.vue
+++ b/src/views/ourPlan/facilityManagement.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/ourPlan/iot.vue b/src/views/ourPlan/iot.vue
index 9d7b711..25db7b1 100644
--- a/src/views/ourPlan/iot.vue
+++ b/src/views/ourPlan/iot.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/ourPlan/reaEstate.vue b/src/views/ourPlan/reaEstate.vue
index 9d7b711..25db7b1 100644
--- a/src/views/ourPlan/reaEstate.vue
+++ b/src/views/ourPlan/reaEstate.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+      	<icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>
diff --git a/src/views/ourPlan/technologyIntegration.vue b/src/views/ourPlan/technologyIntegration.vue
index 9d7b711..940f5df 100644
--- a/src/views/ourPlan/technologyIntegration.vue
+++ b/src/views/ourPlan/technologyIntegration.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    	<i_head></i_head>
+    	<ihead></ihead>
 <div class="contentPage">
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<i_content></i_content>
+     <icontent></icontent>
 	</div>
 	</div>
-  	<i_footer></i_footer>
+  	<ifooter></ifooter>
   </div>
 
 </template>