ued / yohogirls-views · Commits

Go to a project

Authored by 2586703@qq.com
Commit bddc8d74178cb422daf1cd091ba0e9088bd0a8e5 2 parents 27d504c6 dca1c3f0

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

冲突调试
Conflicts:
	mvc-config.json
Inline Side-by-side
Showing 11 changed files with 246 additions and 54 deletions
{
"detail320_js": "true",
"detail": {
"title": "Hello",
"subTitle": "Mustache",
... ... @@ -8,34 +9,43 @@
"tag": "javascript",
"time": "2015 08 12",
"coverUrl": "#",
"banner": [
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg"
],
"tags": [
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
}
]
"detailStr": "#",
"coverSwiper": {
"banner": [
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg",
"http://cmsres.dev.yoho.cn/images/temp/detail.jpg"
]
},
"coverPic": {
"img": "http://cmsres.dev.yoho.cn/images/temp/detail.jpg"
},
"coverEffect": {
"html": ""
},
"prevLink": "#",
"prevTitle": "上一篇文章的名字",
"nextLink": "#",
"nextTitle": "下一篇文章的名字"
},
"prevLink": "#",
"prevTitle": "上一篇",
"nextLink": "#",
"nextTitle": "下一篇"
"tags": [
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
},
{
"link": "#",
"name": "香港"
}
]
}
\ No newline at end of file
... ...
... ... @@ -55,56 +55,70 @@
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "fashion",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"channelLink": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"channelLink": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"channelLink": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"channelLink": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"pop":"true",
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home-modify_03.jpg",
"href": "#",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
}
... ...
{
"textLink": [
{
"link": "#",
"text": "YOHO"
},
{
"link": "#",
"text": "YOHO"
},
{
"link": "#",
"text": "YOHO"
}
],
"imgLink": [
{
"link": "#",
"img": "http://cmsres.test.yoho.cn/res/new/boys/images/about/links06.png"
},
{
"link": "#",
"img": "http://cmsres.test.yoho.cn/res/new/boys/images/about/links06.png"
},
{
"link": "#",
"img": "http://cmsres.test.yoho.cn/res/new/boys/images/about/links06.png"
},
{
"link": "#",
"img": "http://cmsres.test.yoho.cn/res/new/boys/images/about/links06.png"
}
]
}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
"magazine320_js": "true",
"channel": "magazine",
"magazineBanner": {
"only": false,
"isOne": false,
"buyLink": "#",
"bannerItem": [
{
... ... @@ -54,5 +54,9 @@
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-magazine_13.jpg",
"time": "2013.12.15"
}
]
],
"share": {
"cover": "http://img02.yohoboys.com/contentimg/2015/02/02/16/028da5118e88b286186e1775a2e7c2303e.jpg?imageMogr2/thumbnail/580x370",
"dataLink": "http://newboys.test.yoho.cn/channel/detail/index/id/1283/time/1430185237"
}
}
\ No newline at end of file
... ...
{
"indexContent": [
"search320_js": "true",
"content": [
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"href": "#",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "fashion",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"pop":"true",
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home-modify_03.jpg",
"href": "#",
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"href": "#",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"pop":"true",
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home-modify_03.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
}
... ...
{
"channel": "fashion",
"tags": ["香港","YOHO","world we made","帕罗奥图","steven"],
"indexContent": [
{
... ...
... ... @@ -2,7 +2,7 @@
"video320_js": "true",
"channel": "video",
"channelBanner":{
"only": false,
"isOne": false,
"bannerItem": [
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_23.jpg",
... ...
... ... @@ -18,9 +18,34 @@
"girlDownloadUrl":"http://localhost:3000/default",
"default_js":true,
"fan":false,
"channel":"default",
"videoSubmenu":[
{
"text":"这是菜单哈哈",
"link":"http://www.baidu.com"
},
{
"isChoosen":true,
"text":"这是菜单哈哈",
"link":"http://www.baidu.com"
},
{
"text":"这是菜单哈哈",
"link":"http://www.baidu.com"
},
{
"text":"这是菜单哈哈",
"link":"http://www.baidu.com"
},
{
"text":"这是菜单哈哈",
"link":"http://www.baidu.com"
}
],
"tvs": [
{
"img": "http://img02.yohoboys.com/contentimg/2015/02/12/09/02cdeedce63d09965f48244ef7e3961448.jpg?imageMogr2/thumbnail/738x424",
... ... @@ -63,13 +88,13 @@
"data":[
{
"isChoosen":true,
"img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
"img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
"link": "http://www.baidu.com"
},{
"img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
"img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
"link": "http://www.baidu.com"
},{
"img": "http://img02.yohoboys.com/staticimg/2014/12/24/16/0278a8c531c6bc6ffb1fedead55689a29c.jpg",
"img": "http://img01.yohoboys.com/staticimg/2014/12/09/09/01568f6fea500fbf172a50ee02334a20ce.jpg",
"link": "http://www.baidu.com"
}
]
... ...
{
"channel": "fashion",
"writer320_js": true,
"user": "http://cmsres.dev.yoho.cn/images/temp/user-pic.png",
"hasComment": [
{
... ... @@ -34,22 +34,77 @@
],
"num": 10
},
"indexContent": [
"content": [
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"href": "#",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "fashion",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"href": "#",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home_26.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
},
{
"pop":"true",
"img": "http://cmsres.dev.yoho.cn/images/temp/h5-home-modify_03.jpg",
"link": "#",
"title": "Audrey Hepurn",
"subTitle": "伦敦影像展",
"channel": "lifestyle",
"channelLink": "#",
"subChannel": "hello",
"subChannelLink": "#",
"time": "22hours ago",
"content": "在“女神”泛滥的今天，依旧有许多经典女神形象是无人能够超越的，Audrey Hepurn 便是其中之一。今年Audrey Hepurn 逝世近... "
}
... ...
... ... @@ -49,7 +49,7 @@
"channel/video/index320": "mvc-config-video320",
"writer/default/index320": "mvc-config-writer320",
"tags/index320": "mvc-config-tags320",
"search/index320": "mvc-config-tags320",
"search/index320": "mvc-config-search320",
"channel/fashion/index320": "mvc-config-fashion320",
"channel/beauty/index320": "mvc-config-beauty320",
"channel/sports/index320": "mvc-config-sport320",
... ... @@ -61,10 +61,12 @@
"channel/about/feedback": "mvc-config-about",
"channel/about/links": "mvc-config-about",
"channel/about/privacy": "mvc-config-about",
"channel/about/servers": "mvc-config-about"
"channel/about/servers": "mvc-config-about",
"channel/about/links320": "mvc-config-links320"
},
"ajax": {
"default/default/getnewest": "",
"todolist/getlist": ["这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list", "这是我的list"],
"todolist/getlist2": {
"ajaxRepeat": 3,
... ... @@ -766,5 +768,8 @@
},
"message": ""
}
}
}
\ No newline at end of file
... ...