Authored by ccbikai

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

@@ -5,10 +5,12 @@ @@ -5,10 +5,12 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
  8 + Hammer = require('hammer'),
8 tip = require('../plugin/tip'), 9 tip = require('../plugin/tip'),
9 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
10 11
11 -var winH = $(window).height(), 12 +var navHammer,
  13 + winH = $(window).height(),
12 loadMoreH = $('#load-more').height(), 14 loadMoreH = $('#load-more').height(),
13 $goodList = $('#goods-list'), 15 $goodList = $('#goods-list'),
14 loading = false, 16 loading = false,
@@ -35,91 +37,101 @@ if (kidsType) { @@ -35,91 +37,101 @@ if (kidsType) {
35 37
36 $curNav = $navList.children('.focus'); 38 $curNav = $navList.children('.focus');
37 39
38 -$('#maybe-like-nav').delegate('li', 'tap', function() {  
39 - var $this = $(this),  
40 - $goods = $('.goods-list'),  
41 - $content; 40 +if (lifestyleType) {
  41 + navHammer = new Hammer($navList[0]);
  42 + navHammer.on('tap', function(e) {
  43 + var $this = $(e.target).closest('li'),
  44 + $goods = $('.goods-list'),
  45 + $content;
42 46
  47 + if ($this.hasClass('focus')) {
  48 + return;
  49 + }
43 50
44 - if ($this.hasClass('focus')) {  
45 - return;  
46 - } 51 + index = $this.index();
47 52
48 - index = $this.index(); 53 + $this.addClass('focus');
  54 + $curNav.removeClass('focus');
49 55
50 - $this.addClass('focus');  
51 - $curNav.removeClass('focus'); 56 + $goods.not('.hide').addClass('hide');
  57 + $content = $goods.eq(index);
  58 + $content.removeClass('hide');
52 59
53 - $goods.not('.hide').addClass('hide');  
54 - $content = $goods.eq(index);  
55 - $content.removeClass('hide'); 60 + $curNav = $this;
56 61
57 - $curNav = $this; 62 + $(document).trigger('scroll'); //Trigger lazyLoad
  63 + });
  64 +}
58 65
59 - $(document).trigger('scroll'); //Trigger lazyLoad  
60 -});  
61 66
62 -//srcoll to load more  
63 -$(window).scroll(function () {  
64 - if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {  
65 - if (loading) {  
66 - return;  
67 - }  
68 - loading = true;  
69 -  
70 - //num = $goodList.find('.good-info').length;  
71 - $.ajax({  
72 - type: 'GET',  
73 - url: url,  
74 - data: {  
75 - page: page + 1  
76 - },  
77 - success: function(data) {  
78 - if (data === ' ') {  
79 - loading = true;  
80 - if (gender) {  
81 - if (gender === '1,3') {  
82 - url = '/boys/bottomBanner';  
83 - } else {  
84 - url = '/girls/bottomBanner';  
85 - }  
86 - $.ajax({  
87 - type: 'GET',  
88 - url: url,  
89 - success: function(data) {  
90 - if (data) {  
91 - $('#load-more-img').show();  
92 - $('#load-more-img a').attr('href', data.url);  
93 - $('#load-more-img a > img').attr('src', data.img);  
94 - }  
95 - },  
96 - error: function() { 67 +function search() {
  68 + if (loading) {
  69 + return;
  70 + }
  71 + loading = true;
  72 +
  73 + //num = $goodList.find('.good-info').length;
  74 + $.ajax({
  75 + type: 'GET',
  76 + url: url,
  77 + data: {
  78 + page: page + 1
  79 + },
  80 + success: function(data) {
  81 + if (data === ' ') {
  82 + loading = true;
  83 + if (gender) {
  84 + if (gender === '1,3') {
  85 + url = '/boys/bottomBanner';
  86 + } else {
  87 + url = '/girls/bottomBanner';
  88 + }
  89 + $.ajax({
  90 + type: 'GET',
  91 + url: url,
  92 + success: function(data) {
  93 + if (data) {
  94 + $('#load-more-img').show();
  95 + $('#load-more-img a').attr('href', data.url);
  96 + $('#load-more-img a > img').attr('src', data.img);
97 } 97 }
98 - }); 98 + },
  99 + error: function() {
  100 + }
  101 + });
99 102
100 - }  
101 - return;  
102 } 103 }
  104 + return;
  105 + }
103 106
104 - num = $goodList.find('.good-info').length;  
105 -  
106 - $goodList.append(data); 107 + num = $goodList.find('.good-info').length;
107 108
108 - // 2015/10/31 fei.hong: 修复第一页分页不显示图片的问题  
109 - if (num === 0) {  
110 - lazyLoad($goodList.find('.good-info').find('img.lazy'));  
111 - } else {  
112 - lazyLoad($goodList.find('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));  
113 - } 109 + $goodList.append(data);
114 110
115 - loading = false;  
116 - page++;  
117 - },  
118 - error: function() {  
119 - tip.show('网络断开连接了~');  
120 - loading = false; 111 + // 2015/10/31 fei.hong: 修复第一页分页不显示图片的问题
  112 + if (num === 0) {
  113 + lazyLoad($goodList.find('.good-info').find('img.lazy'));
  114 + } else {
  115 + lazyLoad($goodList.find('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
121 } 116 }
122 - });  
123 - }  
124 117
  118 + loading = false;
  119 + page++;
  120 + },
  121 + error: function() {
  122 + tip.show('网络断开连接了~');
  123 + loading = false;
  124 + }
  125 + });
  126 +}
  127 +
  128 +$('.maybe-like p').on('touchstart', function (e) {
  129 + search();
  130 +});
  131 +
  132 +//srcoll to load more
  133 +$(window).scroll(function () {
  134 + if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
  135 + search();
  136 + }
125 }); 137 });
@@ -39,16 +39,6 @@ $searchBox.find('.clear-text').click(function () { @@ -39,16 +39,6 @@ $searchBox.find('.clear-text').click(function () {
39 $searchBox.find('input').val('').trigger('focus'); 39 $searchBox.find('input').val('').trigger('focus');
40 }); 40 });
41 41
42 -// clearTextHammer = new Hammer($searchBox.find('.clear-text')[0]);  
43 -// clearTextHammer.on('tap', function(e) {  
44 -// $searchBox.find('input').val('').trigger('focus');  
45 -// });  
46 -  
47 $searchBox.find('.search-icon').click(function () { 42 $searchBox.find('.search-icon').click(function () {
48 $indexSearch.submit(); 43 $indexSearch.submit();
49 -});  
50 -  
51 -// searchIconHammer = new Hammer($searchBox.find('.search-icon')[0]);  
52 -// searchIconHammer.on('tap', function(e) {  
53 -// $indexSearch.submit();  
54 -// });  
  44 +});
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
31 31
32 img { 32 img {
33 vertical-align: middle; 33 vertical-align: middle;
  34 + width: 100%;
  35 + height: 100%;
34 max-width: 100%; 36 max-width: 100%;
35 max-height: 100%; 37 max-height: 100%;
36 } 38 }
1 <div class="maybe-like"> 1 <div class="maybe-like">
2 - <p class="title">  
3 - <i class="icon"></i>  
4 - <span>你可能喜欢</span>  
5 - </p> 2 + <ul id="maybe-like-nav" class="maybe-like-nav clearfix">
  3 + <li class="maybe-like-nav-item focus">新品到着</li>
  4 + <li class="maybe-like-nav-item">人气单品</li>
  5 + </ul>
6 6
7 - <ul id="maybe-like-nav" class="maybe-like-nav clearfix">  
8 - <li class="maybe-like-nav-item focus">新品到着</li>  
9 - <li class="maybe-like-nav-item">人气单品</li>  
10 - </ul>  
11 -  
12 - <div id="goods-list">  
13 - {{# goodsContainer}}  
14 - <div class="goods-list {{^show}}hide{{/show}}">  
15 - {{# goods}}  
16 - {{> good}}  
17 - {{/ goods}}  
18 - </div>  
19 - {{/ goodsContainer}}  
20 - </div> 7 + <div id="goods-list">
  8 + {{# goodsContainer}}
  9 + <div class="goods-list {{^show}}hide{{/show}}">
  10 + {{# goods}}
  11 + {{> good}}
  12 + {{/ goods}}
  13 + </div>
  14 + {{/ goodsContainer}}
  15 + </div>
21 16
22 <div id="load-more-info" class="load-more-info"> 17 <div id="load-more-info" class="load-more-info">
23 <div class="loading status hide"> 18 <div class="loading status hide">
1 {{> layout/page_footer}} 1 {{> layout/page_footer}}
2 {{> layout/download_app}} 2 {{> layout/download_app}}
  3 +{{#if hasWxShare}}
  4 + <script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  5 +{{/if}}
3 {{#if rlsEnv}} 6 {{#if rlsEnv}}
4 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script> 7 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
5 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script> 8 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 </script> 24 </script>
25 {{/if}} 25 {{/if}}
26 {{#if guangDetail}} 26 {{#if guangDetail}}
27 -<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>  
28 <script> 27 <script>
29 seajs.use('js/guang/detail'); 28 seajs.use('js/guang/detail');
30 </script> 29 </script>