fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 162e49c325e248e95ca41ec67c1c4f1df7bb1822 2 parents 0e4ca9d6 d1a2b989

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop 

Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
Inline Side-by-side
Showing 24 changed files with 575 additions and 64 deletions
@@ -3,4 +3,5 @@ nbproject @@ -3,4 +3,5 @@ nbproject
3 .idea 3 .idea
4 .gitignore 4 .gitignore
5 .gitmodules 5 .gitmodules
6 -compile/  
  6 +compile/
  7 +script/nginx/logs
@@ -242,14 +242,18 @@ @@ -242,14 +242,18 @@
242 text: '', 242 text: '',
243 publishTime: '', 243 publishTime: '',
244 pageView: '', 244 pageView: '',
  245 + //APP打开显示收藏，WAP打开显示点赞
245 like: { 246 like: {
246 isLiked: true, 247 isLiked: true,
247 count: 1 248 count: 1
248 }, 249 },
  250 + collect: {
  251 + isCollected: true
  252 + },
249 share: false, 253 share: false,
250 isFashionMan: true, //标签分类:isTip、isCollocation、isFashionMan、isFashionGood、isTopic 254 isFashionMan: true, //标签分类:isTip、isCollocation、isFashionMan、isFashionGood、isTopic
251 author: { 255 author: {
252 - id: '', 256 + url: '',
253 avatar: '', 257 avatar: '',
254 name: '' 258 name: ''
255 } 259 }
This diff could not be displayed because it is too large.
@@ -18,7 +18,7 @@ var $infoList = $('#info-list'), @@ -18,7 +18,7 @@ var $infoList = $('#info-list'),
18 $infos = $infoList.children('.info-list'), 18 $infos = $infoList.children('.info-list'),
19 $nav = $('#guang-nav'), 19 $nav = $('#guang-nav'),
20 $curNav = $nav.children('.focus'), 20 $curNav = $nav.children('.focus'),
21 - curIndex = $curNav.index(); 21 + curType = $curNav.data('type');
22 22
23 var state = {}; 23 var state = {};
24 24
@@ -67,15 +67,11 @@ $nav.delegate('.guang-nav-item', 'touchstart', function() { @@ -67,15 +67,11 @@ $nav.delegate('.guang-nav-item', 'touchstart', function() {
67 setLazyLoadAndMellipsis($content.children('.guang-info')); 67 setLazyLoadAndMellipsis($content.children('.guang-info'));
68 68
69 $curNav = $this; 69 $curNav = $this;
70 - curIndex = index; 70 + curType = $this.data('type');
71 }); 71 });
72 72
73 $(document).scroll(function() { 73 $(document).scroll(function() {
74 - if (state[curIndex].end) {  
75 - return;  
76 - }  
77 -  
78 - if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH) {  
79 - loadMore($infos, state[curIndex]); 74 + if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH && !state[curType].end) {
  75 + loadMore($infos, state[curType]);
80 } 76 }
81 }); 77 });
@@ -24,6 +24,9 @@ $('#nav-tab').delegate('li', 'touchstart', function() { @@ -24,6 +24,9 @@ $('#nav-tab').delegate('li', 'touchstart', function() {
24 if ($(this).hasClass('focus')) { 24 if ($(this).hasClass('focus')) {
25 return; 25 return;
26 } 26 }
  27 +
27 $navs.toggleClass('focus'); 28 $navs.toggleClass('focus');
28 $contents.toggleClass('hide'); 29 $contents.toggleClass('hide');
  30 +
  31 + $(document).trigger('scroll'); //Trigger lazyLoad
29 }); 32 });
@@ -3,8 +3,5 @@ @@ -3,8 +3,5 @@
3 * @author: liangzhifeng<zhifeng.liang@yoho.cn> 3 * @author: liangzhifeng<zhifeng.liang@yoho.cn>
4 * @date: 2015/10/12 4 * @date: 2015/10/12
5 */ 5 */
6 - var $ = require('yoho.zepto'),  
7 - lazyLoad = require('yoho.lazyload');  
8 6
9 -//Init LazyLoad  
10 -lazyLoad($('img.lazy'));  
  7 +require('./home');
