ued / yohogirls-views · Commits

Go to a project

Authored by happyhour7
Commit f9ce5bd4cd3eb6078c520d04d1d67cfdf7914af3 2 parents ce1279d2 88704dcd

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

Conflicts:
	mvc-config-wangwei/mvc-config-editor.json
Inline Side-by-side
Showing 17 changed files with 235 additions and 39 deletions
1 { 1 {
2 "channel": "default", 2 "channel": "default",
  3 + "feedback": true,
3 "fan": true 4 "fan": true
4 } 5 }
1 { 1 {
2 - "beauty320_js": "true", 2 + "beauty": "true",
3 "channel": "beauty", 3 "channel": "beauty",
4 "channelBanner":{ 4 "channelBanner":{
5 "only": false, 5 "only": false,
1 { 1 {
2 "channel": "fashion", 2 "channel": "fashion",
3 - "detail_js": true, 3 + "detail": true,
4 "header": { 4 "header": {
5 "title": "Experience Paris with Janice Man", 5 "title": "Experience Paris with Janice Man",
6 "subtitle": "走躺巴黎开阔世界", 6 "subtitle": "走躺巴黎开阔世界",
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 "class": "Fashion , Feature", 8 "class": "Fashion , Feature",
9 "time": "12 21 2014" 9 "time": "12 21 2014"
10 }, 10 },
11 - "content": [{ 11 + "content": {
12 "video": { 12 "video": {
13 "link": "http:\/\/www.yohoboys.com\/news\/index-4337-101002-0.html", 13 "link": "http:\/\/www.yohoboys.com\/news\/index-4337-101002-0.html",
14 "title": "\u897f\u88c5\u6362\u51b2\u6d6a\u8863\u8981\u591a\u4e45\uff1f", 14 "title": "\u897f\u88c5\u6362\u51b2\u6d6a\u8863\u8981\u591a\u4e45\uff1f",
@@ -48,28 +48,17 @@ @@ -48,28 +48,17 @@
48 }, { 48 }, {
49 "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070" 49 "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070"
50 }] 50 }]
51 - }  
52 - }, { 51 + },
53 "coverEffect": { 52 "coverEffect": {
54 - "html": ""  
55 - }  
56 - }, {  
57 - "text": {  
58 - "deps": "其实，当你还没穿到2014年版本的Y-3 Qasa，2015年春夏版本的Y-3 Qasa就这样毫无声息的公布了，但之前公布的Y-3 Qasa Low这次并没有出现在名单上，让人不解。Okay，丢掉这些不说，此番的所有鞋款的Y-3辨识度还是满载，在主调的选择上全部使用了黑白两色，我行我素的设计让人爱不释手。都是用橡胶做的鞋子，为什么Y-3的就这么养眼呢？喜欢的朋友可以耐心等待明年发售。在印象当中，来自意大利的著名牛仔时装品牌Diesel总是会与破洞、汗渍以及做旧所联系，且给人一种特立独行的叛逆味道而横行时尚界。近日品牌发布最新2015春夏季全新的造型海报。但这一次却摒弃了之前的性感路线转而推出“Independent” 与“anti-preppy” 两大主题，在品牌艺术总监Nicola Formichetti 的引领下大走全新风貌的学院派年轻风格。该系列以皮革与牛仔为主要材质，并融入的摇滚元素，令新品极具颠覆性。这个秋冬"  
59 - }  
60 - }, { 53 + "html": "<div class=\"photoslider photoslider_moused_over\" style=\"margin-bottom:20px;\">\r\n <div class=\"photoslider_image_wrapper\">\r\n <div class=\"photoslider_image photoslider_left_image\"><img src=\"http:\/\/cmsimg02.qiniudn.com\/contentimg\/2015\/04\/30\/11\/028a9b4fbe38af5b5bd94a918af01d5137.jpg\"><\/div>\r\n <a href=\"javascript:void(0);\" class=\"photoslider_drag_message\">\u2190 SLIDE \u2192<\/a>\r\n <\/div>\r\n <div class=\"photoslider_image photoslider_right_image\"><img src=\"http:\/\/cmsimg01.qiniudn.com\/contentimg\/2015\/04\/30\/11\/01775c5d7ec2d263a0ec797fc9530e3287.jpg\"><\/div>\r\n <\/div>\r\n <img style=\"width:0px; height:0px; overflow:hidden;\" src=\"\/2015\/04\/30\/11\/011b967c42af2ce46937a09c5c2f6d0ee2.jpg\">"
  54 + },
61 "bigImg": { 55 "bigImg": {
62 "src": "http://cmsimg02.qiniudn.com/contentimg/2015/01/20/19/023b928181c30b058df7d4db005c2f4e63.png" 56 "src": "http://cmsimg02.qiniudn.com/contentimg/2015/01/20/19/023b928181c30b058df7d4db005c2f4e63.png"
63 - }  
64 - }, { 57 + },
65 "text": { 58 "text": {
66 "deps": "其实，当你还没穿到2014年版本的Y-3 Qasa，2015年春夏版本的Y-3 Qasa就这样毫无声息的公布了，但之前公布的Y-3 Qasa Low这次并没有出现在名单上，让人不解。Okay，丢掉这些不说，此番的所有鞋款的Y-3辨识度还是满载，在主调的选择上全部使用了黑白两色，我行我素的设计让人爱不释手。都是用橡胶做的鞋子，为什么Y-3的就这么养眼呢？喜欢的朋友可以耐心等待明年发售。在印象当中，来自意大利的著名牛仔时装品牌Diesel总是会与破洞、汗渍以及做旧所联系，且给人一种特立独行的叛逆味道而横行时尚界。近日品牌发布最新2015春夏季全新的造型海报。但这一次却摒弃了之前的性感路线转而推出“Independent” 与“anti-preppy” 两大主题，在品牌艺术总监Nicola Formichetti 的引领下大走全新风貌的学院派年轻风格。该系列以皮革与牛仔为主要材质，并融入的摇滚元素，令新品极具颠覆性。这个秋冬" 59 "deps": "其实，当你还没穿到2014年版本的Y-3 Qasa，2015年春夏版本的Y-3 Qasa就这样毫无声息的公布了，但之前公布的Y-3 Qasa Low这次并没有出现在名单上，让人不解。Okay，丢掉这些不说，此番的所有鞋款的Y-3辨识度还是满载，在主调的选择上全部使用了黑白两色，我行我素的设计让人爱不释手。都是用橡胶做的鞋子，为什么Y-3的就这么养眼呢？喜欢的朋友可以耐心等待明年发售。在印象当中，来自意大利的著名牛仔时装品牌Diesel总是会与破洞、汗渍以及做旧所联系，且给人一种特立独行的叛逆味道而横行时尚界。近日品牌发布最新2015春夏季全新的造型海报。但这一次却摒弃了之前的性感路线转而推出“Independent” 与“anti-preppy” 两大主题，在品牌艺术总监Nicola Formichetti 的引领下大走全新风貌的学院派年轻风格。该系列以皮革与牛仔为主要材质，并融入的摇滚元素，令新品极具颠覆性。这个秋冬"
67 } 60 }
68 - }, {  
69 - "bigImg": {  
70 - "src": "http://cmsimg02.qiniudn.com/contentimg/2015/01/20/19/023b928181c30b058df7d4db005c2f4e63.png"  
71 - }  
72 - }], 61 + },
73 "tags": { 62 "tags": {
74 "tagList": [{ 63 "tagList": [{
75 "src": "http://www.yohoboys.com/tag/529", 64 "src": "http://www.yohoboys.com/tag/529",
@@ -89,10 +78,10 @@ @@ -89,10 +78,10 @@
89 }] 78 }]
90 }, 79 },
91 "commentParam": { 80 "commentParam": {
92 - "cid": "4288", 81 + "cid": "1170",
93 "ctype": "1", 82 "ctype": "1",
94 - "cc": "101",  
95 - "ctwoc": "101004" 83 + "cc": "0",
  84 + "ctwoc": "0"
96 }, 85 },
97 "appDownload": { 86 "appDownload": {
98 "iosUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com", 87 "iosUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com",
1 { 1 {
2 - "detail320_js": "true",  
3 - "detail": { 2 + "detail": "true",
  3 + "detailData": {
4 "title": "Hello", 4 "title": "Hello",
5 "subTitle": "Mustache", 5 "subTitle": "Mustache",
6 "channelLink": "#", 6 "channelLink": "#",
7 "channel": "beauty", 7 "channel": "beauty",
8 - "tagLink": "#",  
9 - "tag": "javascript", 8 + "twoChannelLink": "#",
  9 + "twoChannel": "javascript",
10 "time": "2015 08 12", 10 "time": "2015 08 12",
11 "coverUrl": "#", 11 "coverUrl": "#",
12 "detailStr": "#", 12 "detailStr": "#",
@@ -47,5 +47,12 @@ @@ -47,5 +47,12 @@
47 "link": "#", 47 "link": "#",
48 "name": "香港" 48 "name": "香港"
49 } 49 }
50 - ] 50 + ],
  51 + "comment": {
  52 + "userImg": "http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png",
  53 + "id": 1170,
  54 + "type": 1,
  55 + "c": 0,
  56 + "twoc": 0
  57 + }
51 } 58 }
1 { 1 {
2 - "fashion320_js": "true", 2 + "fashion": "true",
3 "channel": "fashion", 3 "channel": "fashion",
4 "channelBanner":{ 4 "channelBanner":{
5 "only": false, 5 "only": false,
1 { 1 {
2 - "home320_js": "true",  
3 - "channel": "home", 2 + "default": "true",
  3 + "channel": "default",
4 "channelBanner":{ 4 "channelBanner":{
5 "isOne": false, 5 "isOne": false,
6 "bannerItem": [ 6 "bannerItem": [
1 { 1 {
2 - "lifestyle320_js": "true", 2 + "lifestyle": "true",
3 "channel": "lifestyle", 3 "channel": "lifestyle",
4 "channelBanner":{ 4 "channelBanner":{
5 "only": false, 5 "only": false,
1 { 1 {
2 "channel": "magazine", 2 "channel": "magazine",
3 - "magazine_js": true, 3 + "magazine": true,
4 "magsNew": { 4 "magsNew": {
5 "date": "2015.03.15", 5 "date": "2015.03.15",
6 "title": "Now is good 趁现在", 6 "title": "Now is good 趁现在",
@@ -67,5 +67,6 @@ @@ -67,5 +67,6 @@
67 "share": { 67 "share": {
68 "url": "www.baidu.com", 68 "url": "www.baidu.com",
69 "cover": "http://img02.yohoboys.com/contentimg/2015/04/20/09/02a4c1e4939921602302d4141326cc700b.jpg" 69 "cover": "http://img02.yohoboys.com/contentimg/2015/04/20/09/02a4c1e4939921602302d4141326cc700b.jpg"
70 - } 70 + },
  71 + "fan": true
71 } 72 }
1 { 1 {
2 - "magazine320_js": "true", 2 + "magazine": "true",
3 "channel": "magazine", 3 "channel": "magazine",
4 "magazineBanner": { 4 "magazineBanner": {
5 "isOne": false, 5 "isOne": false,
1 { 1 {
2 - "search320_js": "true", 2 + "search": "true",
3 "content": [ 3 "content": [
4 { 4 {
5 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg", 5 "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
1 { 1 {
2 - "sport320_js": "true", 2 + "sport": "true",
3 "channel": "sport", 3 "channel": "sport",
4 "channelBanner":{ 4 "channelBanner":{
5 "only": false, 5 "only": false,
1 { 1 {
2 - "video320_js": "true", 2 + "video": "true",
3 "channel": "video", 3 "channel": "video",
4 "channelBanner":{ 4 "channelBanner":{
5 "isOne": false, 5 "isOne": false,
  1 +<<<<<<< HEAD
1 { 2 {
2 "channel": "default", 3 "channel": "default",
3 "user": "/2015/04/22/14/01739c4764142150db1bb8403337407805.jpg", 4 "user": "/2015/04/22/14/01739c4764142150db1bb8403337407805.jpg",
@@ -146,4 +147,200 @@ @@ -146,4 +147,200 @@
146 "boyDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com", 147 "boyDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com",
147 "girlDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com", 148 "girlDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com",
148 "default": true 149 "default": true
  150 +=======
  151 +{
  152 + "channel": "default",
  153 + "defaultUrl": "http://localhost:3000/default",
  154 + "fashionUrl": "http://localhost:3000/fashion",
  155 + "beautyUrl": "http://localhost:3000/beauty",
  156 + "sportsUrl": "http://localhost:3000/sports",
  157 + "lifestyleUrl": "http://localhost:3000/lifestyle",
  158 + "videoUrl": "http://localhost:3000/video",
  159 + "searchUrl": "http://localhost:3000/search",
  160 + "magazineUrl": "http://localhost:3000/magazine",
  161 +
  162 + "aboutUsUrl": "http://localhost:3000/default",
  163 + "contactusUrl": "http://localhost:3000/default",
  164 + "serversUrl": "http://localhost:3000/default",
  165 + "privacyUrl": "http://localhost:3000/default",
  166 + "feedbackUrl": "http://localhost:3000/default",
  167 + "linksUrl": "http://localhost:3000/default",
  168 + "boyDownloadUrl": "http://localhost:3000/default",
  169 + "girlDownloadUrl": "http://localhost:3000/default",
  170 + "writer": true,
  171 + "cid": 38,
  172 + "writerInfo": {
  173 + "photo": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  174 + "username": "周易",
  175 + "usermark": "胡诌的人物",
  176 + "commentCount": "24"
  177 + },
  178 + "Items": [{
  179 + "channelClass": "sports",
  180 + "subChannel": "subChannel",
  181 + "date": "17 hours ago",
  182 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  183 + "title": "这是测试内容的标题",
  184 + "subtitle": "这是测试内容的副标题",
  185 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  186 + }, {
  187 + "isMid": true,
  188 + "channelClass": "sports",
  189 + "subChannel": "subChannel",
  190 + "date": "17 hours ago",
  191 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  192 + "title": "这是测试内容的标题",
  193 + "subtitle": "这是测试内容的副标题",
  194 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  195 + }, {
  196 + "subChannel": "subChannel",
  197 + "date": "17 hours ago",
  198 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  199 + "title": "这是测试内容的标题",
  200 + "subtitle": "这是测试内容的副标题",
  201 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  202 + }, {
  203 + "subChannel": "subChannel",
  204 + "date": "17 hours ago",
  205 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  206 + "title": "这是测试内容的标题",
  207 + "subtitle": "这是测试内容的副标题",
  208 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  209 + }, {
  210 + "isMid": true,
  211 + "subChannel": "subChannel",
  212 + "date": "17 hours ago",
  213 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  214 + "title": "这是测试内容的标题",
  215 + "subtitle": "这是测试内容的副标题",
  216 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  217 + }, {
  218 +
  219 + "subChannel": "subChannel",
  220 + "channelClass": "sports",
  221 + "date": "17 hours ago",
  222 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  223 + "title": "这是测试内容的标题",
  224 + "subtitle": "这是测试内容的副标题",
  225 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  226 + }, {
  227 +
  228 + "subChannel": "subChannel",
  229 + "date": "17 hours ago",
  230 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  231 + "title": "这是测试内容的标题",
  232 + "subtitle": "这是测试内容的副标题",
  233 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  234 + }, {
  235 + "isMid": true,
  236 + "subChannel": "subChannel",
  237 + "channelClass": "sports",
  238 + "date": "17 hours ago",
  239 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  240 + "title": "这是测试内容的标题",
  241 + "subtitle": "这是测试内容的副标题",
  242 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  243 + }, {
  244 +
  245 + "subChannel": "subChannel",
  246 + "date": "17 hours ago",
  247 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  248 + "title": "这是测试内容的标题",
  249 + "subtitle": "这是测试内容的副标题",
  250 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  251 + }, {
  252 +
  253 + "subChannel": "subChannel",
  254 + "date": "17 hours ago",
  255 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  256 + "title": "这是测试内容的标题",
  257 + "subtitle": "这是测试内容的副标题",
  258 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  259 + }, {
  260 + "isMid": true,
  261 + "subChannel": "subChannel",
  262 + "date": "17 hours ago",
  263 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  264 + "title": "这是测试内容的标题",
  265 + "subtitle": "这是测试内容的副标题",
  266 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  267 + }, {
  268 +
  269 + "subChannel": "subChannel",
  270 + "date": "17 hours ago",
  271 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  272 + "title": "这是测试内容的标题",
  273 + "subtitle": "这是测试内容的副标题",
  274 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  275 + }, {
  276 + "no-border": true,
  277 + "subChannel": "subChannel",
  278 + "date": "17 hours ago",
  279 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  280 + "title": "这是测试内容的标题",
  281 + "subtitle": "这是测试内容的副标题",
  282 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  283 + }, {
  284 + "isMid": true,
  285 + "no-border": true,
  286 + "subChannel": "subChannel",
  287 + "date": "17 hours ago",
  288 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  289 + "title": "这是测试内容的标题",
  290 + "subtitle": "这是测试内容的副标题",
  291 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  292 + }, {
  293 + "no-border": true,
  294 + "subChannel": "subChannel",
  295 + "date": "17 hours ago",
  296 + "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
  297 + "title": "这是测试内容的标题",
  298 + "subtitle": "这是测试内容的副标题",
  299 + "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
  300 + }],
  301 + "pager": [{
  302 + "text": "1",
  303 + "link": ""
  304 + }, {
  305 + "text": "2",
  306 + "link": "",
  307 + "isChoosen": true
  308 + }, {
  309 + "text": "3",
  310 + "link": ""
  311 + }, {
  312 + "text": "4",
  313 + "link": ""
  314 + }, {
  315 + "text": "5",
  316 + "link": ""
  317 + }, {
  318 + "text": "6",
  319 + "link": ""
  320 + }, {
  321 + "text": "1",
  322 + "link": ""
  323 + }, {
  324 + "text": "7",
  325 + "link": ""
  326 + }, {
  327 + "text": "8",
  328 + "link": ""
  329 + }, {
  330 + "text": "9",
  331 + "link": ""
  332 + }, {
  333 + "text": "10",
  334 + "link": ""
  335 + }, {
  336 + "text": "...",
  337 + "link": ""
  338 + }, {
  339 + "text": "499",
  340 + "link": ""
  341 + }, {
  342 + "text": ">",
  343 + "link": ""
  344 + }]
  345 +>>>>>>> 88704dcda88a3a601fb52fe86b6d51f2f871d5a7
149 } 346 }
1 { 1 {
2 - "writer320_js": true, 2 + "writer": true,
3 "user": "http://cmsres.dev.yoho.cn/images/temp/user-pic.png", 3 "user": "http://cmsres.dev.yoho.cn/images/temp/user-pic.png",
4 "hasComment": [ 4 "hasComment": [
5 { 5 {
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 "channel/magazine/index320": "mvc-config-magazine320", 48 "channel/magazine/index320": "mvc-config-magazine320",
49 "channel/video/index320": "mvc-config-video320", 49 "channel/video/index320": "mvc-config-video320",
50 "writer/default/index320": "mvc-config-writer320", 50 "writer/default/index320": "mvc-config-writer320",
51 - "tags/index320": "mvc-config-tags320", 51 + "channel/tags/index320": "mvc-config-tags320",
52 "search/index320": "mvc-config-search320", 52 "search/index320": "mvc-config-search320",
53 "channel/fashion/index320": "mvc-config-fashion320", 53 "channel/fashion/index320": "mvc-config-fashion320",
54 "channel/beauty/index320": "mvc-config-beauty320", 54 "channel/beauty/index320": "mvc-config-beauty320",
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
56 "channel/lifestyle/index320": "mvc-config-lifestyle320", 56 "channel/lifestyle/index320": "mvc-config-lifestyle320",
57 "channel/detail/index320": "mvc-config-detail320", 57 "channel/detail/index320": "mvc-config-detail320",
58 58
  59 + "channel/about": "mvc-config-about",
59 "channel/about/index": "mvc-config-about", 60 "channel/about/index": "mvc-config-about",
60 "channel/about/contactus": "mvc-config-about", 61 "channel/about/contactus": "mvc-config-about",
61 "channel/about/feedback": "mvc-config-about", 62 "channel/about/feedback": "mvc-config-about",