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

Conflicts:
	mvc-config-wangwei/mvc-config-editor.json

 {
     "channel": "default",
+    "feedback": true,
     "fan": true
 }
\ No newline at end of file

 {
-    "beauty320_js": "true",
+    "beauty": "true",
     "channel": "beauty",
     "channelBanner":{
         "only": false,

 {
     "channel": "fashion",
-    "detail_js": true,
+    "detail": true,
     "header": {
         "title": "Experience Paris with Janice Man",
         "subtitle": "走躺巴黎开阔世界",
@@ -8,7 +8,7 @@
         "class": "Fashion , Feature",
         "time": "12 21 2014"
     },
-    "content": [{
+    "content": {
         "video": {
             "link": "http:\/\/www.yohoboys.com\/news\/index-4337-101002-0.html",
             "title": "\u897f\u88c5\u6362\u51b2\u6d6a\u8863\u8981\u591a\u4e45\uff1f",
@@ -48,28 +48,17 @@
             }, {
                 "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070"
             }]
-        }
-    }, {
+        },
         "coverEffect": {
-            "html": ""
-        }
-    }, {
-        "text": {
-            "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 的引领下大走全新风貌的学院派年轻风格。该系列以皮革与牛仔为主要材质，并融入的摇滚元素，令新品极具颠覆性。这个秋冬"
-        }
-    }, {
+            "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\">"
+        },
         "bigImg": {
             "src": "http://cmsimg02.qiniudn.com/contentimg/2015/01/20/19/023b928181c30b058df7d4db005c2f4e63.png"
-        }
-    }, {
+        },
         "text": {
             "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 的引领下大走全新风貌的学院派年轻风格。该系列以皮革与牛仔为主要材质，并融入的摇滚元素，令新品极具颠覆性。这个秋冬"
         }
-    }, {
-        "bigImg": {
-            "src": "http://cmsimg02.qiniudn.com/contentimg/2015/01/20/19/023b928181c30b058df7d4db005c2f4e63.png"
-        }
-    }],
+    },
     "tags": {
         "tagList": [{
             "src": "http://www.yohoboys.com/tag/529",
@@ -89,10 +78,10 @@
         }]
     },
     "commentParam": {
-        "cid": "4288",
+        "cid": "1170",
         "ctype": "1",
-        "cc": "101",
-        "ctwoc": "101004"
+        "cc": "0",
+        "ctwoc": "0"
     },
     "appDownload": {
         "iosUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com",

 {
-    "detail320_js": "true",
-    "detail": {
+    "detail": "true",
+    "detailData": {
         "title": "Hello",
         "subTitle": "Mustache",
         "channelLink": "#",
         "channel": "beauty",
-        "tagLink": "#",
-        "tag": "javascript",
+        "twoChannelLink": "#",
+        "twoChannel": "javascript",
         "time": "2015 08 12",
         "coverUrl": "#",
         "detailStr": "#",
@@ -47,5 +47,12 @@
             "link": "#",
             "name": "香港"
         }
-    ]
+    ],
+    "comment": {
+        "userImg": "http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png",
+        "id": 1170,
+        "type": 1,
+        "c": 0,
+        "twoc": 0
+    }
 }
