提交分支

@@ -16,15 +16,15 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     domains: {
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        liveApi: 'http://testapi.live.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/'
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // liveApi: 'http://testapi.live.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/'
 
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // liveApi: 'http://api.live.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/'
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
+        liveApi: 'http://api.live.yoho.cn/',
+        singleApi: 'http://single.yoho.cn/'
     },
     subDomains: {
         host: '.m.yohobuy.com',

@@ -128,9 +128,9 @@ var viewType = 1, // 1-首页,2-上新,3-人气
     listIndex;
 
 
-$('.main-wrap').css({
-    position: 'static'
-});
+// $('.main-wrap').css({
+//     position: 'static'
+// });
 
 // 焦点效果
 if ($('.banner-swiper').find('li').size() > 1) {
@@ -365,11 +365,11 @@ function reNav1Pos() {
 
 function scrollHandler() {
     var scrollCall,
-        sTop = -this.y;
+        sTop = -$(document).scrollTop();
 
     var tra;
 
-
+    console.log(sTop)
     theY = sTop;
     if (sTop + winH > scH - 0.25 * $goodsContainer.height() - 50) {
         if ($pre !== undefined) {
@@ -384,15 +384,16 @@ function scrollHandler() {
     }
 
     if (sTop + winH * 2 > scH) {
+        console.log('scrollCall')
         scrollCall = function() {
             var translate = 'translate3d(0, ' + (-scH) + 'px, 0)';
 
-            $nav1.css({
-                transform: translate,
-                '-moz-transform': translate,
-                '-ms-transform': translate,
-                '-webkit-transform': translate
-            });
+            // $nav1.css({
+            //     transform: translate,
+            //     '-moz-transform': translate,
+            //     '-ms-transform': translate,
+            //     '-webkit-transform': translate
+            // });
         };
         switch (viewType) {
             case 2:
@@ -478,7 +479,7 @@ function scrollHandler() {
 document.addEventListener('touchmove', function(e) {
     // sub classify不阻止默认事件
     if ($(e.target).closest('.sub-classify').length === 0) {
-        e.preventDefault();
+        //e.preventDefault();
     }
 }, false);
 
@@ -489,7 +490,7 @@ document.addEventListener('touchmove', function(e) {
 
 // window ready 后重新refresh iscroll
 $(window).ready(function() {
-    myScroll && myScroll.refresh();
+    // myScroll && myScroll.refresh();
     imgH = $('#nav-top').outerHeight();
     nav1H = $('#nav').outerHeight();
     main1H = $('#nav-main').height();
@@ -498,37 +499,37 @@ $(window).ready(function() {
     main2oH = $('#goods-container').outerHeight(true);
 
 
-    myScroll = new IScroll('#wrapper', {
-        probeType: 2,
-        mouseWheel: false,
-        click: true
-    });
+    // myScroll = new IScroll('#wrapper', {
+    //     probeType: 2,
+    //     mouseWheel: false,
+    //     click: true
+    // });
 
     setTimeout(function() {
         scH = $('#scroller').outerHeight();
     }, 500);
 
+    $(document).scroll(scrollHandler)
+    // myScroll.on('scroll', scrollHandler);
 
-    myScroll.on('scroll', scrollHandler);
+    // myScroll.on('scrollStart', function() {
 
-    myScroll.on('scrollStart', function() {
+    //     // stop auto play when scroll
+    //     bannerSwiper && bannerSwiper.stopAutoplay();
 
-        // stop auto play when scroll
-        bannerSwiper && bannerSwiper.stopAutoplay();
+    //     multiSwiper && multiSwiper.stopAutoplay();
+    // });
 
-        multiSwiper && multiSwiper.stopAutoplay();
-    });
+    // myScroll.on('scrollEnd', function() {
 
-    myScroll.on('scrollEnd', function() {
+    //     // start auto play when scroll end
+    //     bannerSwiper && bannerSwiper.startAutoplay();
 
-        // start auto play when scroll end
-        bannerSwiper && bannerSwiper.startAutoplay();
+    //     multiSwiper && multiSwiper.startAutoplay();
 
-        multiSwiper && multiSwiper.startAutoplay();
-
-        $('#scroller').trigger('scroll');
-        scrollHandler.bind(this)();
-    });
+    //     $('#scroller').trigger('scroll');
+    //     scrollHandler.bind(this)();
+    // });
     lazyLoad($('img.lazy'));
 });
 

 .shop-index {
-    position: absolute;
+    /*position: absolute;
     top: 0;
     bottom: 0;
     left: 0;
     right: 0;
-    overflow: hidden;
+    overflow: hidden;*/
 
     .nav-main {
         margin-bottom: 30px;
@@ -402,8 +402,9 @@
     }
 
     .shop-foot-wrapper {
-        position: absolute;
+        position: fixed;
         bottom: 0;
+        left: 0;
         display: table;
         width: 100%;
         height: 88px;