测试

www/webapp/o2o/css/ratchetOverloading.css

@@ -160,7 +160,7 @@
 	width: 100%;
 	display: block;
 }
-.btn-day .product-img{
+.btn-day .product2-img{
 	position: absolute;
 	width: 30px;
 	height: 30px;

www/webapp/o2o/dist/js/page/activities/day.js

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"secondary",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),setInterval(function(){e(".product-img").fadeToggle()},500),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-appliances",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));i.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:u.allList[n-1],needReset:!0,backHash:"activity-day"}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("activities/day",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"secondary",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),setInterval(function(){e(".product2-img").fadeToggle()},500),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-appliances",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));i.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:u.allList[n-1],needReset:!0,backHash:"activity-day"}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("activities/day",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/page/activities/day.js

@@ -26,7 +26,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 
 			/*特效*/
 			setInterval(function run() {
-				$('.product-img').fadeToggle();
+				$('.product2-img').fadeToggle();
 			}, 500);
 
 			$.newTouch('.back-button', function (event) {

www/webapp/o2o/js/page/placeOrder.js

@@ -808,6 +808,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                     order.payValue = order.payValue - order.balance;
                 }
                 order.addOrder(user.id, payChannel, function (res) {
+                    console.log(res);
                     $doc.trigger('spa:closeloader');
                     if (res.success) {
                         // 更新user的订单
@@ -863,6 +864,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
             /* 只有首页跳转来，才会带有needReset = true */
             /*获取上一页跳转的路由名称*/
             backHash = pushData.backHash ? pushData.backHash : '';
+            console.log(backHash);
 
             if (pushData.hasOwnProperty('needReset') && pushData.needReset) {
                 /* 接收首页传来的product，填写order的productType（产品类型）、productID（产品ID）两个字段 */

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

@@ -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"><img src="http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8.jpg" alt="日常保洁2小时体验"><div class="product-img"></div></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 class="product-img"></div></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 class="product-img"></div></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 class="product2-img"></div></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 class="product2-img"></div></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 class="product2-img"></div></div>
 						</div>
 					</div>
 					<div style="width: 100%;padding-bottom:13%; "></div>

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

@@ -12,7 +12,8 @@
 <div class="content">
 	<div class="box-container">
 		<div class="box-container box box-vertical">
-			<div id="homeScroll" class="scroll-container box-flex-1">
+			<!--homeScroll-->
+			<div id="" class="scroll-container box-flex-1">
 				<div class="scroller">
 					<div class="home-content">
 						<!-- Swiper -->

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

@@ -10,7 +10,8 @@
 <div class="content">
     <div class="box-container">
         <div class="box-container box box-vertical">
-            <div id="placeOrderScroll" class="scroll-container box-flex-1">
+	        <!--placeOrderScroll-->
+            <div id="" class="scroll-container box-flex-1">
                 <div class="scroller">
                     <div class="">
                         <ul class="table-view product-pic-o2o">