官網更新

package-lock.json

@@ -2278,6 +2278,11 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "bootstrap": {
+      "version": "3.3.7",
+      "resolved": "http://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
+      "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",

package.json

@@ -8,6 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "bootstrap": "^3.3.7",
     "es6-promise": "^4.2.5",
     "vue": "^2.5.17",
     "vue-awesome-swiper": "^3.1.3",

src/assets/css/content_pages.css

@@ -6,7 +6,8 @@
 	vertical-align: top;
 	margin: 0 auto 0 auto;
 	padding-top: 7em;
-	min-height: 100vh;
+	height: 100vh;
+
 }
 
 /* CONTENT TABLES */
@@ -19,10 +20,10 @@
 }
 
 .contentTableRight {
-	width: 50%;
+	width: 75%;
 	padding-top: 3.5em;
 	padding-left: 4.0em;
-	padding-right: 12em;
+	padding-right: 4.0em;
 	vertical-align: top;
 }
 

src/components/icontent.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
+  <div class="contentTableRight bread">
-        <slot></slot>
+        <slot ></slot>
   </div>
 
 </template>
@@ -16,4 +16,8 @@ export default {
 </script>
 
 <style scoped>
+.contentTableRight
+{
+  display: table;
+}
 </style>

src/components/leftMenu.vue

@@ -56,4 +56,8 @@ export default {
 </script>
 
 <style scoped>
+.contentTableLeft {
+  display: table;
+  float: left;
+}
 </style>

src/main.js

@@ -1,3 +1,4 @@
+
 import './assets/css/cookieconsent.min.css'
 import './assets/css/common.css'
 import 'swiper/dist/css/swiper.css'

src/router.js

@@ -3,14 +3,16 @@ import Router from "vue-router"
 
 import index from './views/index'
 
+import aboutUs from './views/aboutUs/aboutUs'
 import cooperateWithUs from './views/aboutUs/cooperateWithUs'
 import propystTechnology from './views/aboutUs/propystTechnology'
 
 
+import fulEdge from './views/fulEdge/fulEdge'
 import mobileSolution from './views/fulEdge/mobileSolution'
 import other from './views/fulEdge/other'
 
-
+import ourPlan from './views/ourPlan/ourPlan'
 import estateManagement from './views/ourPlan/estateManagement'
 import facilityManagement from './views/ourPlan/facilityManagement'
 import iot from './views/ourPlan/iot'
@@ -23,6 +25,7 @@ import technologyIntegration from './views/ourPlan/technologyIntegration'
 Vue.use(Router);
 
 export default new Router({
+  mode: 'history',
   base: process.env.BASE_URL,
   routes: [
     {
@@ -39,8 +42,9 @@ export default new Router({
     },
     {
       path: '/aboutUs',
-      component: cooperateWithUs,
+      component: aboutUs,
       children: [
+        {  path:'/',component:cooperateWithUs,  },
         { path: 'cooperateWithUs', component: cooperateWithUs },
         { path: 'propystTechnology', component: propystTechnology },
 
@@ -48,8 +52,9 @@ export default new Router({
     },
     {
       path: '/fulEdge',
-      component: mobileSolution,
+      component: fulEdge,
       children: [
+        {  path:'/',component:mobileSolution,  },
         { path: 'mobileSolution', component: mobileSolution },
         { path: 'other', component: other },
 
@@ -57,8 +62,9 @@ export default new Router({
     },
     {
       path: '/ourPlan',
-      component: estateManagement,
+      component: ourPlan,
       children: [
+        {  path:'/',component:estateManagement,  },
         { path: 'estateManagement', component: estateManagement },
         { path: 'facilityManagement', component: facilityManagement },
         { path: 'iot', component: iot },

src/views/aboutUs/aboutUs.vue

@@ -5,7 +5,9 @@
 
 		<div class="contentTable">
 			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
+      	<icontent>
+              <router-view></router-view>
+          </icontent>
 	</div>
 	</div>
   	<ifooter></ifooter>

src/views/aboutUs/cooperateWithUs.vue

@@ -1,18 +1,35 @@
 <template>
-  <div>
+  <div >
-    	<ihead></ihead>
-<div class="contentPage">
 
-		<div class="contentTable">
+         <div class="row left">
-			<leftMenu>	</leftMenu>
+                      <div class="col-md-12">
-      	<icontent>
+                          <div class="col-md-5 col-sm-5 scrollpoint sp-effect1" style="padding:0px;">
-            
+                              <div class="form-group cav_contact_hello" style="text-align:left;">
+                                  <p class="nav_div"><label style="font-family:'Microsoft YaHei';font-weight:100;">您好</label><label style="font-family:'Microsoft YaHei';font-weight:100;"> &nbsp;&nbsp;HELLO!</label></p>
+                              </div>
+                              <div class="form-group cav_contact_div1" style="text-align:left">
+                                  感谢您来到上海丙維科技有限公司，若您有合作意向，请您用以下方式联系我们，我们为您提供真诚的服务，谢谢。
+                              </div>
+                          </div>
+                          
+                          <div class="col-md-6 col-sm-6 ">
+                              <ul class="cav_contact_ul">
+                                  <li style="padding-top:12px;">021-61166770</li>
+                                  <li style="padding-top:19px;">bimwe@bimwe.com</li>
+                                  <li style="padding-top:21px;">
+                                      上海市宝山区逸仙路
+                                  </li>
+                              </ul>
+                            
+                          </div>
+                      </div>
+          </div>
+
+             <div class="row right">
+                    <img width="100%" src="http://api.map.baidu.com/staticimage/v2?ak=y2qrobvV7OiT0P5FuoOXzvr1NzRbKPEE&mcode=666666&center=121.425276,31.438629&zoom=13  " />
+            </div>
 
 
-        </icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>
@@ -21,15 +38,48 @@
 export default {
   data() {
     return {
-      msg: "Welcome to Your Vue.js App"
+     
     };
   },
   mounted: function() {
 
-    console.log("mounted");
+   
   }
 };
 </script>
 
 <style scoped>
+.nav_div {
+  font-size: 25px;
+  color: #333333;
+}
+
+.cav_contact_div1 {
+  margin-bottom: 40px;
+  font-size: 14px;
+  line-height: 28px;
+  text-align: left;
+}
+
+.left {
+  display: inline-block;
+  vertical-align: top;
+  width: 60%;
+}
+
+.right {
+  position: left;
+  display: inline-block;
+  margin: 1em;
+  width: 35%;
+  vertical-align: top;
+}
+
+.cav_contact_ul > li {
+  list-style: none;
+  padding-top: 14px;
+  font-family: "Microsoft YaHei";
+  font-size: 14px;
+  color: #333333;
+}
 </style>

src/views/aboutUs/propystTechnology.vue

@@ -1,28 +1,22 @@
 <template>
   <div>
-    	<ihead></ihead>
+    
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>
 
 <script>
-
 export default {
   data() {
-    return {
+    return {};
-      msg: "Welcome to Your Vue.js App"
+  },
-    };
+   mounted: function() {
+    
+   
   }
 };
 </script>
 
 <style scoped>
+
 </style>

src/views/fulEdge/fulEdge.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    	<ihead></ihead>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<icontent>
+              <router-view></router-view>
+          </icontent>
+	</div>
+	</div>
+  	<ifooter></ifooter>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+    
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/fulEdge/mobileSolution.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-    	<ihead></ihead>
+    
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>
@@ -18,7 +10,7 @@
 export default {
   data() {
     return {
-      msg: "Welcome to Your Vue.js App"
+
     };
   }
 };

src/views/fulEdge/other.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-    	<ihead></ihead>
+ 
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>
@@ -18,7 +10,7 @@
 export default {
   data() {
     return {
-      msg: "Welcome to Your Vue.js App"
+    
     };
   }
 };

src/views/ourPlan/estateManagement.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-    	<ihead></ihead>
+  
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>

src/views/ourPlan/facilityManagement.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-    	<ihead></ihead>
+    
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>

src/views/ourPlan/iot.vue

@@ -1,25 +1,19 @@
 <template>
   <div>
-    	<ihead></ihead>
+  
-<div class="contentPage">
-
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      	<icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 
 </template>
 
 <script>
-
 export default {
   data() {
     return {
       msg: "Welcome to Your Vue.js App"
     };
+  },
+  mounted: function() {
+    debugger;
   }
 };
 </script>

src/views/ourPlan/ourPlan.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    	<ihead></ihead>
+<div class="contentPage">
+
+		<div class="contentTable">
+			<leftMenu>	</leftMenu>
+      	<icontent>
+              <router-view></router-view>
+          </icontent>
+	</div>
+	</div>
+  	<ifooter></ifooter>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      msg: "Welcome to Your Vue.js App"
+    };
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/views/ourPlan/reaEstate.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-  <ihead></ihead>
-<div class="contentPage">
 
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-      <icontent></icontent>
-	</div>
-	</div>
-  	<ifooter></ifooter>
   </div>
 </template>
 

src/views/ourPlan/technologyIntegration.vue

@@ -1,14 +1,6 @@
 <template>
   <div>
-	<ihead></ihead>
-<div class="contentPage">
 
-		<div class="contentTable">
-			<leftMenu>	</leftMenu>
-     <icontent></icontent>
-	</div>
-  </div>
-   	<ifooter></ifooter>
 </div>
 </template>