页面跳转问题

www/webapp/o2o/css/common.css

@@ -152,7 +152,7 @@ ul, li {
 
 .page-content {
 	padding: 15px 0;
-	background: #efeff4;
+	/*background: #efeff4;*/
 }
 
 /* picker */

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),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("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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;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(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},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){var n=e.pushData;u=n.backHash?n.backHash:"",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),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("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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;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(".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(),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){var n=e.pushData;u=n.backHash?n.backHash:"",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/dist/js/page/rechargee.js

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}function f(e){e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new n("#myCouponScroll")},50)}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",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(t,n){setTimeout(function(){e(".coupon-items").css("margin-bottom","15%")},500);var r=t.pushData;u=r.backHash?r.backHash:"",n.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),f(i);var l=e(".btn-add-recharge").attr("data-index");for(var c=l;c<2;c++);setTimeout(function(){var t=e(".rechargeRule"),n=e("#rechargeScroll").width();t.css("left",(n-t.width())/2)},10),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","recharge","native","config","user","product"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u})}var u;return{title:"充值规则",body:"",init:function(t,r){var i=this,o=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},i),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},i),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),s.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},i),e.newTouch(".pay-agreement",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),o.trigger("spa:openloader");var r=e(this).attr("data-value");n.addRechargeorder({user_id:s.id,recharge_id:e(this).attr("data-id")},function(e){o.trigger("spa:closeloader"),e.success&&(s.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+r+"元"}}],final_price:e.data.price}),o.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),r.resolve()},beforeopen:function(r,a){var f=r.pushData;u=f.backHash?f.backHash:"";var l=this,c=e(document);c.trigger("spa:openloader"),o.getListAll(s.id),n.getRechargeList(function(e){c.trigger("spa:closeloader");if(e.success){var n=t("recharge/index",{showNavBar:!i.isWX,recharges:e.data});l.find(".spa-page-body").html(n),r.scroll&&(r.scroll.destroy(),r.scroll=null),setTimeout(function(){r.scroll=new IScroll("#rechargeScroll")},500),a.resolve(),c.trigger("spa:closeloader")}})}}});

www/webapp/o2o/js/model/product.js

@@ -1323,42 +1323,6 @@ define(['base', '$', 'api'], function (base, $, api) {
 				if(res.success){
 					that.allList=res.data.products;
 				}
-				/*if (res.success) {
-					that.productList = {};
-					var petDic = {};
-					var productDatas = res['data']['products'];
-					var extraroducts = res['data']['extra_products'];
-					// that.extraService = extraroducts;
-
-					for (var i in that.productGroup) {
-						that.productGroup[i] = [];
-					}
-
-					for (var i in that.extraProductGroup) {
-						that.extraProductGroup[i] = [];
-					}
-
-					for (var i = 0, len = productDatas.length; i < len; i++) {
-						var eachProduct = productDatas[i];
-						that.productGroup[eachProduct['type']].push(eachProduct);
-						var petIDs = [];
-
-
-						that.productDic[eachProduct.id] = {//产品中心
-							petIDs: petIDs,//宠物ID
-							maxWeight: eachProduct.max_weight,//产品最大
-							minWeight: eachProduct.min_weight,//产品最小
-							// price: parseFloat(eachProduct.price).toFixed(2)
-							price: parseFloat(eachProduct.price)//解析产品价格
-							// 价格不要加小数点后两位
-						};
-					}
-
-
-					// for (var petID in petDic) {
-					//   that.productGroup[eachProduct['type']].push(petDic[petID]);
-					// }
-				}*/
 				if (typeof (callback) == 'function') {
 					callback(res);
 				}

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

@@ -44,10 +44,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, $view);
 
 			//加载弹框
-			setInterval(function () {
-				$('.swiper-container').height($('.swiper-container img').height());
-				// $('.pagination').css('bottom', '0.15rem');
-			}, 200);
+
 			/*自动关闭活动窗口*/
 			$.newTouch('.btn-o2o-home', function (event) {
 				event.preventDefault();
@@ -75,7 +72,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$doc.trigger('spa:navigate', {
 					hash: 'myCoupon',
 					pushData: {
-						needReload: true
+						needReload: true,
+						backHash: ''
 					}
 				});
 			}, $view);
@@ -95,21 +93,13 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			/* 家电清洗 */
 			$.newTouch('.btn-appliances', function (event) {
 				event.preventDefault();
-				/*product.getListAll(user.id, function (res) {
-					if (res.success) {
-						console.log("成功");
-						console.log(res.data.products);
-					}
-				});
-				console.log(product);*/
-
-
-				// return false;
 				var type = parseInt($(this).attr('data-product-type'));
+				console.log(type);
+				console.log(product.allList[type]);
 				$doc.trigger('spa:navigate', {
 				 hash: 'product',
 				 pushData: {
-				 product: product.allList[type],
+				 product: product.allList[type-1],
 				 needReset: true,
 				 backHash: ''
 				 }
@@ -121,7 +111,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$doc.trigger('spa:navigate', {
 					hash: 'homestay',
 					pushData: {
-						needReset: true
+						needReset: true,
+						backHash: ''
 					}
 				});
 			}, $view);
@@ -131,7 +122,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$doc.trigger('spa:navigate', {
 					hash: 'homeenterprise',
 					pushData: {
-						needReset: true
+						needReset: true,
+						backHash: ''
 					}
 				});
 			}, $view);
@@ -220,6 +212,10 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 		},
 		beforeopen: function (pageData, dtd) {
 			localStorage.removeItem('cart_products');
+			setTimeout(function () {//页面加载时swiper高度等于banner高度
+				$('.swiper-container').height($('.swiper-container img').height());
+				$('.pagination').css('bottom', '0.15rem');
+			}, 200);
 			dtd.resolve();
 			native.switchPopGesture(true);
 		},
