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

@@ -160,7 +160,6 @@ $header.on('touchstart', 'a', function() {
     $(this).removeClass('highlight');
 });
 
-
 //暴露公共接口
 window.cookie = cookie;
 

-/**
- *  商品详情
- * @author: liangzhifeng<zhifeng.liang@yoho.cn>
- * @date: 2015/11/18
- */
\ No newline at end of file
+///**
+// *  商品详情
+// * @author: liangzhifeng<zhifeng.liang@yoho.cn>
+// * @date: 2015/11/18
+// */
+//var $ = require('jquery'),
+//    Hammer = require('yoho.hammer'),
+//    lazyLoad = require('yoho.lazyload');
+//
+//var loading = require('../../plugin/loading');
+//
+//var navHammer,
+//    winH = $(window).height(),
+//    searching = false,
+//    num,
+//    url;
+//
+//function scrollHandler() {
+//    if ($(window).scrollTop() + winH >= $(document).height() - 50) {
+//        //search();
+//    }
+//}
+//
+//function search() {
+//    if (searching) {
+//        return;
+//    }
+//    searching = true;
+//
+//    loading.showLoadingMask();
+//
+//    //num = $goodList.find('.good-info').length;
+//    $.ajax({
+//        type: 'GET',
+//        url: url,
+//        data: {
+//            page: page + 1
+//        },
+//        success: function(data) {
+//
+//            num = $goodList.find('.good-info').length;
+//
+//            $goodList.append(data);
+//
+//            // 2015/10/31 fei.hong: 修复第一页分页不显示图片的问题
+//            if (num === 0) {
+//                lazyLoad($goodList.find('.good-info').find('img.lazy'));
+//            } else {
+//                lazyLoad($goodList.find('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
+//            }
+//
+//            searching = false;
+//            loading.hideLoadingMask();
+//            page++;
+//        },
+//        error: function() {
+//            tip.show('网络断开连接了~');
+//            searching = false;
+//            loading.hideLoadingMask();
+//        }
+//    });
+//}
+//
+////srcoll to load more
+//$(window).scroll(function () {
+//    window.requestAnimationFrame(scrollHandler);
+//});
+//

@@ -9,13 +9,13 @@
     Handlebars = require('yoho.handlebars');
 
 var goodsSwiper,
-
-    // winH = $(window).height(),
     sizeSwiper,
     refSwiper,
     commentsNum,
     handleHelper;
 
+require('./desc');
+
 lazyLoad($('img.lazy'));
 
 goodsSwiper = new Swiper('.banner-swiper', {