\ No newline at end of file

 {
-    "fashion320_js": "true",
+    "fashion": "true",
     "channel": "fashion",
     "channelBanner":{
         "only": false,

 {
-    "home320_js": "true",
-    "channel": "home",
+    "default": "true",
+    "channel": "default",
     "channelBanner":{
         "isOne": false,
         "bannerItem": [

 {
-    "lifestyle320_js": "true",
+    "lifestyle": "true",
     "channel": "lifestyle",
     "channelBanner":{
         "only": false,

 {
     "channel": "magazine",
-    "magazine_js": true,
+    "magazine": true,
     "magsNew": {
         "date": "2015.03.15",
         "title": "Now is good 趁现在",
@@ -67,5 +67,6 @@
     "share": {
         "url": "www.baidu.com",
         "cover": "http://img02.yohoboys.com/contentimg/2015/04/20/09/02a4c1e4939921602302d4141326cc700b.jpg"
-    }
+    },
+    "fan": true
 }
\ No newline at end of file

 {
-    "magazine320_js": "true",
+    "magazine": "true",
     "channel": "magazine",
     "magazineBanner": {
         "isOne": false,

 {
-    "search320_js": "true",
+    "search": "true",
     "content": [
         {
             "img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",

 {
-    "sport320_js": "true",
+    "sport": "true",
     "channel": "sport",
     "channelBanner":{
         "only": false,

 {
-    "video320_js": "true",
+    "video": "true",
     "channel": "video",
     "channelBanner":{
         "isOne": false,

+<<<<<<< HEAD
 {
     "channel": "default",
     "user": "/2015/04/22/14/01739c4764142150db1bb8403337407805.jpg",
@@ -146,4 +147,200 @@
     "boyDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&down.myapp.com",
     "girlDownloadUrl": "https://itunes.apple.com/cn/app/yoho!-girls-no-fashion-no/id918398578?mt=8&down.myapp.com",
     "default": true
+=======
+{
+    "channel": "default",
+    "defaultUrl": "http://localhost:3000/default",
+    "fashionUrl": "http://localhost:3000/fashion",
+    "beautyUrl": "http://localhost:3000/beauty",
+    "sportsUrl": "http://localhost:3000/sports",
+    "lifestyleUrl": "http://localhost:3000/lifestyle",
+    "videoUrl": "http://localhost:3000/video",
+    "searchUrl": "http://localhost:3000/search",
+    "magazineUrl": "http://localhost:3000/magazine",
+
+    "aboutUsUrl": "http://localhost:3000/default",
+    "contactusUrl": "http://localhost:3000/default",
+    "serversUrl": "http://localhost:3000/default",
+    "privacyUrl": "http://localhost:3000/default",
+    "feedbackUrl": "http://localhost:3000/default",
+    "linksUrl": "http://localhost:3000/default",
+    "boyDownloadUrl": "http://localhost:3000/default",
+    "girlDownloadUrl": "http://localhost:3000/default",
+    "writer": true,
+    "cid": 38,
+    "writerInfo": {
+        "photo": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "username": "周易",
+        "usermark": "胡诌的人物",
+        "commentCount": "24"
+    },
+    "Items": [{
+        "channelClass": "sports",
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "isMid": true,
+        "channelClass": "sports",
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "isMid": true,
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+
+        "subChannel": "subChannel",
+        "channelClass": "sports",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "isMid": true,
+        "subChannel": "subChannel",
+        "channelClass": "sports",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "isMid": true,
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "no-border": true,
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "isMid": true,
+        "no-border": true,
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }, {
+        "no-border": true,
+        "subChannel": "subChannel",
+        "date": "17 hours ago",
+        "img": "http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218",
+        "title": "这是测试内容的标题",
+        "subtitle": "这是测试内容的副标题",
+        "detail": "这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容，这是测试内容的详细内容"
+    }],
+    "pager": [{
+        "text": "1",
+        "link": ""
+    }, {
+        "text": "2",
+        "link": "",
+        "isChoosen": true
+    }, {
+        "text": "3",
+        "link": ""
+    }, {
+        "text": "4",
+        "link": ""
+    }, {
+        "text": "5",
+        "link": ""
+    }, {
+        "text": "6",
+        "link": ""
+    }, {
+        "text": "1",
+        "link": ""
+    }, {
+        "text": "7",
+        "link": ""
+    }, {
+        "text": "8",
+        "link": ""
+    }, {
+        "text": "9",
+        "link": ""
+    }, {
+        "text": "10",
+        "link": ""
+    }, {
+        "text": "...",
+        "link": ""
+    }, {
+        "text": "499",
+        "link": ""
+    }, {
+        "text": ">",
+        "link": ""
+    }]
+>>>>>>> 88704dcda88a3a601fb52fe86b6d51f2f871d5a7
 }
\ No newline at end of file

 {
-    "writer320_js": true,
+    "writer": true,
     "user": "http://cmsres.dev.yoho.cn/images/temp/user-pic.png",
     "hasComment": [
         {

@@ -48,7 +48,7 @@
         "channel/magazine/index320": "mvc-config-magazine320",
         "channel/video/index320": "mvc-config-video320",
         "writer/default/index320": "mvc-config-writer320",
-        "tags/index320": "mvc-config-tags320",
+        "channel/tags/index320": "mvc-config-tags320",
         "search/index320": "mvc-config-search320",
         "channel/fashion/index320": "mvc-config-fashion320",
         "channel/beauty/index320": "mvc-config-beauty320",
@@ -56,6 +56,7 @@
         "channel/lifestyle/index320": "mvc-config-lifestyle320",
         "channel/detail/index320": "mvc-config-detail320",
 
+        "channel/about": "mvc-config-about",
         "channel/about/index": "mvc-config-about",
         "channel/about/contactus": "mvc-config-about",
         "channel/about/feedback": "mvc-config-about",