上拉回弹test1

www/webapp/o2o/js/build/.cache/home/index.js

@@ -1,10 +1,10 @@
-/*TMODJS:{"version":117,"md5":"563178a0378ea5ae401ebb285e9d6dde"}*/
+/*TMODJS:{"version":120,"md5":"9d7b1dad5716de1f805abfcb4646c60f"}*/
 template('home/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,productsa=$data.productsa,product=$data.product,$index=$data.$index,$escape=$utils.$escape,productsb=$data.productsb,productsc=$data.productsc,productsd=$data.productsd,$out='';if(showNavBar ){
 $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">壹管家</h1> </header> ';
 }
-$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="clearfix"></div> <div class="global-msg" style="display: flex;justify-content: space-between;font-size: 15px;font-weight: 500;padding: 15px;color: #999999;font-family: \'΢���ź�\', \'Microsoft YaHei\', \'STHeiti Light\';text-align: center;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
 $each(productsa,function(product,$index){
 $out+=' <img src="';
 $out+=$escape(product.desc[0].content);

www/webapp/o2o/js/build/template.js

@@ -832,13 +832,13 @@ $out+=' <p class="bold">联系电话: <a class="service-telephone">021-62109097<
 }
 $out+=' <br> </div> </div> </div> ';
 return new String($out);
-});/*v:117*/
+});/*v:120*/
 template('home/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,productsa=$data.productsa,product=$data.product,$index=$data.$index,$escape=$utils.$escape,productsb=$data.productsb,productsc=$data.productsc,productsd=$data.productsd,$out='';if(showNavBar ){
 $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">壹管家</h1> </header> ';
 }
-$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="clearfix"></div> <div class="global-msg" style="display: flex;justify-content: space-between;font-size: 15px;font-weight: 500;padding: 15px;color: #999999;font-family: \'΢���ź�\', \'Microsoft YaHei\', \'STHeiti Light\';text-align: center;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
 $each(productsa,function(product,$index){
 $out+=' <img src="';
 $out+=$escape(product.desc[0].content);

www/webapp/o2o/js/page/home.js

@@ -225,7 +225,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
                      */
                     var tpl = template('home/index', {
                         showNavBar: !config.isWX && !config.isChubao,
-                        productsa: a,
+                        productsa: products,
                         productsb: b,
                         productsc: c,
                         productsd: d
@@ -243,10 +243,15 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
                      */
                     $('.spa-page-body', $view).html(tpl);
 
-                    /* 不知道是干什么的 */
+                    /* 建立IScroll */
                     setTimeout(function () {
                         pageData.scroll = new IScroll('#homeScroll', {
-                            preventDefaultException: {className: /(^|\s)home-content(\s|$)/}
+                            preventDefaultException: {className: /(^|\s)home-content(\s|$)/},
+                            onScrollMove: function () {
+                                if (this.y<this.maxScrollY && this.pointY < 1){
+                                    this.scrollTo(0, this.maxScrollY, 400);
+                                }
+                            }
                         });
                     }, 50);
                 });