测试

www/webapp/o2o/css/ratchetOverloading.css

@@ -145,11 +145,16 @@
 /*活动样式*/
 .btn-day{
 	width: 100%;
-	height: 50px;
-	background: green;
-	margin: 10px 0;
+	/*height: 250px;*/
+	/*background: green;*/
+	margin: 10px 0 0 0;
 	text-align: center;
-	line-height: 50px;
+	/*line-height: 50px;*/
 	border-radius: 5px;
-	color: white;
+	/*color: white;*/
+}
+
+.btn-day img{
+	width: 100%;
+	display: block;
 }

www/webapp/o2o/dist/js/page/secondary.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){var n=e.pushData;a=n.backHash?n.backHash:"",t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){var n=e.pushData;a=n.backHash?n.backHash:"",t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -312,6 +312,12 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				/* 建立IScroll */
 				setTimeout(function () {
 					pageData.scroll = new IScroll('#homeScroll');
+					/*设置页面高度*/
+					var homeBox = $('.home-box');
+					var boxAlignCenter = $('.box-align-center').height();
+					var preventScroll = $('.prevent-scroll').height();
+					homeBox.height(boxAlignCenter * 4 + preventScroll);
+					console.log(homeBox.height());
 
 				}, 1000);
 				setTimeout(function () {

www/webapp/o2o/js/page/secondary.js

@@ -1,138 +1,153 @@
 define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'address'], function ($, template, IScroll, user, product, native, config, address) {
-    var backHash;
+	var backHash;
 
-    function back(event) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: backHash,
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: backHash,
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
 
-    /*
-     * 模块结构：5部分。
-     * title:题目。
-     * content:不知道是什么，似乎从没用过。
-     * 以下可以当作生命周期回调，虽然并不清楚是什么时候回调的……
-     * init:根据上一个页面传来的pageData初始化本页数据，生成页面，绑定事件。
-     * beforeopen:接收上一个页面传来的数据、有需要的话重置数据
-     * afteropen:做一些网络请求。
-     * beforeclose：
-     */
-    return {
-        title: '家庭保洁',
-        body: '',
-        init: function (pageData, dtd) {
-            /* this是什么？ */
-            var $view = this;
-            var $doc = $(document);
+	/*
+	 * 模块结构：5部分。
+	 * title:题目。
+	 * content:不知道是什么，似乎从没用过。
+	 * 以下可以当作生命周期回调，虽然并不清楚是什么时候回调的……
+	 * init:根据上一个页面传来的pageData初始化本页数据，生成页面，绑定事件。
+	 * beforeopen:接收上一个页面传来的数据、有需要的话重置数据
+	 * afteropen:做一些网络请求。
+	 * beforeclose：
+	 */
+	return {
+		title: '家庭保洁',
+		body: '',
+		init: function (pageData, dtd) {
+			/* this是什么？ */
+			var $view = this;
+			var $doc = $(document);
 
-            /* 定义按钮事件。
-             * 为什么不是$(selector).onclick(function)呢？
-             */
+			/* 定义按钮事件。
+			 * 为什么不是$(selector).onclick(function)呢？
+			 */
 
-            // 返回
-            $view.on('swipeRight', function (event) {
-                back.call(this, event);
-            });
 
-            $.newTouch('.back-button', function (event) {
-                back.call(this, event);
-            }, $view);
 
-            $view.on('tapBackButton', function (event) {
-                back.call(this, event);
-            });
-            /*活动入口*/
-            $.newTouch('.Long-term-set', function (event) {
-                event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: 'activity-day',
-                    pushData: {
-                        needReset: true,
-                        backHash:'secondary'
-                    }
-                });
-            }, $view);
+			// 返回
+			$view.on('swipeRight', function (event) {
+				back.call(this, event);
+			});
 
-            /* 点击产品列表的某一项 */
-            $.newTouch('.btn-product', function (event) {
-                event.preventDefault();
-                var type = parseInt($(this).attr('data-product-type'));
-                /*
-                 * 这个写法是SPA路由框架规定的。
-                 * $(selector).trigger(event, params)是jQuery的：触发被选元素上的指定事件
-                 */
-                $doc.trigger('spa:navigate', {
-                    hash: 'placeOrder',
-                    pushData: {
-                        product: product.allList[type - 1],
-                        needReset: true,
-                        backHash:'secondary'
-                    }
-                });
-            }, $view);
-            // im
-            $.newTouch('.btn-action-logo', function (event) {
-                event.preventDefault();
-                window.location.href = '/index.php?r=o2o/advisory/im';
-            }, $view);
-            /*首页*/
-            $.newTouch('.btn-action-my-order', function () {
-                event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: '',
-                    pushData: {
-                        needReset: true
-                    }
-                });
-            }, $view);
-            /*个人中心*/
-            $.newTouch('.btn-action-coupon', function (event) {
-                event.preventDefault();
-                user.checkLogin(function () {
-                    $doc.trigger('spa:navigate', {
-                        hash: 'mine',
-                        pushData: {
-                            needReset: true
-                        }
-                    });
-                });
-            }, $view);
-            /* 不知道什么意思。*/
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            /*获取上一页跳转的路由名称*/
-            var pushData = pageData.pushData;
-            backHash = pushData.backHash ? pushData.backHash : '';
-            dtd.resolve();
-        },
-        afteropen: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
 
-            if (pageData.pushData && pageData.pushData.needReset) {
-                /*var tpl = template('secondary/index', {
-                 showNavBar: !config.isWX,
-                 userName: user.name == '' ? '未登录' : user.name,
-                 userBalance: user.balance,
-                 defaultAddress: addressStr
-                 });*/
-                var tpl = template('secondary/index', {showNavBar: !config.isWX});
-                $('.spa-page-body', $view).html(tpl);
-                setTimeout(function () {
-                    pageData.scroll = new IScroll('#secondaryScroll');
-                }, 500);
-            }
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+			/*活动入口*/
+			$.newTouch('.Long-term-set', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-day',
+					pushData: {
+						needReset: true,
+						backHash: 'secondary'
+					}
+				});
+			}, $view);
 
