首页去掉IScroll

www/webapp/common/js/jquery.lazyload.js

@@ -0,0 +1,2 @@
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(5($){$.J.L=5(r){8 1={d:0,A:0,b:"h",v:"N",3:4};6(r){$.D(1,r)}8 m=9;6("h"==1.b){$(1.3).p("h",5(b){8 C=0;m.t(5(){6(!$.k(9,1)&&!$.l(9,1)){$(9).z("o")}j{6(C++>1.A){g B}}});8 w=$.M(m,5(f){g!f.e});m=$(w)})}g 9.t(5(){8 2=9;$(2).c("s",$(2).c("i"));6("h"!=1.b||$.k(2,1)||$.l(2,1)){6(1.u){$(2).c("i",1.u)}j{$(2).K("i")}2.e=B}j{2.e=x}$(2).T("o",5(){6(!9.e){$("<V />").p("X",5(){$(2).Y().c("i",$(2).c("s"))[1.v](1.Z);2.e=x}).c("i",$(2).c("s"))}});6("h"!=1.b){$(2).p(1.b,5(b){6(!2.e){$(2).z("o")}})}})};$.k=5(f,1){6(1.3===E||1.3===4){8 7=$(4).F()+$(4).O()}j{8 7=$(1.3).n().G+$(1.3).F()}g 7<=$(f).n().G-1.d};$.l=5(f,1){6(1.3===E||1.3===4){8 7=$(4).I()+$(4).U()}j{8 7=$(1.3).n().q+$(1.3).I()}g 7<=$(f).n().q-1.d};$.D($.P[\':\'],{"Q-H-7":"$.k(a, {d : 0, 3: 4})","R-H-7":"!$.k(a, {d : 0, 3: 4})","S-y-7":"$.l(a, {d : 0, 3: 4})","q-y-7":"!$.l(a, {d : 0, 3: 4})"})})(W);',62,62,'|settings|self|container|window|function|if|fold|var|this||event|attr|threshold|loaded|element|return|scroll|src|else|belowthefold|rightoffold|elements|offset|appear|bind|left|options|original|each|placeholder|effect|temp|true|of|trigger|failurelimit|false|counter|extend|undefined|height|top|the|width|fn|removeAttr|lazyload|grep|show|scrollTop|expr|below|above|right|one|scrollLeft|img|jQuery|load|hide|effectspeed'.split('|'),0,{}))
+var public=checkbrowse();var showeffect="";if((public['is']=='msie'&&public['ver']<8.0)){showeffect="show"}else{showeffect="fadeIn"}jQuery(document).ready(function($){$("img").lazyload({placeholder:"/Js/lazyload/grey.gif",effect:showeffect,failurelimit:10})});

www/webapp/o2o/css/home.css

@@ -150,9 +150,19 @@
     margin-bottom: 20px;
 }
 
+.spa-page-home .scroll {
+    width: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 53px;
+    overflow-y:auto;
+    -webkit-overflow-scrolling:touch;
+}
+
 .spa-page-home .prevent-scroll {
     width: 100%;
-    position: fixed;
+    height: 53px;
+    position: absolute;
     bottom: 0;
     background-color: #2a2400;
 }

www/webapp/o2o/dist/js/model/order.js

@@ -1 +1 @@
-define(["base","$","native","product","api"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="order_",this.memo="",this.cost=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.price="",this.couponID="",this.stationID=this.getCache("stationID",null,""),this.cacheReview=this.getCache("cacheReview",null,""),this.precedence="",this.extraService=[],this.extraServiceType=[],this.serviceName="",this.servicePrice="",this.appendID="",this.beautician={name:"请选择",id:""}};return s.prototype=new e,s.prototype.reset=function(){this.couponID="",this.bookingTime="",this.bookingTimeStr="",this.bookingDate="",this.productType="",this.productID="",this.extraService=[],this.serviceName="",this.servicePrice="",this.productCount=1,this.precedence="",this.extraServiceType=[],this.beautician={name:"",id:""}},s.prototype.addOrder=function(e,t,n){var r=this,s=[{product_id:this.productID,count:this.productCount}],o=[];this.couponID!=""&&o.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:"0",booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(o),station:this.stationID,type:this.productType,counts:"1",extra:[this.appendID],tech_id:this.beautician.id,user_id:e,order_channel:t},function(e){e.success&&(r.id=e.data.id),typeof n=="function"&&n(e)})},s.prototype.appendOrder=function(e,t,n,r){var s=this;i.appendOrder({order_id:e,products:n,user_id:t},function(e){e.success&&(s.appendID=e.data.id),typeof r=="function"&&r(e)})},new s});
+define(["base","$","native","product","api"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="order_",this.memo="",this.cost=0,this.bookingDate="",this.bookingTime="",this.bookingTimeStr="",this.address=this.getCache("address",null),this.productType="",this.productID="",this.productCount=1,this.price="",this.couponID="",this.stationID=this.getCache("stationID",null,""),this.cacheReview=this.getCache("cacheReview",null,""),this.precedence="",this.extraService=[],this.extraServiceType=[],this.serviceName="",this.servicePrice="",this.appendID="",this.beautician={name:"请选择",id:""}};return s.prototype=new e,s.prototype.reset=function(){this.couponID="",this.bookingTime="",this.bookingTimeStr="",this.bookingDate="",this.productType="",this.productID="",this.extraService=[],this.serviceName="",this.servicePrice="",this.productCount=1,this.precedence="",this.extraServiceType=[],this.beautician={name:"",id:""}},s.prototype.addOrder=function(e,t,n){var r=this,s=[{product_id:this.productID,count:this.productCount}],o=[];this.couponID!=""&&o.push(this.couponID),i.addOrder({products:JSON.stringify(s),memo:this.memo,precedence:"0",booking_time:this.bookingDate+" "+this.bookingTime+":00",address_id:this.address.address_id,coupons:JSON.stringify(o),station:this.stationID,type:this.productType,counts:"1",extra:JSON.stringify("[type:"+this.appendID+"]"),tech_id:this.beautician.id,user_id:e,order_channel:t},function(e){e.success&&(r.id=e.data.id),typeof n=="function"&&n(e)})},s.prototype.appendOrder=function(e,t,n,r){var s=this;i.appendOrder({order_id:e,products:n,user_id:t},function(e){e.success&&(s.appendID=e.data.id),typeof r=="function"&&r(e)})},new s});

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

