删除充值送日本游活动

www/webapp/o2o/build.js

@@ -19,7 +19,6 @@
 			'pageSecondary',
 			'pageHomestay',
 			'pageHomeenterprise',
-			'pagePayAgreement',
 			'pageExtension',
 			'pageProduct',
 			'pagePlaceOrder',

www/webapp/o2o/dist/js/build.txt

@@ -30,7 +30,6 @@ page/mine.js
 page/secondary.js
 page/homestay.js
 page/homeenterprise.js
-page/PayAgreement.js
 page/extension.js
 model/cart.js
 page/product.js

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

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".home-stay-content",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",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-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},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("payAgreement/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#payAgreementScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),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}})},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){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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),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:""}})},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){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()}}});

www/webapp/o2o/js/main.js

@@ -33,7 +33,6 @@ require.config({
 		pageRecharge: './page/rechargee',
 		pageHelp: './page/help',
 		pageBargain: './page/bargain',
-		pagePayAgreement: './page/PayAgreement',
 		pageExtension:'./page/extension',
 		pageHomestay: './page/homestay',
 		pageHomeenterprise: './page/homeenterprise',
@@ -105,18 +104,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
-	//充值协议
-	var pagePayAgreement = {
-		route: 'payAgreement',
-		classname: 'payAgreement',
-		animate: 'pushInLeft',
-		view: function () {
-			var $page = this;
-			requirejs(['pagePayAgreement'], function (viewData) {
-				$doc.trigger('spa:initpage', [$page, viewData])
-			})
-		}
-	};
+	
 	//双十一支付
 	var pageBargain = {
 		route: 'bargain',
@@ -571,7 +559,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageBargain, pagePayAgreement,pageExtension,pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat,pageActivityText,pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageBargain,pageExtension,pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat,pageActivityText,pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
 	var panelAlert = {
 		id: 'simpleAlert',

www/webapp/o2o/js/page/payAgreement.js

@@ -1,116 +0,0 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
-
-	function back(event) {
-		event.preventDefault();
-		$(document).trigger('spa:navigate', {
-			hash: '',
-			pushData: {
-				dontNeedReload: true
-			}
-		});
-	}
-
-	return {
-		title: '企业服务',
-		body: '',
-		init: function (pageData, dtd) {
-			/* this是什么？ */
-			var $view = this;
-			var $doc = $(document);
-
-			/* 定义按钮事件。
-			 * 为什么不是$(selector).onclick(function)呢？
-			 */
-
-			// 返回
-			$view.on('swipeRight', function (event) {
-				back.call(this, event);
-				// history.go(-1);
-			});
-
-			$.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('.o2o-btn-homestay', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/enterprise';
-				// window.location.href='http://commontest.yiguanjia.me/index.php?r=common/activity/Enterprise';
-				// console.log('测试')
-			}, $view);
-			/*跳转到充值卡*/
-			$.newTouch('.home-stay-content', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: 'recharge',
-					pushData: {
-						needReset: true
-					}
-				});
-			}, $view);
-			// 首页
-			$.newTouch('.btn-action-my-order', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: '',
-					pushData: {
-						needReset: true
-					}
-				});
-			}, $view);
-			// im
-			$.newTouch('.btn-action-logo', function (event) {
-				event.preventDefault();
-				window.location.href = '/index.php?r=o2o/advisory/im';
-			}, $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) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (!pageData.pushData.dontNeedReload) {
-				$doc.trigger('spa:openloader');
-				recharge.getRechargeList(function (res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						var tpl = template('payAgreement/index', {
-							showNavBar: !config.isWX,
-							recharges: res.data
-						});
-						$('.spa-page-body', $view).html(tpl);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#payAgreementScroll');
-						}, 500);
-					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})

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

@@ -67,7 +67,8 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
                     hash: 'placeOrder',
                     pushData: {
                         product: product.allList[type - 1],
-                        needReset: true
+                        needReset: true,
+                        backHash:''
                     }
                 });
             }, $view);

www/webapp/o2o/tpl/activities/rule.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 }}
 

www/webapp/o2o/tpl/activities/text.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 }}
 

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

@@ -1,56 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">充值协议</h1>
-</header>
-{{ /if }}
-
-<div class="content">
-	<div class="box-container">
-		<div class="box-container box box-vertical">
-			<div id="payAgreementScroll" class="scroll-container box-flex-1">
-				<div class="scroller">
-					<div class="home-stay-content">
-						<img
-							src="http://odulvej8l.bkt.clouddn.com/%E8%B7%B3%E8%BD%AC%E9%A1%B5-%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
-							style="width: 100%;">
-						<div style="padding-bottom:10%;"></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" href="weixin://contacts/profile/honghaitzz">
-									<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>
-</div>