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

Conflicts: views

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
Conflicts: views
happyhour7
Commit 876224abb22f8aeb0a9b4fb3b014e1d1e3c42e42 2 parents 12c85a6c 04f9b2b5
Showing 9 changed files with 177 additions and 21 deletions
mvc-config-index320.json
mvc-config-links320.json
mvc-config-magazine320.json
mvc-config-search320.json
mvc-config-tags320.json
mvc-config-writer320.json
mvc-config.json
views
手机端数据格式说明.xls
--- a/mvc-config-index320.json
View file @876224a
+++ b/mvc-config-index320.json
View file @876224a
@@ -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 逝世近...  "
         }
--- a/mvc-config-links320.json 0 → 100644
View file @876224a
+++ b/mvc-config-links320.json 0 → 100644
View file @876224a
+ {
+     "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
--- a/mvc-config-magazine320.json
View file @876224a
+++ b/mvc-config-magazine320.json
View file @876224a
@@ -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
--- a/mvc-config-search320.json
View file @876224a
+++ b/mvc-config-search320.json
View file @876224a
 {
-     "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 逝世近...  "
         }
--- a/mvc-config-tags320.json
View file @876224a
+++ b/mvc-config-tags320.json
View file @876224a
 {
-     "channel": "fashion",
     "tags": ["香港","YOHO","world we made","帕罗奥图","steven"],
     "indexContent": [
         {
--- a/mvc-config-writer320.json
View file @876224a
+++ b/mvc-config-writer320.json
View file @876224a
 {
-     "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 逝世近...  "
         }
--- a/mvc-config.json
View file @876224a
+++ b/mvc-config.json
View file @876224a
@@ -48,12 +48,13 @@
         "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",
         "channel/lifestyle/index320": "mvc-config-lifestyle320",
-         "channel/detail/index320": "mvc-config-detail320"
+         "channel/detail/index320": "mvc-config-detail320",
+         "channel/about/links320": "mvc-config-links320"
 
     },
     "ajax": {
@@ -748,5 +749,8 @@
             },
             "message": ""
         }
+ 
+ 
+ 
     }
 }
--- a/views @ b7949e42
+++ b/views @ b7949e42
- Subproject commit 1407f27d8cd67169f973965da3e30d2a8d65c35e
+ Subproject commit b7949e428c18ba4cf8d359a5ad9f9fb9ff9d3336
--- a/手机端数据格式说明.xls
View file @876224a
+++ b/手机端数据格式说明.xls
View file @876224a