Authored by happyhour7

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

@@ -21,5 +21,9 @@ @@ -21,5 +21,9 @@
21 "world we made", 21 "world we made",
22 "must" 22 "must"
23 ] 23 ]
24 - } 24 + },
  25 + "prevLink": "#",
  26 + "prevTitle": "上一篇",
  27 + "nextLink": "#",
  28 + "nextTitle": "下一篇"
25 } 29 }
1 { 1 {
  2 + "home320_js": "true",
2 "channel": "home", 3 "channel": "home",
3 - "indexBanner": [ 4 + "homeLink":"http://localhost:3000/default/index320",
  5 + "fashionLink":"http://localhost:3000/fashion/index320",
  6 + "beautyLink":"http://localhost:3000/beauty/index320",
  7 + "sportLink":"http://localhost:3000/sport/index320",
  8 + "lifestyleLink":"http://localhost:3000/lifestyle/index320",
  9 + "magazineLink":"http://localhost:3000/magazine/index320",
  10 + "videoLink":"http://localhost:3000/video/index320",
  11 + "homeBanner":{
  12 + "only": false,
  13 + "bannerItem": [
  14 + {
  15 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
  16 + "href": "#"
  17 + },
  18 + {
  19 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
  20 + "href": "#"
  21 + },
  22 + {
  23 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
  24 + "href": "#"
  25 + },
  26 + {
  27 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
  28 + "href": "#"
  29 + },
  30 + {
  31 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
  32 + "href": "#"
  33 + }
  34 + ]
  35 + },
  36 + "content": [
4 { 37 {
5 - "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",  
6 - "href": "#" 38 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
  39 + "href": "#",
  40 + "title": "Audrey Hepurn",
  41 + "subTitle": "伦敦影像展",
  42 + "channel": "fashion",
  43 + "time": "22hours ago",
  44 + "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
7 }, 45 },
8 { 46 {
9 - "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",  
10 - "href": "#" 47 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
  48 + "link": "#",
  49 + "channelLink": "#",
  50 + "title": "Audrey Hepurn",
  51 + "subTitle": "伦敦影像展",
  52 + "channel": "lifestyle",
  53 + "time": "22hours ago",
  54 + "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
11 }, 55 },
12 { 56 {
13 - "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",  
14 - "href": "#"  
15 - }  
16 - ],  
17 - "indexContent": [ 57 + "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
  58 + "link": "#",
  59 + "channelLink": "#",
  60 + "title": "Audrey Hepurn",
  61 + "subTitle": "伦敦影像展",
  62 + "channel": "lifestyle",
  63 + "time": "22hours ago",
  64 + "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
  65 + },
18 { 66 {
19 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg", 67 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
20 - "href": "#", 68 + "link": "#",
  69 + "channelLink": "#",
21 "title": "Audrey Hepurn", 70 "title": "Audrey Hepurn",
22 "subTitle": "伦敦影像展", 71 "subTitle": "伦敦影像展",
23 - "channel": "fashion", 72 + "channel": "lifestyle",
24 "time": "22hours ago", 73 "time": "22hours ago",
25 "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... " 74 "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
26 }, 75 },
27 { 76 {
28 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg", 77 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
29 - "href": "#", 78 + "link": "#",
  79 + "channelLink": "#",
30 "title": "Audrey Hepurn", 80 "title": "Audrey Hepurn",
31 "subTitle": "伦敦影像展", 81 "subTitle": "伦敦影像展",
32 "channel": "lifestyle", 82 "channel": "lifestyle",
@@ -43,5 +93,23 @@ @@ -43,5 +93,23 @@
43 "time": "22hours ago", 93 "time": "22hours ago",
44 "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... " 94 "content": "在“女神”泛滥的今天,依旧有许多经典女神形象是无人能够超越的,Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
45 } 95 }
46 - ] 96 + ],
  97 + "page": {
  98 + "switchPrev": {
  99 + "link": "#"
  100 + },
  101 + "switchNext": {
  102 + "link": "#"
  103 + }
  104 + },
  105 + "app": {
  106 + "boy": {
  107 + "ios":"https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com",
  108 + "android":"http://yoho-apps.qiniudn.com/YohoBoys.apk"
  109 + },
  110 + "girl": {
  111 + "ios":"https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com",
  112 + "android":"http://app.yoho.cn/install/YohoGirl_YOHO.apk"
  113 + }
  114 + }
47 } 115 }
@@ -4,20 +4,7 @@ @@ -4,20 +4,7 @@
4 "default-layout": "[none]", 4 "default-layout": "[none]",
5 "detail": "[none]", 5 "detail": "[none]",
6 "magazine": "[none]", 6 "magazine": "[none]",
7 - "error": "[none]",  
8 - "default/index320": "new_layout320",  
9 - "magazine/index320": "new_layout320",  
10 - "video/index320": "new_layout320",  
11 - "writer/index320": "new_layout_writer320",  
12 - "tags/index320": "new_layout_writer320",  
13 - "search/index320": "new_layout_writer320",  
14 - "fashion/index320": "new_layout320",  
15 - "beauty/index320": "new_layout320",  
16 - "sports/index320": "new_layout320",  
17 - "lifestyle/index320": "new_layout320",  
18 - "about/index320": "new_layout_writer320",  
19 - "detail/index320": "new_layout_writer320"  
20 - 7 + "error": "[none]"
21 }, 8 },
22 "renderOptions": { 9 "renderOptions": {
23 "login": { 10 "login": {