From cc27e8162dca74f64b8dc20d13037382a0b1046f Mon Sep 17 00:00:00 2001
From: maguohua <1264889788@qq.com>
Date: Tue, 27 Dec 2016 14:46:23 +0800
Subject: [PATCH] updata

---
 src/components/header/head.vue |  50 ++++++++++++++++++++++++++-----
 src/config/fetch.js            |   1 +
 src/config/mUtils.js           |   0
 src/images/head-logo.jpg       | Bin 0 -> 2925 bytes
 src/page/home/index.vue        |  52 +++++++++++++++++++++++++++++----
 src/style/common.scss          |   6 ++--
 src/style/mixin.scss           |   7 +++++
 7 files changed, 102 insertions(+), 14 deletions(-)
 create mode 100644 src/config/mUtils.js
 create mode 100644 src/images/head-logo.jpg
 create mode 100644 src/style/mixin.scss

diff --git a/src/components/header/head.vue b/src/components/header/head.vue
index 7cad3da..93a6350 100644
--- a/src/components/header/head.vue
+++ b/src/components/header/head.vue
@@ -1,17 +1,53 @@
 <template>
-    <div>
-      	头部
-    </div>
+    <header id='head_top'>
+        <slot name='logo'></slot>
+        <router-link to='/login' v-if='signinUp' class="head_login">登陆|注册</router-link>
+    </header>
 </template>
 
 <script>
 
-export default {
-	
-}
+    export default {
+    	data(){
+            return{
+                
+            }
+        },
+        created(){
+
+        },
+        mounted(){
+
+        },
+        props: ['signinUp'],
+        computed: {
+            
+        },
+        methods: {
+
+        },
+
+    }
 
 </script>
 
 <style lang="scss" scoped>
-    
+    @import '../../style/mixin.scss';
+
+    #head_top{
+        height: 1.95rem;
+        width: 100%;
+        background-color: $blue;
+        position: fixed;
+        left: 0;
+        top: 0;
+    }
+    .head_login{
+        position: absolute;
+        font-size: 0.6rem;
+        color: #fff;
+        right: 0.55rem;
+        top: 50%;
+        transform: translateY(-50%);
+    }
 </style>
diff --git a/src/config/fetch.js b/src/config/fetch.js
index 294183d..fb47d76 100644
--- a/src/config/fetch.js
+++ b/src/config/fetch.js
@@ -5,6 +5,7 @@ export default (type = 'GET', url = '', data = {}) => {
 		type = type.toUpperCase();
 		url = baseUrl + url
 		let requestObj = {
+			credentials: 'include',
 		  	method: type,
 		  	headers: {
 		      	'Accept': 'application/json',
diff --git a/src/config/mUtils.js b/src/config/mUtils.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/images/head-logo.jpg b/src/images/head-logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..33b2effe04213d3ba415454e7882b2c41f5124c0
GIT binary patch
literal 2925
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

literal 0
HcmV?d00001

diff --git a/src/page/home/index.vue b/src/page/home/index.vue
index b4628c7..aeb46a1 100644
--- a/src/page/home/index.vue
+++ b/src/page/home/index.vue
@@ -1,22 +1,64 @@
 <template>
   	<div>
-        <Headtop></Headtop>
+        <head-top signin-up='home'>
+            <router-link to='/home' slot='logo' class="head_logo">ele.me</router-link>
+        </head-top>
+        <nav class="city_nav">
+            <div class="city_tip">
+                <span>当前定位城市：</span>
+                <span>定位不准时，请在城市列表中选择</span>
+            </div>  
+        </nav>
     </div>
 </template>
 
 <script>
-import Headtop from '../../components/header/head'
+import headTop from '../../components/header/head'
 export default {
-    components:{
-        Headtop
+    data(){
+        return{
+
+        }
     },
+
 	created(){
         
+    },
+
+    components:{
+        headTop
+    },
+
+    computed:{
+
+    },
+
+    methods:{
+
     }
 }
 
 </script>
 
 <style lang="scss" scoped>
-    
+    @import '../../style/mixin.scss';
+    .head_logo{
+        position: absolute;
+        width: 2.3rem;
+        height: 0.7rem;
+        left: 0.4rem;
+        top: 50%;
+        transform: translateY(-50%);
+        font-size: 0.7rem;
+        color: #fff;
+        font-weight: 400;
+    }
+    .city_nav{
+        margin-top: 2.35rem;
+        border-top: 2px solid $bordercolor;
+        background-color: #fff;
+        .city_tip{
+            color: #666;
+        }
+    }
 </style>
diff --git a/src/style/common.scss b/src/style/common.scss
index 5134ab3..a89a4a0 100644
--- a/src/style/common.scss
+++ b/src/style/common.scss
@@ -5,7 +5,7 @@ body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, l
     font-style: normal;
     text-decoration: none;
     border: none;
-    color: #313131;
+    color: #333;
     box-sizing: border-box;
     font-weight: lighter;
     font-family: 'Microsoft YaHei';
@@ -16,11 +16,13 @@ body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, l
 }
 
 
-html{
+html,body{
     height: 100%;
     width: 100%;
+    background-color: #f2f2f2;
 }
 
+
 .clear:after{
     content: '';
     display: block;
diff --git a/src/style/mixin.scss b/src/style/mixin.scss
new file mode 100644
index 0000000..4c40fa2
--- /dev/null
+++ b/src/style/mixin.scss
@@ -0,0 +1,7 @@
+$blue: #3190e8;  
+$bordercolor: #e4e4e4;
+@mixin backimg($url) {
+	background-image: url($url);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+}
-- 
GitLab