Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -3,3 +3,4 @@ nbproject
 .idea
 #.gitignore
 .gitmodules
+compile/
\ No newline at end of file

@@ -68,31 +68,43 @@
 
 ### 站点头部和尾部
 
+    //header
+    {
+        header: {
+            back: true/false,
+            title: '',
+            home: '' //对应页面有就传，没有就不传
+        }
+    }
+
+    //footer已登录
     {
-        headerDownload: {
-            img: '',
-            url: ''
-        },
-        homeHeader: {
-            bgColor: '',
-            searchUrl: ''
-        },
         footer: {
-            //--已登录--
-            user: {
             name: '',
             url: '',
             signoutUrl: ''
         }
-            //--未登录--
-            // loginUrl: '',
-            // signupUrl: ''
+    }
+
+    //footer未登录
+    {
+        footer: {
+            loginUrl: '',
+            signupUrl: ''
         }
     }
 
 ## 首页
  
     {
+        headerDownload: {
+            img: '',
+            url: ''
+        },
+        homeHeader: {
+            bgColor: '',
+            searchUrl: ''
+        },
         content: [
             //banner
             {