Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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:"",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-banner-recharge",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!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:"",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-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(),o.checkLogin(function(){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/dist/js/page/homeenterprise.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 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),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("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},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 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(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){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("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/homestay.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 r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},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("homestay/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("#homestayScroll")},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 r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),o.checkLogin(function(){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("homestay/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("#homestayScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/main.js

@@ -113,7 +113,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
-
+//ia
 	//充值卡
 	var pageRecharge = {
 		route: 'recharge',

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

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

@@ -1,4 +1,4 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user','product'], function ($, template, IScroll, recharge, native, config, user,product) {
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
 
 	function back(event) {
 		event.preventDefault();
@@ -75,7 +75,30 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user','prod
 					}
 				});
 			}, $view);
-
+			// 首页
+			$.newTouch('.btn-action-my-order', function (event) {
+				event.preventDefault();
+				user.checkLogin(function () {
+					$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) {

www/webapp/o2o/js/page/homeenterprise.js

@@ -43,7 +43,30 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				// window.location.href='http://commontest.yiguanjia.me/index.php?r=common/activity/Enterprise';
 				// console.log('测试')
 			}, $view);
-
+			// 首页
+			$.newTouch('.btn-action-coupon', function (event) {
+				event.preventDefault();
+				user.checkLogin(function () {
+					$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) {

www/webapp/o2o/js/page/homestay.js

@@ -1,5 +1,4 @@
-/*
-define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'address'], function ($, template, IScroll, user, product, native, config, address) {
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
 
 	function back(event) {
 		event.preventDefault();
@@ -11,74 +10,42 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 		});
 	}
 
-	/!*
-	 * 模块结构：5部分。
-	 * title:题目。
-	 * content:不知道是什么，似乎从没用过。
-	 * 以下可以当作生命周期回调，虽然并不清楚是什么时候回调的……
-	 * init:根据上一个页面传来的pageData初始化本页数据，生成页面，绑定事件。
-	 * beforeopen:接收上一个页面传来的数据、有需要的话重置数据
-	 * afteropen:做一些网络请求。
-	 * beforeclose：
-	 *!/
 	return {
-		title: '家庭保洁',
+		title: '民宿保洁',
 		body: '',
 		init: function (pageData, dtd) {
-			/!* this是什么？ *!/
+			/* 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);
+				//back.call(this, event);
+				history.go(-1);
 			});
 			$.newTouch('.o2o-btn-homestay',function (event) {
 				event.preventDefault();
-				window.location.href='/index.php?r=common/activity/SinglesDay';
+				window.location.href='/index.php?r=o2o/advisory/SinglesDay';
 				// console.log('测试')
 			},$view);
-			
-
-			/!* 点击产品列表的某一项 *!/
-			$.newTouch('.btn-product', function (event) {
+			// 首页
+			$.newTouch('.btn-action-my-order', 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
-					}
+				user.checkLogin(function () {
+					$doc.trigger('spa:navigate', {
+						hash: '',
+						pushData: {
+							needReset: true
+						}
+					});
 				});
 			}, $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 () {
@@ -90,69 +57,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 					});
 				});
 			}, $view);
-			/!* 不知道什么意思。*!/
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			if (pageData.pushData && pageData.pushData.needReset) {
-				var tpl = template('homestay/index', {showNavBar: !config.isWX});
-				$('.spa-page-body', $view).html(tpl);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#homestayScroll');
-				}, 500);
-			}
-
-			/!* 又是这个。不知道什么玩意…… *!/
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
-		}
-	}
-})*/
-
-
-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);
-			// 返回
-			$view.on('swipeRight', function (event) {
-				history.go(-1);
-			});
-			$.newTouch('.back-button', function (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/SinglesDay';
-				// console.log('测试')
-			},$view);
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {

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

@@ -49,6 +49,14 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 
 	/* 重置页面时调用，重新生成IScroll */
 	function fixScroll(pageData) {
+		setInterval(function () {
+			if (product.name == "活动产品") {
+				$('.show-time-picker').css('display', 'none');
+				$('.show-coupon-picker').css('display', 'none');
+				$('.product-pic-o2o').css('display', 'none');
+				$('.o2o-singles-day').css('display', 'inline');
+			}
+		}, 50);
 		if (pageData.scroll) {
 			pageData.scroll.destroy();
 			pageData.scroll = null;
@@ -243,14 +251,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				// history.go(-1);
 			});
 			/*setTimeOut*/
-			setInterval(function () {
-				if (product.name == "活动产品") {
-					$('.show-time-picker').css('display', 'none');
-					$('.show-coupon-picker').css('display', 'none');
-					$('.product-pic-o2o').css('display', 'none');
-					$('.o2o-singles-day').css('display', 'inline');
-				}
-			}, 50);
+
 			/* 点击查看详情。跳转到product页面 */
 			$.newTouch('.product-pic-o2o', function (event) {
 				$doc.trigger('spa:navigate', {

www/webapp/o2o/tpl/address/detail/index.html

@@ -60,7 +60,7 @@
         </div>
       </div>
     </div>
-    <div class="btn-container prevent-scroll">
+    <div class="btn-container prevent-scroll" style="bottom: -10px;">
       {{if !add}}
         <a class="btn btn-main btn-block btn-save">更新</a>
       {{else}}

www/webapp/o2o/tpl/myOrder/list.html

@@ -1,7 +1,7 @@
 {{each orders as order i}}
 <ul class="table-view">
     <li class="table-view-cell">
-        <span class="order-desc-title">预约时间</span>
+        <span class="order-desc-title">订单时间</span>
         <span class="order-desc-more">{{order.booking_time_str}}</span>
         <span class="order-precedence-status">{{if order.precedence}}(加急){{/if}}</span>
         <div class="table-cell-accessory">