@@ -1,10 +1,10 @@
-/*TMODJS:{"version":120,"md5":"9d7b1dad5716de1f805abfcb4646c60f"}*/
+/*TMODJS:{"version":129,"md5":"1352e65ac1b54922b5a3cd8e1a0f216c"}*/
 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="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"> ';
+$out+=' <div class="content"> <div class="scroll"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/> <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);
@@ -36,6 +36,6 @@ $out+='" width="49%" class="btn-product" data-product-type="';
 $out+=$escape(product.type);
 $out+='"/> ';
 });
-$out+=' </div> </div> </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> </div> </div> ';
+$out+=' </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> ';
 return new String($out);
 });

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:120*/
+});/*v:129*/
 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="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"> ';
+$out+=' <div class="content"> <div class="scroll"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/> <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);
@@ -870,7 +870,7 @@ $out+='" width="49%" class="btn-product" data-product-type="';
 $out+=$escape(product.type);
 $out+='"/> ';
 });
-$out+=' </div> </div> </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> </div> </div> ';
+$out+=' </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> ';
 return new String($out);
 });/*v:1*/
 template('myCoupon/cell',function($data,$filename

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

@@ -244,11 +244,11 @@ 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|$)/},
-                        });
-                    }, 200);
+                    // setTimeout(function () {
+                    //     pageData.scroll = new IScroll('#homeScroll', {
+                    //         preventDefaultException: {className: /(^|\s)home-content(\s|$)/},
+                    //     });
+                    // }, 200);
                 });
             }
 

www/webapp/o2o/tpl/home/index.html

@@ -11,83 +11,67 @@
 </header>
 {{ /if }}
 <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 as product }}
-                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                                     data-product-type="{{product.type}}"/>
-                                {{ /each }}
-                            </div>
-                            <div class="products-list" id="list1" style="display: none">
-                                {{ each productsb as product }}
-                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                                     data-product-type="{{product.type}}"/>
-                                {{ /each }}
-                            </div>
-                            <div class="products-list" id="list2" style="display: none">
-                                {{ each productsc as product }}
-                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                                     data-product-type="{{product.type}}"/>
-                                {{ /each }}
-                            </div>
-                            <div class="products-list" id="list3" style="display: none">
-                                {{ each productsd as product }}
-                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                                     data-product-type="{{product.type}}"/>
-                                {{ /each }}
-                            </div>
-                        </div>
-                    </div>
+    <div class="scroll">
+        <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/>
+        <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 as product }}
+                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                     data-product-type="{{product.type}}"/>
+                {{ /each }}
+            </div>
+            <div class="products-list" id="list1" style="display: none">
+                {{ each productsb as product }}
+                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                     data-product-type="{{product.type}}"/>
+                {{ /each }}
+            </div>
+            <div class="products-list" id="list2" style="display: none">
+                {{ each productsc as product }}
+                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                     data-product-type="{{product.type}}"/>
+                {{ /each }}
+            </div>
+            <div class="products-list" id="list3" style="display: none">
+                {{ each productsd as product }}
+                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                     data-product-type="{{product.type}}"/>
+                {{ /each }}
+            </div>
+        </div>
+    </div>
+    <div class="prevent-scroll">
+        <div class="box my-action">
+            <!--首页-->
+            <div class="width-percent-33">
+                <div class="title-container-square">
+                    <a class="btn-home-action btn-action-my-order">
+                        <div class="logo logo-my-order"></div>
+                        <div class="name">首页</div>
+                    </a>
+                </div>
+            </div>
+            <!--LOGO-->
+            <div class="width-percent-33">
+                <div class="title-container-square">
+                    <a class="btn-home-action btn-action-logo">
+                        <div class="logo logo-my-logo"></div>
+                    </a>
                 </div>
             </div>
-            <div class="prevent-scroll">
-                <div class="box my-action">
-                    <!--首页-->
-                    <div class="width-percent-33">
-                        <div class="title-container-square">
-                            <a class="btn-home-action btn-action-my-order">
-                                <div class="logo logo-my-order"></div>
-                                <div class="name">首页</div>
-                            </a>
-                        </div>
-                    </div>
-                    <!--LOGO-->
-                    <div class="width-percent-33">
-                        <div class="title-container-square">
-                            <a class="btn-home-action btn-action-logo">
-                                <div class="logo logo-my-logo"></div>
-                            </a>
-                        </div>
-                    </div>
-                    <!--我的-->
-                    <div class="width-percent-33">
-                        <div class="title-container-square">
-                            <a class="btn-home-action btn-action-coupon">
-                                <div class="logo logo-coupon"></div>
-                                <div class="name">我的</div>
-                            </a>
-                        </div>
-                    </div>
+            <!--我的-->
+            <div class="width-percent-33">
+                <div class="title-container-square">
+                    <a class="btn-home-action btn-action-coupon">
+                        <div class="logo logo-coupon"></div>
+                        <div class="name">我的</div>
+                    </a>
                 </div>
             </div>
         </div>