@@ -259,7 +255,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				 * 这句的意思是，选取class=".spa-page-body"的元素，把tpl插入其中
 				 */
 				$('.spa-page-body', $view).html(tpl);
-				/* 建立IScroll */
+				/* 建立IScroll-setInterval- setTimeout*/
+
 				setTimeout(function () {
 					pageData.scroll = new IScroll('#homeScroll');
 				}, 500);

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

@@ -1,9 +1,9 @@
 define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
-
+	var backHash;
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: '',
+			hash: backHash,
 			pushData: {
 				dontNeedReload: true
 			}
@@ -71,6 +71,9 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
+			/*获取上一页跳转的路由名称*/
+			var pushData = pageData.pushData;
+			backHash = pushData.backHash ? pushData.backHash : '';
 			dtd.resolve();
 		},
 		afteropen: function (pageData, dtd) {

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

@@ -1,9 +1,10 @@
 define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
+	var backHash;
 
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: '',
+			hash: backHash,
 			pushData: {
 				dontNeedReload: true
 			}
@@ -19,27 +20,27 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			var $doc = $(document);
 			// 返回
 			$view.on('swipeRight', function (event) {
-				history.go(-1);
+				back.call(this, event);
 			});
 			$.newTouch('.back-button', function (event) {
-				history.go(-1);
+				back.call(this, event);
 			}, $view);
 			$view.on('tapBackButton', function (event) {
-				//back.call(this, event);
-				history.go(-1);
+				back.call(this, event);
 			});
-			$.newTouch('.o2o-btn-homestay',function (event) {
+			/*民宿咨询*/
+			$.newTouch('.o2o-btn-homestay', function (event) {
 				event.preventDefault();
-				window.location.href='/index.php?r=o2o/advisory/SinglesDay';
-			},$view);
+				window.location.href = '/index.php?r=o2o/advisory/SinglesDay';
+			}, $view);
 			// 首页
 			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();
-					$doc.trigger('spa:navigate', {
-						hash: '',
-						pushData: {
-							needReset: true
-						}
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					pushData: {
+						needReset: true
+					}
 				});
 			}, $view);
 			// im
@@ -62,6 +63,9 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
+			/*获取上一页跳转的路由名称*/
+			var pushData = pageData.pushData;
+			backHash = pushData.backHash ? pushData.backHash : '';
 			dtd.resolve();
 		},
 		afteropen: function (pageData, dtd) {

www/webapp/o2o/js/page/myCoupon.js

@@ -42,7 +42,7 @@ define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, us
 				//back.call(this, event);
 				history.go(-1);
 			});
