测试

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(".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:"product",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:"product",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,title:"活动体验"});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

@@ -21,7 +21,6 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 			// 返回
 			$view.on('swipeRight', function (event) {
 				back.call(this, event);
-				// history.go(-1);
 			});
 
 			/*特效*/
@@ -31,12 +30,10 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 
 			$.newTouch('.back-button', function (event) {
 				back.call(this, event);
-				// history.go(-1);
 			}, $view);
 
 			$view.on('tapBackButton', function (event) {
 				back.call(this, event);
-				// history.go(-1);
 			});
 			//跳转下单页面
 			$.newTouch('.btn-appliances', function (event) {
@@ -101,7 +98,8 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 					if (res.success) {
 						var tpl = template('activities/day', {
 							showNavBar: !config.isWX,
-							recharges: res.data
+							recharges: res.data,
+							title:"活动体验"
 						});
 						$('.spa-page-body', $view).html(tpl);
 						setTimeout(function () {

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

@@ -225,6 +225,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, 500);
 			/* 如果需要重新加载，就请求服务列表。 */
 			if (!pageData.pushData.dontNeedReload) {
+
 				$doc.trigger('spa:openloader');
 				/*
 				 * tmodjs：
@@ -232,7 +233,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				 * var tpl = template(html文件路径，数据)
 				 */
 				var tpl = template('home/index', {
-					showNavBar: !config.isWX && !config.isChubao
+					// showNavBar: !config.isWX && !config.isChubao
+					showNavBar: true
 				});
 				/*
 				 * jQuery：

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

@@ -910,7 +910,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					/* 环境，目前只决定是否显示保洁师 */
 					env: config,
 					/* 环境 */
-					showNavBar: !config.isWX && !config.isChubao,
+					// showNavBar: !config.isWX && !config.isChubao,
+					showNavBar: true,
 					imgSrc: product.imgSrc,
 					/* 标题栏的标题 */
 					title: product.name,

www/webapp/o2o/js/page/product.js

@@ -213,7 +213,8 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 							// picLists: cachePageData.product.pics,
 							picLists: dataArray,
 							commentCounts: commentCounts,
-							showNavBar: !config.isWX && !config.isChubao,
+							// showNavBar: !config.isWX && !config.isChubao,
+							showNavBar: true
 							// isShowVideo: isShowVideo()
 						});
 						$('.spa-page-body', $view).html(tpl);

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">{{title}}</h1>
 </header>
 {{ /if }}
 
@@ -14,7 +14,7 @@
 				<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="10"><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="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>