Authored by Rock Zhang

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

Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
... ... @@ -3,4 +3,5 @@ nbproject
.idea
.gitignore
.gitmodules
compile/
\ No newline at end of file
compile/
script/nginx/logs
\ No newline at end of file
... ...
... ... @@ -242,14 +242,18 @@
text: '',
publishTime: '',
pageView: '',
//APP打开显示收藏,WAP打开显示点赞
like: {
isLiked: true,
count: 1
},
collect: {
isCollected: true
},
share: false,
isFashionMan: true, //标签分类:isTip、isCollocation、isFashionMan、isFashionGood、isTopic
author: {
id: '',
url: '',
avatar: '',
name: ''
}
... ...
This diff could not be displayed because it is too large.
... ... @@ -18,7 +18,7 @@ var $infoList = $('#info-list'),
$infos = $infoList.children('.info-list'),
$nav = $('#guang-nav'),
$curNav = $nav.children('.focus'),
curIndex = $curNav.index();
curType = $curNav.data('type');
var state = {};
... ... @@ -67,15 +67,11 @@ $nav.delegate('.guang-nav-item', 'touchstart', function() {
setLazyLoadAndMellipsis($content.children('.guang-info'));
$curNav = $this;
curIndex = index;
curType = $this.data('type');
});
$(document).scroll(function() {
if (state[curIndex].end) {
return;
}
if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH) {
loadMore($infos, state[curIndex]);
if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH && !state[curType].end) {
loadMore($infos, state[curType]);
}
});
\ No newline at end of file
... ...
... ... @@ -24,6 +24,9 @@ $('#nav-tab').delegate('li', 'touchstart', function() {
if ($(this).hasClass('focus')) {
return;
}
$navs.toggleClass('focus');
$contents.toggleClass('hide');
$(document).trigger('scroll'); //Trigger lazyLoad
});
\ No newline at end of file
... ...
... ... @@ -3,8 +3,5 @@
* @author: liangzhifeng<zhifeng.liang@yoho.cn>
* @date: 2015/10/12
*/
var $ = require('yoho.zepto'),
lazyLoad = require('yoho.lazyload');
//Init LazyLoad
lazyLoad($('img.lazy'));
\ No newline at end of file
require('./home');
\ No newline at end of file
... ...
... ... @@ -15,7 +15,6 @@ var swiperClass;
var requestFrame,
thisFunc,
prefixList,
start = 0,
i,
supportCss3,
... ... @@ -26,7 +25,6 @@ lazyLoad($('img.lazy'));
//$('img:in-viewport').trigger('appear');
//点击首页汉堡menu图标,滑出侧栏导航
$('.nav-btn').on('click', function (event) {
if (!$(this).hasClass('menu-open')) {
... ... @@ -152,18 +150,20 @@ $('.header-download').on('click', '.close-btn', function () {
//logo动画
requestFrame = (function () {
prefixList = ['webkit', 'moz', 'ms'];
var tempFunc = null,
prefixList = ['webkit', 'moz', 'ms'];
for (i = 0; i < prefixList.length; i++) {
thisFunc = prefixList[i] + 'RequestAnimationFrame';
if (window[thisFunc]) {
supportCss3 = true;
tempFunc = thisFunc;
}
}
if (supportCss3) {
return function (callback) {
window[thisFunc](callback);
window[tempFunc](callback);
};
}
return function (callback) {
... ...
/**
* 儿童
* @author: liangzhifeng<zhifeng.liang@yoho.cn>
* @date: 2015/10/12
*/
require('./home');
\ No newline at end of file
... ...
/**
* 创意生活
* @author: liangzhifeng<zhifeng.liang@yoho.cn>
* @date: 2015/10/12
*/
require('./home');
\ No newline at end of file
... ...
... ... @@ -35,6 +35,7 @@
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
line-height: 71rem / $pxConvertRem;
... ...
... ... @@ -5,6 +5,28 @@
border-bottom: 1px solid #e0e0e0;
background: #fff;
.info-author {
display: block;
width: 100%;
.avatar {
float: left;
margin-top: 20rem / $pxConvertRem;
width: 50rem / $pxConvertRem;
height: 50rem / $pxConvertRem;
margin-left: 30rem / $pxConvertRem;
@include border-radius(50%);
}
.name {
float: left;
margin-left: 30rem / $pxConvertRem;
padding: 30rem / $pxConvertRem 0;
font-size: 28rem / $pxConvertRem;
color: #000;
}
}
&:last-child {
margin-bottom: 0;
}
... ...
... ... @@ -36,6 +36,11 @@
&:last-child {
margin-bottom: 0;
}
> a {
display: block;
height: 310rem / $pxConvertRem;
}
}
.content.hide {
... ...
... ... @@ -18,7 +18,7 @@
float: left;
}
.like-btn, .share-btn {
.iconfont {
position: relative;
height: 60rem / $pxConvertRem;
line-height: 60rem / $pxConvertRem;
... ... @@ -40,5 +40,12 @@
.like-btn.like {
color: #444;
}
.collect-btn {
margin-left: 20rem / $pxConvertRem;
&.collected {
color: #444;
}
}
}
}
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@
{{> guang/ps_item}}
{{/ star}}
</ul>
<ul class="plus-content content">
<ul class="plus-content content hide">
{{# plus}}
{{> guang/ps_item}}
{{/ plus}}
... ...
{{>layout/header}}
<code>
{{#focus}}
<ul>
{{#each data}}
{{#data}}
<li><img src="{{src}}" alt="{{title}}"></li>
{{/data}}
{{/each}}
</ul>
{{/focus}}
</code>
{{# headerBanner}}
{{> common/banner_top}}
{{/ headerBanner}}
{{> mewsale/sgoods_nav}}
{{>layout/footer}}
{{>layout/footer}}
\ No newline at end of file
... ...
<div class="guang-info" data-id="{{id}}">
{{# author}}
<a class="info-author clearfix" href={{url}}>
<img class="lazy avatar" data-original={{avatar}}>
<span class="name">{{name}}</span>
</a>
{{/ author}}
<div class="info-img">
{{#if showTags}}
<a href="javascript:;" class="info-match">
... ...
... ... @@ -5,9 +5,12 @@
<span class="page-view">{{pageView}}</span>
<div class="like-share-container">
{{# like}}
<a href="javascript:;" class="iconfont like-btn{{#isLiked}} like{{/isLiked}}">&#xe601;</a>
<i class="iconfont like-btn{{#isLiked}} like{{/isLiked}}">&#xe601;</i>
<span class="like-count">{{count}}</span>
{{/ like}}
{{# collect}}
<i class="iconfont collect-btn{{#isCollected}} collected{{/isCollected}}">&#xe605;</i>
{{/ collect}}
{{# share}}
<a href="{{.}}" class="iconfont share-btn">&#xe600;</a>
{{/ share}}
... ...
... ... @@ -104,12 +104,6 @@
</script>
{{/if}}
<script>
seajs.use('js/homePage/index');
</script>
{{!-- 品类 --}}
{{#if categoryPage}}
<script>
... ...
{{# headerBanner}}
<div class="header-banner swiper-container">
<div class="swiper-wrapper">
{{# list}}
<div class="swiper-slide">
<a href="{{url}}">
<img src="{{img}}">
{{# desc}}
<span class="desc">{{../desc}}</span>
{{/ desc}}
</a>
</div>
{{/ list}}
</div>
</div>
{{/ headerBanner}}
\ No newline at end of file
... ... @@ -39,6 +39,438 @@ class GirlsController extends AbstractAction
$data['content'][] = array('maybeLike' =>$maybeLike);
}*/
$data = array(
'grilsHomePage' => true,
'headerDownload' => array(
'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
'url' => 'http://www.baidu.com'
),
'homeHeader' => array(
'bgColor' => '#FF88AE',
'searchUrl' => ''
),
'sideNav' => array(
array(
'textCn' => '男生',
'textEn' => 'Boys',
'styleClass' => 'boys',
'url' => ''
),
array(
'textCn' => '女生',
'textEn' => 'GIRLS',
'styleClass' => 'girls',
'url' => ''
),
array(
'textCn' => '潮童',
'textEn' => 'KIDS',
'styleClass' => 'kids',
'url' => ''
),
array(
'textCn' => '创意生活',
'textEn' => 'LIFE STYLE',
'styleClass' => 'life',
'url' => ''
),
array(
'textCn' => '逛',
'textEn' => 'TRENDFINDER',
'styleClass' => 'guang',
'subNav' => array(
'list' => array(
array(
'textCn' => '逛',
'textEn' => 'TrendFinder',
'back' => true,
'bgColor' => '#fd307f'
),
array(
'textCn' => '查看全部',
'url' => ''
),
array(
'textCn' => '只看男生',
'textEn' => 'Boys',
'url' => ''
),
array(
'textCn' => '只看女生',
'textEn' => 'Girls',
'url' => '',
'isSelect' => true
)
)
)
)
),
'content' => array(
'bannerTop' => array(
'list' => array(
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
)
)
),
'iconsEnter' => array(
'list' => array(
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '新品到着'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '全球优选'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '明星潮牌'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '全部品类'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '逛'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '搭配指南'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '潮品推荐'
),
array(
'url' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
'text' => '折扣精选'
)
)
),
'bannerCenter' => array(
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
'url' => ''
),
'hotCategory' => array(
'title' => array(
'name' => '热门品类'
),
'list' => array(
array(
'textCn' => '卫衣',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'T恤',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => '打底衫',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
)
)
),
'hotBrands' => array(
'title' => array(
'name' => '热门品牌'
),
'list' => array(
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'textCn' => 'Moussy',
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
)
)
),
'trendColloaction' => array(
'title' => array(
'title' => '潮人 ▪ 搭配',
'more_name' => '...',
'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
),
'article' => array(
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
)
),
'recommend_collocation' => array(
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
)
)
),
'trendTopics' => array(
'title' => array(
'title' => '潮品 ▪ 话题',
'more_name' => '...',
'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
),
'list' => array(
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'title' => '现代裁剪',
'time' => '2月13日 12:34'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'title' => '现代裁剪',
'time' => '2月13日 12:34'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'title' => '现代裁剪',
'time' => '2月13日 12:34'
)
)
),
'goodsCategory' => array(
'title' => array(
'title' => '潮流时装',
'more_name' => '...',
'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
),
'big_image' => array(
'list' => array(
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => ''
)
)
),
'list' => array(
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'textCn' => '手表'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'textCn' => '烛台'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'textCn' => '围巾'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'textCn' => '盘子'
),
array(
'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
'url' => '',
'textCn' => '耳机'
)
)
),
'creativeLife' => array(
'title' => array(
'title' => '新入住品牌',
'more_name' => '...',
'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
),
'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',
'classify' => array(
array(
'url' => '',
'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '手表'
), array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '烛台'
), array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '围巾'
), array(
'url' => '',
'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '盘子'
), array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '耳机'
), array(
'url' => '',
'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '生活'
)
)
),
'plusStar' => array(
array(
'name' => 'PLUS 全球优选',
'url' => '',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
),
array(
'name' => 'PLUS 全球优选',
'url' => '',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
)
),
'maybeLike' => array(
'goods' => array(
array(
'id' => 1,
'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
'isLike' => false,
'price' => 1268,
'salePrice' => 589,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
), array(
'id' => 2,
'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => 'CLOTtee 撞色连帽外套',
'isLike' => false,
'price' => 488,
'salePrice' => 139,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
), array(
'id' => 3,
'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => 'HALFGIRL 插肩棒球服短裙套装',
'isLike' => true,
'price' => 478,
'salePrice' => 208,
'isSale' => true,
'isFew' => true,
'isNew' => false,
'url' => ''
), array(
'id' => 4,
'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',
'isLike' => false,
'salePrice' => 148,
'isSale' => false,
'isFew' => false,
'isNew' => true,
'url' => ''
)
)
),
'bannerBottom' => array(
'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
'url' => ''
)
));
$this->_view->assign('title', 'YOHO!有货');
$this->_view->display('index', $data);
}
... ...
... ... @@ -68,7 +68,12 @@ class ListController extends AbstractAction
'share' => true,
'url' => '',
'likeUrl' => '',
'isFashionMan' => true
'isFashionMan' => true,
'author' => array(
'url' => '',
'name' => 'LEO_LU',
'avatar' => 'http://img11.static.yhbimg.com/yhb-img02/2015/09/07/02/01a050445c64825eed381c4e049030c692.jpg?imageView/0/w/100/h/100'
)
),
array(
'id' => 1,
... ... @@ -79,14 +84,18 @@ class ListController extends AbstractAction
'showTags' => true,
'publishTime' => '2月13日 12:34',
'pageView' => 3445,
'like' => array(
'count' => 459,
'isLiked' => true
'collect' => array(
'isCollected' => true
),
'share' => true,
'url' => '',
'likeUrl' => '',
'isTip' => true
'isTip' => true,
'author' => array(
'url' => '',
'name' => 'Kishi',
'avatar' => 'http://img13.static.yhbimg.com/yhb-img02/2015/06/12/10/0256020c504fb08a176c5457599bdf5b49.jpg?imageView/0/w/100/h/100'
)
)
)
),
... ... @@ -276,7 +285,7 @@ class ListController extends AbstractAction
)
);
$this->_view->assign('title', 'YOHO!有货');
$this->_view->display('index', array('modulePath' => 'guang/home', 'guang' => $data));
$this->_view->display('index', array('guangHome' => true, 'guang' => $data));
}
/**
... ...
... ... @@ -10,7 +10,7 @@ class NewsaleController extends AbstractAction
{
public function indexAction()
{
$this->_view->assign('title', '新品到着');
/*$this->_view->assign('title', '新品到着');
// 新品到着顶部焦点图
$focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d');
... ... @@ -31,7 +31,43 @@ class NewsaleController extends AbstractAction
$products = Newsale::getNewProducts('1,3', 1, 60);
var_dump($focus);
$this->_view->display('new', compact('focus', 'products'));
$this->_view->display('new', compact('focus', 'products'));*/
$data = array(
'headerBanner' => array(
'list' => array(
array(
'url' => '',
'img' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
)
)
),
'listNav' => array(
'list' => array(
array(
'url' => '',
'textCn' => '5月27日',
'styleClass' => ''
),
array(
'url' => '',
'textCn' => '本周上新'
),
array(
'url' => '',
'textCn' => '销量'
),
array(
'url' => '',
'textCn' => '筛选',
'styleClass' => 'screen-nav'
)
)
)
);
$this->_view->assign('title', '新品到着');
$this->_view->display('new', $data);
}
... ...