Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop

@@ -21,5 +21,9 @@
             "world we made",
             "must"
         ]
-    }
+    },
+    "prevLink": "#",
+    "prevTitle": "上一篇",
+    "nextLink": "#",
+    "nextTitle": "下一篇"
 }
\ No newline at end of file

 {
+    "home320_js": "true",
     "channel": "home",
-    "indexBanner": [
+    "homeLink":"http://localhost:3000/default/index320",
+    "fashionLink":"http://localhost:3000/fashion/index320",
+    "beautyLink":"http://localhost:3000/beauty/index320",
+    "sportLink":"http://localhost:3000/sport/index320",
+    "lifestyleLink":"http://localhost:3000/lifestyle/index320",
+    "magazineLink":"http://localhost:3000/magazine/index320",
+    "videoLink":"http://localhost:3000/video/index320",
+    "homeBanner":{
+        "only": false,
+        "bannerItem": [
+            {
+                "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
+                "href": "#"
+            },
+            {
+                "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
+                "href": "#"
+            },
+            {
+                "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
+                "href": "#"
+            },
+            {
+                "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
+                "href": "#"
+            },
+            {
+                "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
+                "href": "#"
+            }
+        ]
+    },
+    "content": [
         {
-            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
-            "href": "#"
+            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
+            "href": "#",
+            "title": "Audrey Hepurn",
+            "subTitle": "伦敦影像展",
+            "channel": "fashion",
+            "time": "22hours ago",
+            "content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近...  "
         },
         {
-            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
-            "href": "#"
+            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
+            "link": "#",
+            "channelLink": "#",
+            "title": "Audrey Hepurn",
+            "subTitle": "伦敦影像展",
+            "channel": "lifestyle",
+            "time": "22hours ago",
+            "content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近...  "
         },
         {
-            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
-            "href": "#"
-        }
-    ],
-    "indexContent": [
+            "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
+            "link": "#",
+            "channelLink": "#",
+            "title": "Audrey Hepurn",
+            "subTitle": "伦敦影像展",
+            "channel": "lifestyle",
+            "time": "22hours ago",
+            "content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近...  "
+        },
         {
             "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
-            "href": "#",
+            "link": "#",
+            "channelLink": "#",
             "title": "Audrey Hepurn",
             "subTitle": "伦敦影像展",
-            "channel": "fashion",
+            "channel": "lifestyle",
             "time": "22hours ago",
             "content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近...  "
         },
         {
             "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
-            "href": "#",
+            "link": "#",
+            "channelLink": "#",
             "title": "Audrey Hepurn",
             "subTitle": "伦敦影像展",
             "channel": "lifestyle",
@@ -43,5 +93,23 @@
             "time": "22hours ago",
             "content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近...  "
         }
-    ]
+    ],
+    "page": {
+        "switchPrev": {
+            "link": "#"
+        },
+        "switchNext": {
+            "link": "#"
+        }
+    },
+    "app": {
+        "boy": {
+            "ios":"https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com",
+            "android":"http://yoho-apps.qiniudn.com/YohoBoys.apk"
+        },
+        "girl": {
+            "ios":"https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com",
+            "android":"http://app.yoho.cn/install/YohoGirl_YOHO.apk"
+        }
+    }
 }
\ No newline at end of file

@@ -4,20 +4,7 @@
         "default-layout": "[none]",
         "detail": "[none]",
         "magazine": "[none]",
-        "error": "[none]",
-        "default/index320": "new_layout320",
-        "magazine/index320": "new_layout320",
-        "video/index320": "new_layout320",
-        "writer/index320": "new_layout_writer320",
-        "tags/index320": "new_layout_writer320",
-        "search/index320": "new_layout_writer320",
-        "fashion/index320": "new_layout320",
-        "beauty/index320": "new_layout320",
-        "sports/index320": "new_layout320",
-        "lifestyle/index320": "new_layout320",
-        "about/index320": "new_layout_writer320",
-        "detail/index320": "new_layout_writer320"
-
+        "error": "[none]"
     },
     "renderOptions": {
         "login": {