-// im
+			// im
 			$.newTouch('.btn-action-logo', function (event) {
 				event.preventDefault();
 				window.location.href = '/index.php?r=o2o/advisory/im';

www/webapp/o2o/js/page/picker.js

@@ -1,121 +1,120 @@
 define(['$', 'template', 'order', 'config', 'user', 'api'], function ($, template, order, config, user, api) {
-    function back(backHash) {
-        $(document).trigger('spa:navigate', {
-            hash: backHash
-        });
-    }
+	function back(backHash) {
+		$(document).trigger('spa:navigate', {
+			hash: backHash
+		});
+	}
 
-    return {
-        title: '壹管家上门服务',
-        body: '',
-        init: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
+	return {
+		title: '壹管家上门服务',
+		body: '',
+		init: function (pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
 
-            //返回
-            $.newTouch('.back-button', function (event) {
-                event.preventDefault();
+			//返回
+			$.newTouch('.back-button', function (event) {
+				event.preventDefault();
 
-                var pushData = pageData.pushData;
-                back.call(this, pushData['backHash']);
-            }, $view);
+				var pushData = pageData.pushData;
+				back.call(this, pushData['backHash']);
+			}, $view);
 
-            $view.on('tapBackButton', function (event) {
-                event.preventDefault();
+			$view.on('tapBackButton', function (event) {
+				event.preventDefault();
 
-                var pushData = pageData.pushData;
-                back.call(this, pushData['backHash']);
-            });
+				var pushData = pageData.pushData;
+				back.call(this, pushData['backHash']);
+			});
 
-            $.newTouch('.picker-option', function () {
-                event.preventDefault();
-                if ($(this).hasClass('unable')) return;
-                $view.trigger('tapBackButton');
+			$.newTouch('.picker-option', function () {
+				event.preventDefault();
+				if ($(this).hasClass('unable')) return;
+				$view.trigger('tapBackButton');
 
-                if (pageData.callback && $.isFunction(pageData.callback.onSelect)) {
-                    pageData.callback.onSelect($(this).data('value'));
-                }
-            }, $view);
+				if (pageData.callback && $.isFunction(pageData.callback.onSelect)) {
+					pageData.callback.onSelect($(this).data('value'));
+				}
+			}, $view);
 
-            // 兑换
-            $.newTouch('.btn-coupon', function (event) {
-                event.preventDefault();
+			// 兑换
+			$.newTouch('.btn-coupon', function (event) {
+				event.preventDefault();
 
-                var pushData = pageData.pushData;
-                var val = $('#coupon-code', $view).val();
-                if (val.length < 8) {
-                    $doc.trigger('spa:openpanel', ['simpleAlert', {
-                        message: '请输入有效的兑换码'
-                    }]);
-                } else {
-                    $(this).val('');
-                    user.exchangeCoupon(val, function (res) {
-                        $doc.trigger('spa:openloader');
-                        if (res.success) {
-                            api.getCouponList({
-                                products: pushData.products,
-                                type: pushData.type,
-                                user_id: user.id
-                            }, function (res) {
-                                $doc.trigger('spa:closeloader');
-                                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                    message: res.message
-                                }]);
-                                if (res.success) {
-                                    user.orderCoupons = res.data;
-                                    var tpl = template('picker/cell', {
-                                        options: res.data
-                                    });
-                                    $view.find('.card-list').html(tpl);
-                                }
-                            })
-                        } else {
-                            $doc.trigger('spa:closeloader');
-                            $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                message: res.message
-                            }]);
-                        }
-                    })
-                }
-            }, $view);
+				var pushData = pageData.pushData;
+				var val = $('#coupon-code', $view).val();
+				if (val.length < 8) {
+					$doc.trigger('spa:openpanel', ['simpleAlert', {
+						message: '请输入有效的兑换码'
+					}]);
+				} else {
+					$(this).val('');
+					user.exchangeCoupon(val, function (res) {
+						$doc.trigger('spa:openloader');
+						if (res.success) {
+							api.getCouponList({
+								products: pushData.products,
+								type: pushData.type,
+								user_id: user.id
+							}, function (res) {
+								$doc.trigger('spa:closeloader');
+								$doc.trigger('spa:openpanel', ['simpleAlert', {
+									message: res.message
+								}]);
+								if (res.success) {
+									user.orderCoupons = res.data;
+									var tpl = template('picker/cell', {
+										options: res.data
+									});
+									$view.find('.card-list').html(tpl);
+								}
+							})
+						} else {
+							$doc.trigger('spa:closeloader');
+							$doc.trigger('spa:openpanel', ['simpleAlert', {
+								message: res.message
+							}]);
+						}
+					})
+				}
+			}, $view);
 
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            var $doc = $(document);
-            var $view = this;
-            var pushData = pageData.pushData;
+			dtd.resolve();
+		},
+		beforeopen: function (pageData, dtd) {
+			var $doc = $(document);
+			var $view = this;
+			var pushData = pageData.pushData;
+			$doc.trigger('spa:openloader');
+			user.getCouponList();
+			api.getCouponList({
+				products: pushData.products, //产品
+				booking_time: pushData.time, //预订时间
+				user_id: user.id, //用户id
+				type: pushData.type, //资源
+				extra: pushData.extraJson
+			}, function (res) {
+				var tpl = template('picker/coupon', {
+					options: res.data,
+					unuseables: res.unuseable_coupons,
+					title: '选择代金券',
+					showNavBar: !config.isWX && !config.isChubao
+				});
 
-            $doc.trigger('spa:openloader');
-            user.getCouponList();
-            api.getCouponList({
-                products: pushData.products, //产品
-                booking_time: pushData.time, //预订时间
-                user_id: user.id, //用户id
-                type: pushData.type, //资源
-                extra:  pushData.extraJson
-            }, function (res) {
-                var tpl = template('picker/coupon', {
-                    options: res.data,
-                    unuseables: res.unuseable_coupons,
-                    title: '选择代金券',
-                    showNavBar: !config.isWX && !config.isChubao
-                });
+				$view.find('.spa-page-body').html(tpl);
 
-                $view.find('.spa-page-body').html(tpl);
+				if (pageData.scroll) {
+					pageData.scroll.destroy();
+					pageData.scroll = null;
+				}
 
-                if (pageData.scroll) {
-                    pageData.scroll.destroy();
-                    pageData.scroll = null;
-                }
+				setTimeout(function () {
+					pageData.scroll = new IScroll('#pickerScroll');
+				}, 500);
 
-                setTimeout(function () {
-                    pageData.scroll = new IScroll('#pickerScroll');
-                }, 500);
-
-                dtd.resolve();
-                $doc.trigger('spa:closeloader');
-            });
-        }
-    }
+				dtd.resolve();
+				$doc.trigger('spa:closeloader');
+			});
+		}
+	}
 });

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

