From 53285eb5f5a68ab718bf3e68c2b025b96336705d Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 2 Apr 2019 18:14:46 +0800
Subject: [PATCH] 回到顶部

---
 webintroduce/src/assets/css/reset.css      | 14 ++++++++++++--
 webintroduce/src/assets/css/variables.scss |  6 ++++++
 webintroduce/src/components/VHeader.vue    | 48 +++++++++++++++++++++++++++++-------------------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/webintroduce/src/assets/css/reset.css b/webintroduce/src/assets/css/reset.css
index 69cca07..2999e4f 100644
--- a/webintroduce/src/assets/css/reset.css
+++ b/webintroduce/src/assets/css/reset.css
@@ -126,10 +126,20 @@ table {
 }
 
 
-
+.fl{
+  float: left;
+}
+.fr{
+  float: right;
+}
+.contentWidth{
+  width: 1200px;
+  margin: 0 auto;
+}
 
 
 /*自定义导航选中样式*/
 .navActive{
-  background-color: #f00;
+  color: #f00;
+  border-bottom: 2px solid #f00!important;
 }
diff --git a/webintroduce/src/assets/css/variables.scss b/webintroduce/src/assets/css/variables.scss
index 9068b8b..e41c909 100644
--- a/webintroduce/src/assets/css/variables.scss
+++ b/webintroduce/src/assets/css/variables.scss
@@ -1,3 +1,9 @@
 $baseColor:#000;
 
 $baseBgColor:#000;
+
+$contentWidth: 1200;
+
+$baseWhiteBg: #fff;
+
+$baseGrayBg: #f5f5f5;
diff --git a/webintroduce/src/components/VHeader.vue b/webintroduce/src/components/VHeader.vue
index d9bf4e6..8b685a4 100644
--- a/webintroduce/src/components/VHeader.vue
+++ b/webintroduce/src/components/VHeader.vue
@@ -1,15 +1,18 @@
 <template>
-    <div class="header-wrap">
-      <ul>
-       <router-link
-         :to="{path:link.linkPath}"
-         tag="li" v-for="(link,index) in navLinks"
-         :key="index"
-         exact="">
-         {{link.name}}
-       </router-link>
+  <div class="header-wrap">
+    <div class="contentWidth">
+      <div class="header-logo fl">logo</div>
+      <ul class="bar-wrap fr">
+        <router-link
+          :to="{path:link.linkPath}"
+          tag="li" v-for="(link,index) in navLinks"
+          :key="index"
+          exact="">
+          {{link.name}}
+        </router-link>
       </ul>
     </div>
+  </div>
 </template>
 
 <script>
@@ -18,22 +21,29 @@ export default {
   data() {
     return {
       navLinks: [
-        {name:'首页',linkPath:'/home'},
-        {name:'解决方案',linkPath:'/solution'},
-        {name:'登录',linkPath:'/login'},
-        {name:'企业介绍',linkPath:'/enterprise'}
+        { name: '首页', linkPath: '/home' },
+        { name: '解决方案', linkPath: '/solution' },
+        { name: '企业介绍', linkPath: '/enterprise' }
       ]
     }
   },
-  methods:{
-  },
+  methods: {},
 
 }
 </script>
 
 <style scoped lang="scss">
-.header-wrap{
-  height: 100px;
-  background-color: burlywood;
-}
+  .header-wrap {
+    height: 70px;
+    line-height: 70px;
+    background-color: $baseWhiteBg;
+  }
+
+  .bar-wrap {
+    >li{
+      float: left;
+      margin-left: 30px;
+      border-bottom: 2px solid #fff;
+    }
+  }
 </style>
--
libgit2 0.21.4