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

@@ -2,4 +2,5 @@ nbproject
 .project
 .project
 .idea
 .idea
 #.gitignore
 #.gitignore
-.gitmodules
+.gitmodules
+compile/

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