@@ -53,7 +53,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 	/* 重置页面时调用，重新生成IScroll */
 	function fixScroll(pageData) {
 		setTimeout(function () {
-			console.log(product);
 			if (product.name == "首单日常保洁2小时体验") {
 				$('.selected').css('display', 'none');
 			}

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

@@ -5,7 +5,10 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: backHash
+			hash: backHash,
+			pushData: {
+				dontNeedReload: true
+			}
 		});
 	}
 
@@ -59,15 +62,12 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 
 			//立即下单
 			$.newTouch('.product-new-btn', function (event) {
-				var products={};
+				var products = {};
 				for (var i = 0; i < product.allList.length; i++) {
-					if (product.allList[i].name == $('h1.title')[1].innerText) {
-						products=product.allList[i];
+					if (product.allList[i].name == cachePageData.product.name) {
+						products = product.allList[i];
 					}
 				}
-
-
-				// return;
 				$doc.trigger('spa:navigate', {
 					hash: 'placeOrder',
 					pushData: {
@@ -78,19 +78,6 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 				});
 			}, $view);
 
-
-		/*	$.newTouch('.product-new-btn',function (event) {
-
-				// return;
-				$doc.trigger('spa:navigate', {
-					hash: 'placeOrder',
-					pushData: {
-						product:product,
-						needReset: true,
-						backHash: 'product'
-					}
-				});
-			},$view);*/
 			// 提示信息
 			$.newTouch('.btn-product-info', function (event) {
 				$doc.trigger('spa:navigate', {
@@ -209,6 +196,7 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 			backHash = pushData.backHash ? pushData.backHash : '';
 			//渲染空页面
 			cachePageData.product = pushData.product;
+			console.log(pushData.product.type);
 			cachePageData.needReload = pushData.needReset;
 			if (cachePageData.needReload) {
 				cachePageData.needReloadReview = false;

www/webapp/o2o/js/page/rechargee.js

@@ -1,39 +1,23 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
+define(['$', 'template', 'recharge', 'native', 'config', 'user','product'], function ($, template, recharge, native, config, user,product) {
 	var backHash;
 
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: backHash,
-			pushData: {
-				dontNeedReload: true
-			}
+			hash: backHash
+			// pushData: {
+			// 	dontNeedReload: true
+			// }
 		});
 	}
 
-
-	function fixScroll(pageData) {
-		if (pageData.scroll) {
-			pageData.scroll.destroy();
-			pageData.scroll = null;
-		}
-
-		setTimeout(function () {
-			pageData.scroll = new IScroll('#myCouponScroll');
-		}, 50);
-	}
-
 	return {
 		title: '充值规则',
 		body: '',
 		init: function (pageData, dtd) {
-			/* this是什么？ */
 			var $view = this;
 			var $doc = $(document);
 
-			/* 定义按钮事件。
-			 * 为什么不是$(selector).onclick(function)呢？
-			 */
 
 			// 返回
 			$view.on('swipeRight', function (event) {
@@ -47,7 +31,37 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			$view.on('tapBackButton', function (event) {
 				back.call(this, event);
 			});
-//点击展示协议   vactivity-text
+
+			// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/im';
+			}, $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 () {
+					$doc.trigger('spa:navigate', {
+						hash: 'mine',
+						pushData: {
+							needReset: true
+						}
+					});
+				});
+			}, $view);
+
+
+			//点击展示协议   vactivity-text
 			$.newTouch('.pay-agreement', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
@@ -57,16 +71,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 					}
 				});
 			}, $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();
@@ -100,51 +105,32 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-			/*设置底部功能区*/
-			setTimeout(function () {
-				$('.coupon-items').css("margin-bottom", "15%");
-			}, 500);
 			/*获取上一页跳转的路由名称*/
 			var pushData = pageData.pushData;
 			backHash = pushData.backHash ? pushData.backHash : '';
-			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('recharge/index', {
-							showNavBar: !config.isWX,
-							recharges: res.data
-						});
-						$('.spa-page-body', $view).html(tpl);
-						fixScroll(pageData);
-						//var value = $(this).attr('data-value');
-						var value = $('.btn-add-recharge').attr('data-index');
-						for (var i = value; i < 2; i++) {
-						}
-						/*设置返现协议居中*/
-						setTimeout(function () {
-							var rechargeRule = $(".rechargeRule");
-							var window = $("#rechargeScroll").width();
-							rechargeRule.css("left", (window - rechargeRule.width()) / 2);
-						}, 10);
-						setTimeout(function () {
-							pageData.scroll = new IScroll('#rechargeScroll');
-						}, 500);
+			$doc.trigger('spa:openloader');
+			product.getListAll(user.id);
+			recharge.getRechargeList(function (res) {
+				$doc.trigger('spa:closeloader');
+				if (res.success) {
+					var tpl = template('recharge/index', {
+						showNavBar: !config.isWX,
+						recharges: res.data
+					});
+					$view.find('.spa-page-body').html(tpl);
+					if (pageData.scroll) {
+						pageData.scroll.destroy();
+						pageData.scroll = null;
 					}
-				});
-			}
-
-			dtd.resolve();
-		},
-		beforeclose: function (pageData, dtd) {
-			dtd.resolve();
+					setTimeout(function () {
+						pageData.scroll = new IScroll('#rechargeScroll');
+					}, 500);
+					dtd.resolve();
+					$doc.trigger('spa:closeloader');
+				}
+			});
 		}
 	}
 })

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

@@ -117,9 +117,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
-
-
-
 			/*获取上一页跳转的路由名称*/
 			var pushData = pageData.pushData;
 			backHash = pushData.backHash ? pushData.backHash : '';

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

@@ -19,7 +19,7 @@
 							<div class="btn-appliances btn-day" data-product-type="8"><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>
+					<div style="width: 100%;padding-bottom:15%; "></div>
 				</div>
 				<div class="prevent-scroll">
 					<div class="box my-action">

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

@@ -7,7 +7,7 @@
 </header>
 {{ /if }}
 
-<div class="content" id="myCouponScroll">
+<div class="content" id="myCouponScroll" style="background: #efeff4;">
   <div class="scroller">
     <div class="page-content">
       <div class="coupon-form">

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

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