fe / YOHOBUYWAP · Commits

Go to a project

Authored by whb
Commit 4764b34363c166a73a3a9ae43fa608a55e4a68c5 1 parent 08c009b5

人气单品修改，模版中的url改为href,名称统一

Inline Side-by-side
Showing 7 changed files with 64 additions and 57 deletions
@@ -791,12 +791,7 @@ class Process @@ -791,12 +791,7 @@ class Process
791 $oneGoods['img'] = Images::getImageUrl($goods['goods_list'][0]['images_url'], 280, 373, 1); 791 $oneGoods['img'] = Images::getImageUrl($goods['goods_list'][0]['images_url'], 280, 373, 1);
792 $oneGoods['name'] = $goods['product_name']; 792 $oneGoods['name'] = $goods['product_name'];
793 $oneGoods['price'] = $goods['sales_price']; 793 $oneGoods['price'] = $goods['sales_price'];
794 - /*  
795 - * if($pos < 4) {  
796 - * $oneGoods['tip'] = 'TOP'.$pos;  
797 - * }  
798 - */  
799 - $url = 'http://item.yohobuy.com/`/product/pro_' . 794 + $url = 'http://item.yohobuy.com/product/pro_' .
800 $goods['product_id'] . '_' . $goods['goods_list'][0]['goods_id'] 795 $goods['product_id'] . '_' . $goods['goods_list'][0]['goods_id']
801 . '/' . $goods['cn_alphabet'] . '.html'; 796 . '/' . $goods['cn_alphabet'] . '.html';
802 $oneGoods['href'] = Helpers::transUrl($url, $type); 797 $oneGoods['href'] = Helpers::transUrl($url, $type);
@@ -807,7 +802,18 @@ class Process @@ -807,7 +802,18 @@ class Process
807 uksort($result, function ($a, $b) use($skns) { 802 uksort($result, function ($a, $b) use($skns) {
808 $skn_arr = explode(' ', $skns); 803 $skn_arr = explode(' ', $skns);
809 return array_search($a, $skn_arr) > array_search($b, $skn_arr); 804 return array_search($a, $skn_arr) > array_search($b, $skn_arr);
810 - }); 805 + });
  806 + $pos = 1;
  807 + //添加TOP标示
  808 + foreach($result as &$val) {
  809 + if($pos < 4) {
  810 + $val['tip'] = 'TOP'.$pos;
  811 + }
  812 + else {
  813 + break;
  814 + }
  815 + $pos ++;
  816 + }