@@ -15,7 +15,6 @@ var swiperClass; @@ -15,7 +15,6 @@ var swiperClass;
15 15
16 var requestFrame, 16 var requestFrame,
17 thisFunc, 17 thisFunc,
18 - prefixList,  
19 start = 0, 18 start = 0,
20 i, 19 i,
21 supportCss3, 20 supportCss3,
@@ -26,7 +25,6 @@ lazyLoad($('img.lazy')); @@ -26,7 +25,6 @@ lazyLoad($('img.lazy'));
26 25
27 //$('img:in-viewport').trigger('appear'); 26 //$('img:in-viewport').trigger('appear');
28 27
29 -  
30 //点击首页汉堡menu图标，滑出侧栏导航 28 //点击首页汉堡menu图标，滑出侧栏导航
31 $('.nav-btn').on('click', function (event) { 29 $('.nav-btn').on('click', function (event) {
32 if (!$(this).hasClass('menu-open')) { 30 if (!$(this).hasClass('menu-open')) {
@@ -152,18 +150,20 @@ $('.header-download').on('click', '.close-btn', function () { @@ -152,18 +150,20 @@ $('.header-download').on('click', '.close-btn', function () {
152 150
153 //logo动画 151 //logo动画
154 requestFrame = (function () { 152 requestFrame = (function () {
155 - prefixList = ['webkit', 'moz', 'ms']; 153 + var tempFunc = null,
  154 + prefixList = ['webkit', 'moz', 'ms'];
156 155
157 for (i = 0; i < prefixList.length; i++) { 156 for (i = 0; i < prefixList.length; i++) {
158 thisFunc = prefixList[i] + 'RequestAnimationFrame'; 157 thisFunc = prefixList[i] + 'RequestAnimationFrame';
159 if (window[thisFunc]) { 158 if (window[thisFunc]) {
160 supportCss3 = true; 159 supportCss3 = true;
  160 + tempFunc = thisFunc;
161 } 161 }
162 } 162 }
163 163
164 if (supportCss3) { 164 if (supportCss3) {
165 return function (callback) { 165 return function (callback) {
166 - window[thisFunc](callback); 166 + window[tempFunc](callback);
167 }; 167 };
168 } 168 }
169 return function (callback) { 169 return function (callback) {
  1 +/**
  2 + * 儿童
  3 + * @author: liangzhifeng<zhifeng.liang@yoho.cn>
  4 + * @date: 2015/10/12
  5 + */
  6 +
  7 +require('./home');
  1 +/**
  2 + * 创意生活
  3 + * @author: liangzhifeng<zhifeng.liang@yoho.cn>
  4 + * @date: 2015/10/12
  5 + */
  6 +
  7 +require('./home');
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 35
36 li { 36 li {
37 display: block; 37 display: block;
  38 + box-sizing: border-box;
38 float: left; 39 float: left;
39 height: 100%; 40 height: 100%;
40 line-height: 71rem / $pxConvertRem; 41 line-height: 71rem / $pxConvertRem;
@@ -5,6 +5,28 @@ @@ -5,6 +5,28 @@
5 border-bottom: 1px solid #e0e0e0; 5 border-bottom: 1px solid #e0e0e0;
6 background: #fff; 6 background: #fff;
7 7
  8 + .info-author {
  9 + display: block;
  10 + width: 100%;
  11 +
  12 + .avatar {
  13 + float: left;
  14 + margin-top: 20rem / $pxConvertRem;
  15 + width: 50rem / $pxConvertRem;
  16 + height: 50rem / $pxConvertRem;
  17 + margin-left: 30rem / $pxConvertRem;
  18 + @include border-radius(50%);
  19 + }
  20 +
  21 + .name {
  22 + float: left;
  23 + margin-left: 30rem / $pxConvertRem;
  24 + padding: 30rem / $pxConvertRem 0;
  25 + font-size: 28rem / $pxConvertRem;
  26 + color: #000;
  27 + }
  28 + }
  29 +
8 &:last-child { 30 &:last-child {
9 margin-bottom: 0; 31 margin-bottom: 0;
10 } 32 }
@@ -36,6 +36,11 @@ @@ -36,6 +36,11 @@
36 &:last-child { 36 &:last-child {
37 margin-bottom: 0; 37 margin-bottom: 0;
38 } 38 }
  39 +
  40 + > a {
  41 + display: block;
  42 + height: 310rem / $pxConvertRem;
  43 + }
39 } 44 }
40 45
41 .content.hide { 46 .content.hide {
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 float: left; 18 float: left;
19 } 19 }
20 20
21 - .like-btn, .share-btn { 21 + .iconfont {
22 position: relative; 22 position: relative;
23 height: 60rem / $pxConvertRem; 23 height: 60rem / $pxConvertRem;
24 line-height: 60rem / $pxConvertRem; 24 line-height: 60rem / $pxConvertRem;
@@ -40,5 +40,12 @@ @@ -40,5 +40,12 @@
40 .like-btn.like { 40 .like-btn.like {
41 color: #444; 41 color: #444;
42 } 42 }
  43 +
  44 + .collect-btn {
  45 + margin-left: 20rem / $pxConvertRem;
  46 + &.collected {
  47 + color: #444;
  48 + }
  49 + }
43 } 50 }
44 } 51 }
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 {{> guang/ps_item}} 11 {{> guang/ps_item}}
12 {{/ star}} 12 {{/ star}}
13 </ul> 13 </ul>
14 - <ul class="plus-content content"> 14 + <ul class="plus-content content hide">
15 {{# plus}} 15 {{# plus}}
16 {{> guang/ps_item}} 16 {{> guang/ps_item}}
17 {{/ plus}} 17 {{/ plus}}
1 {{>layout/header}} 1 {{>layout/header}}
2 2
3 -<code>  
4 -{{#focus}}  
5 -<ul>  
6 -{{#each data}}  
7 -{{#data}}  
8 -<li><img src="{{src}}" alt="{{title}}"></li>  
9 -{{/data}}  
10 -{{/each}}  
11 -</ul>  
12 -{{/focus}}  
13 -</code> 3 +{{# headerBanner}}
  4 + {{> common/banner_top}}
  5 +{{/ headerBanner}}
  6 +
  7 +{{> mewsale/sgoods_nav}}
  8 +
  9 +{{>layout/footer}}
14 10
15 -{{>layout/footer}}  
@@ -19,3 +19,4 @@ @@ -19,3 +19,4 @@
19 </div> 19 </div>
20 </div> 20 </div>
21 21
  22 +
1 <div class="guang-info" data-id="{{id}}"> 1 <div class="guang-info" data-id="{{id}}">
  2 + {{# author}}
  3 + <a class="info-author clearfix" href={{url}}>
  4 + <img class="lazy avatar" data-original={{avatar}}>
  5 + <span class="name">{{name}}</span>
  6 + </a>
  7 + {{/ author}}
  8 +
2 <div class="info-img"> 9 <div class="info-img">
3 {{#if showTags}} 10 {{#if showTags}}
4 <a href="javascript:;" class="info-match"> 11 <a href="javascript:;" class="info-match">
@@ -5,9 +5,12 @@ @@ -5,9 +5,12 @@
5 <span class="page-view">{{pageView}}</span> 5 <span class="page-view">{{pageView}}</span>
6 <div class="like-share-container"> 6 <div class="like-share-container">
7 {{# like}} 7 {{# like}}
8 - <a href="javascript:;" class="iconfont like-btn{{#isLiked}} like{{/isLiked}}">&#xe601;</a> 8 + <i class="iconfont like-btn{{#isLiked}} like{{/isLiked}}">&#xe601;</i>
9 <span class="like-count">{{count}}</span> 9 <span class="like-count">{{count}}</span>
10 {{/ like}} 10 {{/ like}}
  11 + {{# collect}}
  12 + <i class="iconfont collect-btn{{#isCollected}} collected{{/isCollected}}">&#xe605;</i>
  13 + {{/ collect}}
11 {{# share}} 14 {{# share}}
12 <a href="{{.}}" class="iconfont share-btn">&#xe600;</a> 15 <a href="{{.}}" class="iconfont share-btn">&#xe600;</a>
13 {{/ share}} 16 {{/ share}}
@@ -104,12 +104,6 @@ @@ -104,12 +104,6 @@
104 </script> 104 </script>
105 {{/if}} 105 {{/if}}
106 106
107 -  
108 -<script>  
109 - seajs.use('js/homePage/index');  
110 -</script>  
111 -  
112 -  
113 {{!-- 品类 --}} 107 {{!-- 品类 --}}
114 {{#if categoryPage}} 108 {{#if categoryPage}}
115 <script> 109 <script>
1 -{{# headerBanner}}  
2 -<div class="header-banner swiper-container">  
3 - <div class="swiper-wrapper">  
4 - {{# list}}  
5 - <div class="swiper-slide">  
6 - <a href="{{url}}">  
7 - <img src="{{img}}">  
8 - {{# desc}}  
9 - <span class="desc">{{../desc}}</span>  
10 - {{/ desc}}  
11 - </a>  
12 - </div>  
13 - {{/ list}}  
14 - </div>  
15 -</div>  
16 -{{/ headerBanner}}  
@@ -39,6 +39,438 @@ class GirlsController extends AbstractAction @@ -39,6 +39,438 @@ class GirlsController extends AbstractAction
39 $data['content'][] = array('maybeLike' =>$maybeLike); 39 $data['content'][] = array('maybeLike' =>$maybeLike);
40 }*/ 40 }*/
41 41
  42 + $data = array(
  43 + 'grilsHomePage' => true,
  44 + 'headerDownload' => array(
  45 + 'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
  46 + 'url' => 'http://www.baidu.com'
  47 + ),
  48 + 'homeHeader' => array(
  49 + 'bgColor' => '#FF88AE',
  50 + 'searchUrl' => ''
  51 + ),
  52 + 'sideNav' => array(
  53 + array(
  54 + 'textCn' => '男生',
  55 + 'textEn' => 'Boys',
  56 + 'styleClass' => 'boys',
  57 + 'url' => ''
  58 + ),
  59 + array(
  60 + 'textCn' => '女生',
  61 + 'textEn' => 'GIRLS',
  62 + 'styleClass' => 'girls',
  63 + 'url' => ''
  64 + ),
  65 + array(
  66 + 'textCn' => '潮童',
  67 + 'textEn' => 'KIDS',
  68 + 'styleClass' => 'kids',
  69 + 'url' => ''
  70 + ),
  71 + array(
  72 + 'textCn' => '创意生活',
  73 + 'textEn' => 'LIFE STYLE',
  74 + 'styleClass' => 'life',
  75 + 'url' => ''
  76 + ),
  77 + array(
  78 + 'textCn' => '逛',
  79 + 'textEn' => 'TRENDFINDER',
  80 + 'styleClass' => 'guang',
  81 + 'subNav' => array(
  82 + 'list' => array(
  83 + array(
  84 + 'textCn' => '逛',
  85 + 'textEn' => 'TrendFinder',
  86 + 'back' => true,
  87 + 'bgColor' => '#fd307f'
  88 + ),
  89 + array(
  90 + 'textCn' => '查看全部',
  91 + 'url' => ''
  92 + ),
  93 + array(
  94 + 'textCn' => '只看男生',
  95 + 'textEn' => 'Boys',
  96 + 'url' => ''
  97 + ),
  98 + array(
  99 + 'textCn' => '只看女生',
  100 + 'textEn' => 'Girls',
  101 + 'url' => '',
  102 + 'isSelect' => true
  103 + )
  104 + )
  105 + )
  106 + )
  107 + ),
  108 + 'content' => array(
  109 + 'bannerTop' => array(
  110 + 'list' => array(
  111 + array(
  112 + 'url' => '',
  113 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
  114 + ),
  115 + array(
  116 + 'url' => '',
  117 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
  118 + ),
  119 + array(
  120 + 'url' => '',
  121 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
  122 + )
  123 + )
  124 + ),
  125 + 'iconsEnter' => array(
  126 + 'list' => array(
  127 + array(
  128 + 'url' => '',
  129 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  130 + 'text' => '新品到着'
  131 + ),
  132 + array(
  133 + 'url' => '',
  134 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  135 + 'text' => '全球优选'
  136 + ),
  137 + array(
  138 + 'url' => '',
  139 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  140 + 'text' => '明星潮牌'
  141 + ),
  142 + array(
  143 + 'url' => '',
  144 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  145 + 'text' => '全部品类'
  146 + ),
  147 + array(
  148 + 'url' => '',
  149 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  150 + 'text' => '逛'
  151 + ),
  152 + array(
  153 + 'url' => '',
  154 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  155 + 'text' => '搭配指南'
  156 + ),
  157 + array(
  158 + 'url' => '',
  159 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  160 + 'text' => '潮品推荐'
  161 + ),
  162 + array(
  163 + 'url' => '',
  164 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
  165 + 'text' => '折扣精选'
  166 + )
  167 + )
  168 + ),
  169 + 'bannerCenter' => array(
  170 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
  171 + 'url' => ''
  172 + ),
  173 +
  174 + 'hotCategory' => array(
  175 + 'title' => array(
  176 + 'name' => '热门品类'
  177 + ),
  178 + 'list' => array(
  179 + array(
  180 + 'textCn' => '卫衣',
  181 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  182 + 'url' => ''
  183 + ),
  184 + array(
  185 + 'textCn' => 'T恤',
  186 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  187 + 'url' => ''
  188 + ),
  189 + array(
  190 + 'textCn' => '打底衫',
  191 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  192 + 'url' => ''
  193 + ),
  194 + array(
  195 + 'textCn' => '打底衫',
  196 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  197 + 'url' => ''
  198 + ),
  199 + array(
  200 + 'textCn' => '打底衫',
  201 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  202 + 'url' => ''
  203 + ),
  204 + array(
  205 + 'textCn' => '打底衫',
  206 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  207 + 'url' => ''
  208 + ),
  209 + array(
  210 + 'textCn' => '打底衫',
  211 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  212 + 'url' => ''
  213 + ),
  214 + array(
  215 + 'textCn' => '打底衫',
  216 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  217 + 'url' => ''
  218 + )
  219 + )
  220 + ),
  221 + 'hotBrands' => array(
  222 + 'title' => array(
  223 + 'name' => '热门品牌'
  224 + ),
  225 + 'list' => array(
  226 + array(
  227 + 'textCn' => 'Moussy',
  228 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  229 + 'url' => ''
  230 + ),
  231 + array(
  232 + 'textCn' => 'Moussy',
  233 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  234 + 'url' => ''
  235 + ),
  236 + array(
  237 + 'textCn' => 'Moussy',
  238 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  239 + 'url' => ''
  240 + ),
  241 + array(
  242 + 'textCn' => 'Moussy',
  243 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  244 + 'url' => ''
  245 + ),
  246 + array(
  247 + 'textCn' => 'Moussy',
  248 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  249 + 'url' => ''
  250 + ),
  251 + array(
  252 + 'textCn' => 'Moussy',
  253 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  254 + 'url' => ''
  255 + )
  256 + )
  257 + ),
  258 +
  259 + 'trendColloaction' => array(
  260 + 'title' => array(
  261 + 'title' => '潮人 ▪ 搭配',
  262 + 'more_name' => '...',
  263 + 'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
  264 + ),
  265 + 'article' => array(
  266 + array(
  267 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  268 + 'url' => ''
  269 + ),
  270 + array(
  271 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  272 + 'url' => ''
  273 + )
  274 + ),
  275 +
  276 + 'recommend_collocation' => array(
  277 + array(
  278 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  279 + 'url' => ''
  280 + ),
  281 + array(
  282 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  283 + 'url' => ''
  284 + ),
  285 + array(
  286 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  287 + 'url' => ''
  288 + ),
  289 + array(
  290 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  291 + 'url' => ''
  292 + ),
  293 + array(
  294 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  295 + 'url' => ''
  296 + )
  297 + )
  298 + ),
  299 + 'trendTopics' => array(
  300 + 'title' => array(
  301 + 'title' => '潮品 ▪ 话题',
  302 + 'more_name' => '...',
  303 + 'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
  304 + ),
  305 + 'list' => array(
  306 + array(
  307 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  308 + 'url' => '',
  309 + 'title' => '现代裁剪',
  310 + 'time' => '2月13日 12:34'
  311 + ),
  312 + array(
  313 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  314 + 'url' => '',
  315 + 'title' => '现代裁剪',
  316 + 'time' => '2月13日 12:34'
  317 + ),
  318 + array(
  319 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  320 + 'url' => '',
  321 + 'title' => '现代裁剪',
  322 + 'time' => '2月13日 12:34'
  323 + )
  324 + )
  325 + ),
  326 + 'goodsCategory' => array(
  327 + 'title' => array(
  328 + 'title' => '潮流时装',
  329 + 'more_name' => '...',
  330 + 'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
  331 + ),
  332 + 'big_image' => array(
  333 + 'list' => array(
  334 + array(
  335 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  336 + 'url' => ''
  337 + )
  338 + )
  339 + ),
  340 + 'list' => array(
  341 + array(
  342 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  343 + 'url' => '',
  344 + 'textCn' => '手表'
  345 + ),
  346 + array(
  347 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  348 + 'url' => '',
  349 + 'textCn' => '烛台'
  350 + ),
  351 + array(
  352 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  353 + 'url' => '',
  354 + 'textCn' => '围巾'
  355 + ),
  356 + array(
  357 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  358 + 'url' => '',
  359 + 'textCn' => '盘子'
  360 + ),
  361 + array(
  362 + 'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
  363 + 'url' => '',
  364 + 'textCn' => '耳机'
  365 + )
  366 + )
  367 + ),
  368 + 'creativeLife' => array(
  369 + 'title' => array(
  370 + 'title' => '新入住品牌',
  371 + 'more_name' => '...',
  372 + 'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
  373 + ),
  374 + 'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',
  375 + 'classify' => array(
  376 + array(
  377 + 'url' => '',
  378 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  379 + 'name' => '手表'
  380 + ), array(
  381 + 'url' => '',
  382 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  383 + 'name' => '烛台'
  384 + ), array(
  385 + 'url' => '',
  386 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  387 + 'name' => '围巾'
  388 + ), array(
  389 + 'url' => '',
  390 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  391 + 'name' => '盘子'
  392 + ), array(
  393 + 'url' => '',
  394 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  395 + 'name' => '耳机'
  396 + ), array(
  397 + 'url' => '',
  398 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  399 + 'name' => '生活'
  400 + )
  401 + )
  402 + ),
  403 +
  404 +
  405 + 'plusStar' => array(
  406 + array(
  407 + 'name' => 'PLUS 全球优选',
  408 + 'url' => '',
  409 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
  410 + ),
  411 + array(
  412 + 'name' => 'PLUS 全球优选',
  413 + 'url' => '',
  414 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
  415 + )
  416 + ),
  417 +
  418 + 'maybeLike' => array(
  419 + 'goods' => array(
  420 + array(
  421 + 'id' => 1,
  422 + 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  423 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  424 + 'isLike' => false,
  425 + 'price' => 1268,
  426 + 'salePrice' => 589,
  427 + 'isSale' => true,
  428 + 'isFew' => true,
  429 + 'isNew' => false,
  430 + 'url' => ''
  431 + ), array(
  432 + 'id' => 2,
  433 + 'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  434 + 'name' => 'CLOTtee 撞色连帽外套',
  435 + 'isLike' => false,
  436 + 'price' => 488,
  437 + 'salePrice' => 139,
  438 + 'isSale' => true,
  439 + 'isFew' => true,
  440 + 'isNew' => false,
  441 + 'url' => ''
  442 + ), array(
  443 + 'id' => 3,
  444 + 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  445 + 'name' => 'HALFGIRL 插肩棒球服短裙套装',
  446 + 'isLike' => true,
  447 + 'price' => 478,
  448 + 'salePrice' => 208,
  449 + 'isSale' => true,
  450 + 'isFew' => true,
  451 + 'isNew' => false,
  452 + 'url' => ''
  453 + ), array(
  454 + 'id' => 4,
  455 + 'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  456 + 'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',
  457 + 'isLike' => false,
  458 + 'salePrice' => 148,
  459 + 'isSale' => false,
  460 + 'isFew' => false,
  461 + 'isNew' => true,
  462 + 'url' => ''
  463 + )
  464 + )
  465 + ),
  466 +
  467 + 'bannerBottom' => array(
  468 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
  469 + 'url' => ''
  470 + )
  471 +
  472 + ));
  473 +
42 $this->_view->assign('title', 'YOHO!有货'); 474 $this->_view->assign('title', 'YOHO!有货');
43 $this->_view->display('index', $data); 475 $this->_view->display('index', $data);
44 } 476 }
@@ -68,7 +68,12 @@ class ListController extends AbstractAction @@ -68,7 +68,12 @@ class ListController extends AbstractAction
68 'share' => true, 68 'share' => true,
69 'url' => '', 69 'url' => '',
70 'likeUrl' => '', 70 'likeUrl' => '',
71 - 'isFashionMan' => true 71 + 'isFashionMan' => true,
  72 + 'author' => array(
  73 + 'url' => '',
  74 + 'name' => 'LEO_LU',
  75 + 'avatar' => 'http://img11.static.yhbimg.com/yhb-img02/2015/09/07/02/01a050445c64825eed381c4e049030c692.jpg?imageView/0/w/100/h/100'
  76 + )
72 ), 77 ),
73 array( 78 array(
74 'id' => 1, 79 'id' => 1,
@@ -79,14 +84,18 @@ class ListController extends AbstractAction @@ -79,14 +84,18 @@ class ListController extends AbstractAction
79 'showTags' => true, 84 'showTags' => true,
80 'publishTime' => '2月13日 12:34', 85 'publishTime' => '2月13日 12:34',
81 'pageView' => 3445, 86 'pageView' => 3445,
82 - 'like' => array(  
83 - 'count' => 459,  
84 - 'isLiked' => true 87 + 'collect' => array(
  88 + 'isCollected' => true
85 ), 89 ),
86 'share' => true, 90 'share' => true,
87 'url' => '', 91 'url' => '',
88 'likeUrl' => '', 92 'likeUrl' => '',
89 - 'isTip' => true 93 + 'isTip' => true,
  94 + 'author' => array(
  95 + 'url' => '',
  96 + 'name' => 'Kishi',
  97 + 'avatar' => 'http://img13.static.yhbimg.com/yhb-img02/2015/06/12/10/0256020c504fb08a176c5457599bdf5b49.jpg?imageView/0/w/100/h/100'
  98 + )
90 ) 99 )
91 ) 100 )
92 ), 101 ),
@@ -276,7 +285,7 @@ class ListController extends AbstractAction @@ -276,7 +285,7 @@ class ListController extends AbstractAction
276 ) 285 )
277 ); 286 );
278 $this->_view->assign('title', 'YOHO!有货'); 287 $this->_view->assign('title', 'YOHO!有货');
279 - $this->_view->display('index', array('modulePath' => 'guang/home', 'guang' => $data)); 288 + $this->_view->display('index', array('guangHome' => true, 'guang' => $data));
280 } 289 }
281 290
282 /** 291 /**
@@ -10,7 +10,7 @@ class NewsaleController extends AbstractAction @@ -10,7 +10,7 @@ class NewsaleController extends AbstractAction
10 { 10 {
11 public function indexAction() 11 public function indexAction()
12 { 12 {
13 - $this->_view->assign('title', '新品到着'); 13 + /*$this->_view->assign('title', '新品到着');
14 14
15 // 新品到着顶部焦点图 15 // 新品到着顶部焦点图
16 $focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d'); 16 $focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d');
@@ -31,7 +31,43 @@ class NewsaleController extends AbstractAction @@ -31,7 +31,43 @@ class NewsaleController extends AbstractAction
31 $products = Newsale::getNewProducts('1,3', 1, 60); 31 $products = Newsale::getNewProducts('1,3', 1, 60);
32 var_dump($focus); 32 var_dump($focus);
33 33
34 - $this->_view->display('new', compact('focus', 'products')); 34 + $this->_view->display('new', compact('focus', 'products'));*/
  35 +
  36 + $data = array(
  37 + 'headerBanner' => array(
  38 + 'list' => array(
  39 + array(
  40 + 'url' => '',
  41 + 'img' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  42 + )
  43 + )
  44 + ),
  45 + 'listNav' => array(
  46 + 'list' => array(
  47 + array(
  48 + 'url' => '',
  49 + 'textCn' => '5月27日',
  50 + 'styleClass' => ''
  51 + ),
  52 + array(
  53 + 'url' => '',
  54 + 'textCn' => '本周上新'
  55 + ),
  56 + array(
  57 + 'url' => '',
  58 + 'textCn' => '销量'
  59 + ),
  60 + array(
  61 + 'url' => '',
  62 + 'textCn' => '筛选',
  63 + 'styleClass' => 'screen-nav'
  64 + )
  65 + )
  66 + )
  67 + );
  68 +
  69 + $this->_view->assign('title', '新品到着');
  70 + $this->_view->display('new', $data);
35 } 71 }
36 72
37 73