活动

www/webapp/o2o/build.js

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

www/webapp/o2o/css/main.css

@@ -2,6 +2,7 @@
 @import url("../../common/css/gird.css");
 @import url("./common.css");
 @import url("./home.css");
+@import url("./payAgreement.css");
 @import url("./product.css");
 @import url("./placeOrder.css");
 @import url("./myOrder.css");

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

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

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

@@ -0,0 +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:"recharge",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)}),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}})},r),e.newTouch(".btn-home-day",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!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/rule",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesRuleScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -0,0 +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:"recharge",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)}),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}})},r),e.newTouch(".btn-home-day",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!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/text",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesTextScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -0,0 +1 @@
+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/rechargee.js

@@ -1 +1 @@
-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 i=this,s=e(document);i.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},i),i.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),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("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+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 i=this,s=e(document);i.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},i),i.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),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("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/main.js

@@ -32,7 +32,8 @@ require.config({
 		pageHome: './page/home',
 		pageRecharge: './page/rechargee',
 		pageHelp: './page/help',
-		pageBargain:'./page/bargain',
+		pageBargain: './page/bargain',
+		pagePayAgreement: './page/PayAgreement',
 		pageHomestay: './page/homestay',
 		pageHomeenterprise: './page/homeenterprise',
 		pageAbout: './page/about',
@@ -56,6 +57,9 @@ require.config({
 		pageHire: './page/hire',
 		pageComing: './page/coming',
 		pageActivityCat: './page/activities/day',
+		pageActivityText: './page/activities/text',
+		pageActivityRule: './page/activities/rule',
+		
 		pageAppend: './page/append',
 		pageRefund: './page/refund',
 		pageRefundSuccess: './page/refundSuccess',
@@ -85,7 +89,6 @@ require.config({
 
 	}
 });
-
 require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function ($, spa, native, helper, ratchet, config, user) {
 	var $doc = $(document);
 
@@ -101,6 +104,18 @@ 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',
@@ -418,7 +433,30 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			});
 		}
 	};
-
+	// 活动
+	var pageActivityText = {
+		route: 'activity-text',
+		classname: 'activity-text',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageActivityText'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+//活动规则
+	var pageActivityRule = {
+		route: 'activity-rule',
+		classname: 'activity-rule',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageActivityRule'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
 	// 追加服务
 	var pageAppend = {
 		route: 'append',
@@ -519,7 +557,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageBargain,pageHomeenterprise,pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageBargain, pagePayAgreement, 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/activities/rule.js

@@ -0,0 +1,142 @@
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
+
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: 'recharge',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
+
+	return {
+		title: '双十一活动',
+		body: '',
+		init: function (pageData, dtd) {
+			/* this是什么？ */
+			var $view = this;
+			var $doc = $(document);
+
+			// 返回
+			$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('.btn-appliances', function (event) {
+				event.preventDefault();
+				var type = parseInt($(this).attr('data-product-type'));
+				$doc.trigger('spa:navigate', {
+					hash: 'placeOrder',
+					pushData: {
+						product: product.allList[type - 1],
+						needReset: true
+					}
+				});
+			}, $view);
+			// 双十一活动
+			$.newTouch('.btn-home-day', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-day',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			//优惠券
+			$.newTouch('.btn-banner-coupon', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'myCoupon',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
+			// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'im',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			//充值卡
+			$.newTouch('.btn-banner-recharge', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'recharge',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
+			// 首页
+			$.newTouch('.btn-action-my-order', function (event) {
+				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) {
+			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('activities/rule', {
+							showNavBar: !config.isWX,
+							recharges: res.data
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#activitiesRuleScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

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

@@ -0,0 +1,142 @@
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
+
+	function back(event) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: 'recharge',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
+
+	return {
+		title: '双十一活动',
+		body: '',
+		init: function (pageData, dtd) {
+			/* this是什么？ */
+			var $view = this;
+			var $doc = $(document);
+
+			// 返回
+			$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('.btn-appliances', function (event) {
+				event.preventDefault();
+				var type = parseInt($(this).attr('data-product-type'));
+				$doc.trigger('spa:navigate', {
+					hash: 'placeOrder',
+					pushData: {
+						product: product.allList[type - 1],
+						needReset: true
+					}
+				});
+			}, $view);
+			// 双十一活动
+			$.newTouch('.btn-home-day', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-day',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			//优惠券
+			$.newTouch('.btn-banner-coupon', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'myCoupon',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
+			// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'im',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			//充值卡
+			$.newTouch('.btn-banner-recharge', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'recharge',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
+			// 首页
+			$.newTouch('.btn-action-my-order', function (event) {
+				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) {
+			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('activities/text', {
+							showNavBar: !config.isWX,
+							recharges: res.data
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#activitiesTextScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

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

@@ -47,7 +47,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			setInterval(function () {
 				$('.swiper-container').height($('.swiper-container img').height());
 				// $('.pagination').css('bottom', '0.15rem');
-
 			}, 200);
 			setTimeout(function () {
 				/*Popup生成宽度与高度*/
@@ -57,7 +56,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$('.popup').height($(window).height());
 				/*popup-img设置高度*/
 				$('.popup-img').height(($(window).height()) * 0.75);
-				popup();
 			}, 1000);
 			/*关闭活动窗口*/
 			$.newTouch('.popup', function () {
@@ -67,17 +65,18 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			/*跳转页面*/
 			$.newTouch('.popup-img', function () {
 				event.preventDefault();
+				$('.popup-box').css('display', 'none');
 				$doc.trigger('spa:navigate', {
-					hash: 'recharge',
+					hash: 'payAgreement',
 					pushData: {
 						needReload: true
 					}
 				});
 			}, $view);
 			/*自动关闭活动窗口*/
-			var popup = setTimeout(function () {
+			setTimeout(function () {
 				$('.popup-box').css('display', 'none');
-			},10000);
+			}, 10000);
 			/*setTimeout(function () {
 			 $doc.trigger('spa:openpanel', ['simpleAlert', {
 			 message: '您已获得双十一大礼包',

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

@@ -0,0 +1,116 @@
+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/rechargee.js

@@ -11,7 +11,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 	}
 
 	return {
-		title: '充值卡',
+		title: '充值规则',
 		body: '',
 		init: function (pageData, dtd) {
 			/* this是什么？ */
@@ -37,7 +37,26 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				//back.call(this, event);
 				history.go(-1);
 			});
-
+//点击展示协议   vactivity-text
+			$.newTouch('.pay-agreement',function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-text',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
+			//规则 pay-rule
+			$.newTouch('.pay-rule',function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-rule',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
 			// 点击充值
 			$.newTouch('.btn-add-recharge', function (event) {
 				event.preventDefault();

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

@@ -0,0 +1,48 @@
+{{ 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="activitiesRuleScroll" class="scroll-container box-flex-1">
+				<div class="scroller">
+					<div class="box-container">
+						<div class="box-container box box-vertical" style="background: #fff">
+							<div style="position: relative;top: 0;width: 100%;background: #fff; padding: 0 10px">
+								<p style="position: absolute;background: #fff;">
+								<h3 style="text-align: center;margin-top: 5px;">充值返现抽奖活动规则</h3>
+								<h4>一、活动时间：</h4>
+								<h5>2016年11月16日至2016年11月20日。</h5>
+								<h4> 开奖时间</h4>
+								<h5>2016年11月21日。</h5>
+								<h4>二、活动说明，</h4>
+								<h5>欢迎各位新老客户参与本次壹管家年末回馈充值活动。</h5>
+								<h5>在活动期间(11/16-11/20)在壹管家微信服务号上充值的客户，就有机会获得日本五天四晚自由行的机会。(上海出发至福冈，奖品包含往返机票、在日期间的四晚酒店，预计12月中下旬成行)</h5>
+								<h5>1.活动A，充值1000元档的客户，可获88元折扣，并获得一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格，配置奖品1组)</h5>
+								<h5>2.活动B，充值5000元档的客户，可获688元折扣，并活动一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格，配置奖品2组)</h5>
+								<h5>3.活动C,充值10000元档的客户，直接送出日本游1份。(共2份)
+									注，三种活动不叠加参与，活动A、活动B使用独立的奖池。</h5>
+								<h4>参与方法，</h4>
+								<h5>1.于活动期间(11/16-11/20)搜索并登陆微信服务号”巾帼壹管家”，点击”预约服务”进入首页，点击”我的”进入个人页面，选择”充值卡”进行充值。获得抽奖资格。</h5>
+								<h5>2.于开奖当天(11/21)中午12点，壹管家向所有获得抽奖资格的客户，以短信形式推送抽奖号码，抽奖号码为一个2位数数字。</h5>
+								<h5>3.中奖依据为，开奖当天(11/21)上证指数、深证指数、创业版指数收盘时，小数点后两位数与短信推送抽奖号码一直，即为当选。其中,活动A对应上证指数，活动B对应深证指数及创业版指数。</h5>
+								<h5>4.中奖后拨打400电话联络兑奖，工作人员也会主动联络中奖客户。</h5>
+								<h4>例如，</h4>
+								<h5>
+									我于11/16-11/20期间，充值成功1000元，获得了活动A抽奖资格，在11/21中午收到短信，获得抽奖号码88。因为我参与的是活动A，所以下午查看上证指数，收盘为3655.88，小数点后2位与抽奖号码一致，中奖啦。
+									活动奖品由澳链公司全程赞助。</h5>
+								<div style="padding-bottom: 1%;width: 100%"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,64 @@
+{{ 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="activitiesTextScroll" class="scroll-container box-flex-1">
+				<div class="scroller">
+					<div class="box-container">
+						<div class="box-container box box-vertical" style="background: #fff">
+							<div style="position: relative;top: 0;width: 100%;background: #fff; padding: 0 10px">
+								<p style="position: absolute;background: #fff;">
+								<h3 style="text-align: center;">充值返现活动协议</h3>
+								<h4>一、活动内容：</h4>
+								<h5>单笔充值1000元，可获得1088元余额+日本游抽奖一次；</h5>
+								<h5> 单笔充值3000元，可获得3360元余额；</h5>
+								<h5> 单笔充值5000元，可获得5680元余额+日本游抽奖一次；
+								</h5>
+								<h5> 单笔充值10000元，可获得10880元余额+日本五天四夜游机票酒店一名；
+								</h5>
+								<h5>温馨提示：</h5>
+								<h5>1.壹管家抽奖相关细则：</h5>
+								<h5>a)充值1000元档的客户，可获88元折扣，并获得一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格，配置奖品1组)</h5>
+								<h5>b)充值5000元档的客户，可获688元折扣，并活动一次抽奖资格。抽选奖品为日本游1份。(每100个抽奖资格，配置奖品2组)</h5>
+								<h5>c)充值10000元档的客户，直接送出日本游2份。(先到先得)</h5>
+								<h5>2.注，三种活动不叠加参与，活动A、活动B使用独立的奖池。</h5>
+								<h5>3.本次活动仅限个人用户参与，企业用户不在此活动范围。</h5>
+								<h4>二、活动时间</h4>
+								<h5>即日起至2016年11月20日</h5>
+								<h6>三、奖品兑换方式及说明</h6>
+								<p>2、壹管家不提供旅游相关服务，具体使用及相关售后问题请联系旅行社供应商</p>
+								<p>3、壹管家返活动的相关问题，您可咨询服务热线4009200901(周一至周五，9:00-18:00)</p>
+								<h4>四、余额构成</h4>
+								<h5>您实际支付的充值本金加上壹管家的返现金额会构成您的账户余额（人民币）。</h5>
+								<h4>五、充值金额有效期</h4>
+								<h5>充值及返现金额有效期为自充值日起至用完即止。</h5>
+								<h4>六、充值金额使用规则</h4>
+								<h5>余额可用于支付壹管家所有家庭保洁和家电保洁服务，但不能用于支付服务中产生的其他第三方费用，也不支持提现、转移、转赠，退款。</h5>
+								<h4>七、发票金额</h4>
+								<h5>根据我们已收到的充值金额开具，充值赠送金额或其他并非您实际支付的费用不能开具发票。</h5>
+								<h4>八、充返活动退款规则</h4>
+								<h5>退款说明：在参与壹管家充返活动后的7天之内（≤7天，即参与活动当天为第一天），您可享受7天退款服务，当您申请退款服务，则视为您自动放弃“充值返现”活动权益，将不再享受充返折扣，具体退款规则如下：</h5>
+								<h5>1.充值余额：</h5>
+								<h5>a)若未产生服务费用，可退还当期实际充值金额，我们会在您申请退款服务之日起21个工作日内为您办理退款；</h5>
+								<h5>b)若已产生服务费用，可退款扣除您在下单服务中实际产生的用费后的实际剩余充值金额（实际剩余充值金额=实际充值金额-实际服务金额），我们会在您申请退款服务之日起21个工作日内为您办理退款；</h5>
+								<h5>
+									2.活动赠品服务（例：日本游抽奖活动）；仅支持奖金兑换码在未发送并兑换使用的情况下享受退款服务，我们需要收回您在参与活动时得到的奖金号，并在您申请退款服务之日起21个工作日内，为您退还实际充值金额；抽奖兑换码及旅游奖金一经兑换使用，则无法享受退款服务。</h5>
+								</p>
+								<div style="padding-bottom: 1%;width: 100%"></div>
+							</div>
+						</div>
+					</div>
+					<div style="width: 100%;padding-bottom:1%; "></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,56 @@
+{{ 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>

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

@@ -9,11 +9,15 @@
 <div class="content">
 	<div class="box-container box box-vertical">
 		<div id="rechargeScroll" class="scroll-container box-flex-1">
-			<img src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1banner.jpg"
-			     style="width: 100%;display: block;">
-			<ul class="list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
+			<img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1banner.jpg"
+			     style="width: 100%;">
+			<ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
 				{{include './cell'}}
 			</ul>
+			<div class="ad-hide" style="text-align: center;"><span style="font-size: 0.6rem">点击立即充值，即表示您已经同意壹管家</span><span
+				style="font-size: 0.6rem;font-weight: 600;" class="pay-agreement" >《充返活动协议》</span>
+				<span style="display: block;font-size: 0.6rem;font-weight: 600;" class="pay-rule">活动规则</span>
+			</div>
 		</div>
 	</div>
 </div>