-            /* 又是这个。不知道什么玩意…… */
-            dtd.resolve();
-        },
-        beforeclose: function (pageData, dtd) {
-            dtd.resolve();
-        }
-    }
+			/* 点击产品列表的某一项 */
+			$.newTouch('.btn-product', function (event) {
+				event.preventDefault();
+				var type = parseInt($(this).attr('data-product-type'));
+				/*
+				 * 这个写法是SPA路由框架规定的。
+				 * $(selector).trigger(event, params)是jQuery的：触发被选元素上的指定事件
+				 */
+				$doc.trigger('spa:navigate', {
+					hash: 'placeOrder',
+					pushData: {
+						product: product.allList[type - 1],
+						needReset: true,
+						backHash: 'secondary'
+					}
+				});
+			}, $view);
+			// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/im';
+			}, $view);
+			/*首页*/
+			$.newTouch('.btn-action-my-order', function () {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			/*个人中心*/
+			$.newTouch('.btn-action-coupon', function (event) {
+				event.preventDefault();
+				user.checkLogin(function () {
+					$doc.trigger('spa:navigate', {
+						hash: 'mine',
+						pushData: {
+							needReset: true
+						}
+					});
+				});
+			}, $view);
+			/* 不知道什么意思。*/
+			dtd.resolve();
+		},
+		beforeopen: function (pageData, dtd) {
+
+
+
+			/*获取上一页跳转的路由名称*/
+			var pushData = pageData.pushData;
+			backHash = pushData.backHash ? pushData.backHash : '';
+			dtd.resolve();
+		},
+		afteropen: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
+
+			if (pageData.pushData && pageData.pushData.needReset) {
+				/*var tpl = template('secondary/index', {
+				 showNavBar: !config.isWX,
+				 userName: user.name == '' ? '未登录' : user.name,
+				 userBalance: user.balance,
+				 defaultAddress: addressStr
+				 });*/
+				var tpl = template('secondary/index', {showNavBar: !config.isWX});
+				$('.spa-page-body', $view).html(tpl);
+				setTimeout(function () {
+					pageData.scroll = new IScroll('#secondaryScroll');
+				}, 500);
+
+				setTimeout(function () {
+					/*设置页面高度-开始*/
+					// console.log();
+					// console.log($('#list0').height(($('.btn-product').height()*4)+$('.prevent-scroll').height()));
+					$('#list0').height(($('.btn-product').height()*4)+$('.prevent-scroll').height());//设置ul高度；
+					// console.log($("#list0").eq(0));
+					// console.log();
+					/*设置页面高度-结束*/
+				},200);
+			}
+
+			/* 又是这个。不知道什么玩意…… */
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
 })