811 return $result; 817 return $result;
812 } 818 }
813 819
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 {{> index/floor-header}} 2 {{> index/floor-header}}
3 <ul class="g-list"> 3 <ul class="g-list">
4 {{#each imgHot}} 4 {{#each imgHot}}
5 - <li><a class="impo{{@index}}" href="{{url}}"><img class="lazy" data-original="{{img}}"/></a></li> 5 + <li><a class="impo{{@index}}" href="{{href}}"><img class="lazy" data-original="{{img}}"/></a></li>
6 {{/each}} 6 {{/each}}
7 </ul> 7 </ul>
8 </div> 8 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <ul class="g-list clearfix"> 4 <ul class="g-list clearfix">
5 {{#each imgHot}} 5 {{#each imgHot}}
6 <li> 6 <li>
7 - <a href="{{url}}"><div class="commodity-img"> 7 + <a href="{{href}}"><div class="commodity-img">
8 {{# tip}} 8 {{# tip}}
9 <i class="top">{{.}}</i> 9 <i class="top">{{.}}</i>
10 {{/ tip}} 10 {{/ tip}}
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </div> 18 </div>
19 <div class="commodity-brands clearfix"> 19 <div class="commodity-brands clearfix">
20 {{#each brands}} 20 {{#each brands}}
21 - <a href="{{url}}" title="{{name}}"><img class="lazy" data-original="{{img}}"/></a> 21 + <a href="{{href}}" title="{{name}}"><img class="lazy" data-original="{{img}}"/></a>
22 {{/each}} 22 {{/each}}
23 </div> 23 </div>
24 </div> 24 </div>
@@ -1944,8 +1944,6 @@ exports.init = function(num) { @@ -1944,8 +1944,6 @@ exports.init = function(num) {
1944 1944
1945 productList.addHandler('MouseEnter', function(event) { 1945 productList.addHandler('MouseEnter', function(event) {
1946 1946
1947 -  
1948 -  
1949 var itemMr = 10, //list的右边距 1947 var itemMr = 10, //list的右边距
1950 itemMb = 35, //list的下边距 1948 itemMb = 35, //list的下边距
1951 ulStr = '', 1949 ulStr = '',
@@ -1958,11 +1956,6 @@ exports.init = function(num) { @@ -1958,11 +1956,6 @@ exports.init = function(num) {
1958 wrapperPt, //鼠标移入时弹层的上内边距 1956 wrapperPt, //鼠标移入时弹层的上内边距
1959 containerPt; //商品列表容器的上内边距 1957 containerPt; //商品列表容器的上内边距
1960 1958
1961 - $goodInfoMain.html('');  
1962 - $goodSelectColor.html('');  
1963 - $goodItemWrapper.css({  
1964 - display: 'none'  
1965 - });  
1966 $.ajax({ 1959 $.ajax({
1967 type: 'POST', 1960 type: 'POST',
1968 url: '/product/list/getProductPic', 1961 url: '/product/list/getProductPic',
@@ -1972,6 +1965,11 @@ exports.init = function(num) { @@ -1972,6 +1965,11 @@ exports.init = function(num) {
1972 } 1965 }
1973 }).then(function(data) { 1966 }).then(function(data) {
1974 1967
  1968 + //setTimeout(function () {
  1969 +
  1970 + removeHtmlFn();
  1971 +
  1972 +
1975 ulStr = createColorList(data).colorListStr; //ajax请求的颜色列表 1973 ulStr = createColorList(data).colorListStr; //ajax请求的颜色列表
1976 ulNum = createColorList(data).ulNum;//ajax请求的颜色的数量 1974 ulNum = createColorList(data).ulNum;//ajax请求的颜色的数量
1977 1975
@@ -1982,8 +1980,9 @@ exports.init = function(num) { @@ -1982,8 +1980,9 @@ exports.init = function(num) {
1982 wrapperPt = $goodItemWrapper.css('paddingTop'); 1980 wrapperPt = $goodItemWrapper.css('paddingTop');
1983 containerPt = $goodsContainer.css('paddingTop'); 1981 containerPt = $goodsContainer.css('paddingTop');
1984 1982
1985 - //wrapperWidth = 10 + (15 + 50) * ulNum + event.targetWidth;  
1986 - wrapperWidth = $goodItemWrapper.width(); 1983 + wrapperWidth = 10 + (15 + 50) * ulNum + event.targetWidth;
  1984 +
  1985 + //wrapperWidth = $goodItemWrapper.width();
1987 1986
1988 wrapperX = (event.targetX - 1) * (event.targetWidth + itemMr) - (parseInt(wrapperPl) + 1); 1987 wrapperX = (event.targetX - 1) * (event.targetWidth + itemMr) - (parseInt(wrapperPl) + 1);
1989 wrapperY = (event.targetY - 1) * 1988 wrapperY = (event.targetY - 1) *
@@ -2003,16 +2002,21 @@ exports.init = function(num) { @@ -2003,16 +2002,21 @@ exports.init = function(num) {
2003 display: 'inline-block' 2002 display: 'inline-block'
2004 }); 2003 });
2005 2004
  2005 + //}, 1000);
2006 }); 2006 });
2007 }); 2007 });
2008 2008
2009 $goodItemWrapper.mouseleave(function() { 2009 $goodItemWrapper.mouseleave(function() {
  2010 + removeHtmlFn();
  2011 + });
  2012 +
  2013 + function removeHtmlFn() {
2010 $goodInfoMain.html(''); 2014 $goodInfoMain.html('');
2011 $goodSelectColor.html(''); 2015 $goodSelectColor.html('');
2012 $goodItemWrapper.css({ 2016 $goodItemWrapper.css({
2013 display: 'none' 2017 display: 'none'
2014 }); 2018 });
2015 - }); 2019 + }
2016 }; 2020 };
2017 2021
2018 //鼠标放在颜色列表上效果 2022 //鼠标放在颜色列表上效果
@@ -2700,8 +2704,8 @@ if ($.inArray(homePage, ['boys','girls','kids','lifestyle']) > -1) { @@ -2700,8 +2704,8 @@ if ($.inArray(homePage, ['boys','girls','kids','lifestyle']) > -1) {
2700 require("js/common/new-arrivls")({ 2704 require("js/common/new-arrivls")({
2701 type: homePage, 2705 type: homePage,
2702 url: '/common/getNewArrival', 2706 url: '/common/getNewArrival',
2703 - firstCount: homePage === ('boys' || 'lifestyle') ? '25' : '20',  
2704 - pageCount: homePage === ('boys' || 'lifestyle') ? '15' : '12' 2707 + count: (homePage === 'boys') || (homePage === 'lifestyle') ? 5 : 4,
  2708 + rows: [5,3]
2705 }); 2709 });
2706 window.setCookie('_Channel', homePage, { 2710 window.setCookie('_Channel', homePage, {
2707 domain: '.yohobuy.com', 2711 domain: '.yohobuy.com',
@@ -3706,7 +3710,7 @@ InfiniteLoad.prototype.stop = function() { @@ -3706,7 +3710,7 @@ InfiniteLoad.prototype.stop = function() {
3706 InfiniteLoad.prototype.__directionCalculation = function() { 3710 InfiniteLoad.prototype.__directionCalculation = function() {
3707 var p = this.options; 3711 var p = this.options;
3708 3712
3709 - if (p.offset.height && p.offset.height() > 0 && $(window).scrollTop() + $(window).height() >= p.offset.height()) { 3713 + if (p.offset.height && p.offset.height() > 0 && $(window).scrollTop() + window.innerHeight >= p.offset.height()) {
3710 return true; 3714 return true;
3711 } 3715 }
3712 return false; 3716 return false;
@@ -3716,40 +3720,32 @@ module.exports = function(data) { @@ -3716,40 +3720,32 @@ module.exports = function(data) {
3716 var $container = $('#newarrivals .goods-container'); 3720 var $container = $('#newarrivals .goods-container');
3717 var $load = $('.loading a'); 3721 var $load = $('.loading a');
3718 var load = new InfiniteLoad({ 3722 var load = new InfiniteLoad({
  3723 + index: 1,
3719 offset: { 3724 offset: {
3720 height: function() { 3725 height: function() {
3721 return parseFloat($container.offset().top) + parseFloat($container.height()) - 200; 3726 return parseFloat($container.offset().top) + parseFloat($container.height()) - 200;
3722 } 3727 }
3723 } 3728 }
3724 }); 3729 });
3725 - var options; 3730 + var loadAjax;
3726 var url = data.url; 3731 var url = data.url;
3727 - var firstCount = data.firstCount;  
3728 - var pageCount = data.pageCount;  
3729 3732
3730 delete data.url; 3733 delete data.url;
3731 - delete data.firstCount;  
3732 - delete data.pageCount;  
3733 -  
3734 3734
3735 -  
3736 - load.on('after', function(p) {  
3737 -  
3738 - data = $.extend({}, data, {  
3739 - pageIndex: p.index  
3740 - });  
3741 -  
3742 - data.pageCount = (data.pageIndex === 1) ? firstCount : pageCount;  
3743 -  
3744 - options = { 3735 + loadAjax = function(url, data, count) {
  3736 + var options = {
3745 type: 'POST', 3737 type: 'POST',
3746 url: url, 3738 url: url,
3747 data: data, 3739 data: data,
3748 success: function(data) { 3740 success: function(data) {
3749 var code = data.code; 3741 var code = data.code;
3750 - var myTemplate; 3742 + var myTemplate,len,pos;
3751 3743
3752 if (code === 200) { 3744 if (code === 200) {
  3745 + len = data.goods.length % count;
  3746 + pos = data.goods.length - len - 1;
  3747 +
  3748 + data.goods.splice(pos, len);
3753 3749
3754 myTemplate = Handlebars.compile(load.tpl); 3750 myTemplate = Handlebars.compile(load.tpl);
3755 3751
@@ -3773,23 +3769,22 @@ module.exports = function(data) { @@ -3773,23 +3769,22 @@ module.exports = function(data) {
3773 }; 3769 };
3774 3770
3775 $.ajax(options); 3771 $.ajax(options);
  3772 + };
  3773 +
  3774 +
  3775 + load.on('after', function(p) {
  3776 + data = $.extend({}, data, {
  3777 + pageIndex: p.index
  3778 + });
  3779 +
  3780 +
  3781 + data.pageCount = data.count * data.rows[1];
  3782 +
  3783 + loadAjax(url, data);
3776 }); 3784 });
3777 3785
3778 - load.on('before', function() { 3786 + load.on('before', function(p) {
3779 3787
3780 - //请求模板  
3781 - // load.tpl = '{{#each this}}';  
3782 - // load.tpl += '<li>';  
3783 - // load.tpl += ' <a href="{{url}}"><div class="commodity-img">';  
3784 - // load.tpl += ' {{# tip}}';  
3785 - // load.tpl += ' <i class="commodity-tag">{{.}}</i>';  
3786 - // load.tpl += ' {{/ tip}}';  
3787 - // load.tpl += ' <img class="lazy" data-original="{{img}}" src="{{img}}"/></div>';  
3788 - // load.tpl += ' <p class="commodity-name">{{name}}</p>';  
3789 - // load.tpl += ' <p class="commodity-price"><span>¥{{price}}</span></p>';  
3790 - // load.tpl += ' </a>';  
3791 - // load.tpl += '</li>';  
3792 - // load.tpl += '{{/each}}';  
3793 3788
3794 load.tpl = '{{#each this}}'; 3789 load.tpl = '{{#each this}}';
3795 load.tpl += '<div class="good-info" data-skn="{{skn}}">'; 3790 load.tpl += '<div class="good-info" data-skn="{{skn}}">';
@@ -3844,6 +3839,14 @@ module.exports = function(data) { @@ -3844,6 +3839,14 @@ module.exports = function(data) {
3844 load.tpl += '</div>'; 3839 load.tpl += '</div>';
3845 load.tpl += '{{/each}}'; 3840 load.tpl += '{{/each}}';
3846 3841
  3842 + data = $.extend({}, data, {
  3843 + pageIndex: p.index
  3844 + });
  3845 +
  3846 +
  3847 + data.pageCount = data.count * data.rows[0];
  3848 +
  3849 + loadAjax(url, data, data.count);
3847 3850
3848 load.emit(); 3851 load.emit();
3849 }); 3852 });
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -14,9 +14,7 @@ class LifestyleController extends WebAction @@ -14,9 +14,7 @@ class LifestyleController extends WebAction
14 $data = array( 14 $data = array(
15 'boysHomePage' => true, 15 'boysHomePage' => true,
16 'lifestyle' => HomeModel::getChannelResource(HomeModel::COOKIE_NAME_LIFESTYLE, HomeModel::CODE_LIFESTYLE_CHANNEL) 16 'lifestyle' => HomeModel::getChannelResource(HomeModel::COOKIE_NAME_LIFESTYLE, HomeModel::CODE_LIFESTYLE_CHANNEL)
17 - )  
18 - // HomeModel::getLifestyleChannel(),  
19 - ; 17 + );
20 $this->_view->display('index', $data); 18 $this->_view->display('index', $data);
21 } 19 }
22 } 20 }