Authored by Lynnic

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

@@ -160,7 +160,6 @@ $header.on('touchstart', 'a', function() { @@ -160,7 +160,6 @@ $header.on('touchstart', 'a', function() {
160 $(this).removeClass('highlight'); 160 $(this).removeClass('highlight');
161 }); 161 });
162 162
163 -  
164 //暴露公共接口 163 //暴露公共接口
165 window.cookie = cookie; 164 window.cookie = cookie;
166 165
1 -/**  
2 - * 商品详情  
3 - * @author: liangzhifeng<zhifeng.liang@yoho.cn>  
4 - * @date: 2015/11/18  
5 - */  
  1 +///**
  2 +// * 商品详情
  3 +// * @author: liangzhifeng<zhifeng.liang@yoho.cn>
  4 +// * @date: 2015/11/18
  5 +// */
  6 +//var $ = require('jquery'),
  7 +// Hammer = require('yoho.hammer'),
  8 +// lazyLoad = require('yoho.lazyload');
  9 +//
  10 +//var loading = require('../../plugin/loading');
  11 +//
  12 +//var navHammer,
  13 +// winH = $(window).height(),
  14 +// searching = false,
  15 +// num,
  16 +// url;
  17 +//
  18 +//function scrollHandler() {
  19 +// if ($(window).scrollTop() + winH >= $(document).height() - 50) {
  20 +// //search();
  21 +// }
  22 +//}
  23 +//
  24 +//function search() {
  25 +// if (searching) {
  26 +// return;
  27 +// }
  28 +// searching = true;
  29 +//
  30 +// loading.showLoadingMask();
  31 +//
  32 +// //num = $goodList.find('.good-info').length;
  33 +// $.ajax({
  34 +// type: 'GET',
  35 +// url: url,
  36 +// data: {
  37 +// page: page + 1
  38 +// },
  39 +// success: function(data) {
  40 +//
  41 +// num = $goodList.find('.good-info').length;
  42 +//
  43 +// $goodList.append(data);
  44 +//
  45 +// // 2015/10/31 fei.hong: 修复第一页分页不显示图片的问题
  46 +// if (num === 0) {
  47 +// lazyLoad($goodList.find('.good-info').find('img.lazy'));
  48 +// } else {
  49 +// lazyLoad($goodList.find('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
  50 +// }
  51 +//
  52 +// searching = false;
  53 +// loading.hideLoadingMask();
  54 +// page++;
  55 +// },
  56 +// error: function() {
  57 +// tip.show('网络断开连接了~');
  58 +// searching = false;
  59 +// loading.hideLoadingMask();
  60 +// }
  61 +// });
  62 +//}
  63 +//
  64 +////srcoll to load more
  65 +//$(window).scroll(function () {
  66 +// window.requestAnimationFrame(scrollHandler);
  67 +//});
  68 +//
@@ -9,13 +9,13 @@ @@ -9,13 +9,13 @@
9 Handlebars = require('yoho.handlebars'); 9 Handlebars = require('yoho.handlebars');
10 10
11 var goodsSwiper, 11 var goodsSwiper,
12 -  
13 - // winH = $(window).height(),  
14 sizeSwiper, 12 sizeSwiper,
15 refSwiper, 13 refSwiper,
16 commentsNum, 14 commentsNum,
17 handleHelper; 15 handleHelper;
18 16
  17 +require('./desc');
  18 +
19 lazyLoad($('img.lazy')); 19 lazyLoad($('img.lazy'));
20 20
21 goodsSwiper = new Swiper('.banner-swiper', { 21 goodsSwiper = new Swiper('.banner-swiper', {