www/webapp/o2o/tpl/activities/day.html

@@ -3,7 +3,7 @@
 	<a class="left-button back-button">
 		<div class="icon icon-left-nav"></div>
 	</a>
-	<h1 class="title">企业服务</h1>
+	<h1 class="title">日常保洁</h1>
 </header>
 {{ /if }}
 
@@ -14,9 +14,9 @@
 				<div class="scroller">
 					<div class="box-container">
 						<div class="box-container box box-vertical" style="background: #fff">
-							<div class="btn-appliances btn-day" data-product-type="9">日常清洗体验</div>
-							<div class="btn-appliances btn-day" data-product-type="4">家电清洗</div>
-							<div class="btn-appliances btn-day" data-product-type="6">擦玻璃</div>
+							<div class="btn-appliances btn-day" data-product-type="9"><img src="http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8.jpg" alt="日常保洁2小时体验"></div>
+							<div class="btn-appliances btn-day" data-product-type="4"><img src="http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5.jpg" alt="家电清洗"> </div>
+							<div class="btn-appliances btn-day" data-product-type="6"><img src="http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83.jpg" alt="擦玻璃"></div>
 						</div>
 					</div>
 					<div style="width: 100%;padding-bottom:13%; "></div>

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

@@ -19,7 +19,7 @@
 						<div class="swiper-container">
 							<div class="swiper-wrapper">
 								<!--<div class="swiper-slide">-->
-									<!--<img class="btn-home-day lazy" data-product-type="9" src="http://odulvej8l.bkt.clouddn.com/1111%E5%85%83banner.jpg" alt="">-->
+								<!--<img class="btn-home-day lazy" data-product-type="9" src="http://odulvej8l.bkt.clouddn.com/1111%E5%85%83banner.jpg" alt="">-->
 								<!--</div>-->
 								<div class="swiper-slide btn-banner-recharge">
 									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner-2.jpg" alt="">
@@ -47,7 +47,6 @@
 								<img class="btn-homeenterprise lazy" src="http://odulvej8l.bkt.clouddn.com/4-4-01.png" alt="">
 							</div>
 						</div>
-
 					</div>
 				</div>
 				<div class="prevent-scroll">
@@ -81,17 +80,17 @@
 					</div>
 				</div>
 				<!--弹框-->
-<!--				<div class="popup-box">
-					<div class="popup close"></div>
-					<div class="popup-img"></div>
-					<div class="popup-close close"><div class="nav-li-box">
-						<div class="nav-li">
-							<hr class="navli-1 rotatel">
-							&lt;!&ndash;<hr class="navli-3 nav-li-hr-3">&ndash;&gt;
-							<hr class="navli-2 rotater">
-						</div>
-					</div></div>
-				</div>-->
+				<!--				<div class="popup-box">
+									<div class="popup close"></div>
+									<div class="popup-img"></div>
+									<div class="popup-close close"><div class="nav-li-box">
+										<div class="nav-li">
+											<hr class="navli-1 rotatel">
+											&lt;!&ndash;<hr class="navli-3 nav-li-hr-3">&ndash;&gt;
+											<hr class="navli-2 rotater">
+										</div>
+									</div></div>
+								</div>-->
 			</div>
 		</div>
 	</div>