部分页面iscroll调整

www/webapp/o2o/css/mine.css

@@ -84,7 +84,7 @@ body {
 /*当其最大宽度为320*/
 @media (max-width: 320px) {
     #mineScroll div .user{
-        margin-top: -20%;
+        /*margin-top: -20%;*/
     }
     #mineScroll div .user .user-name {
         top: 8rem;

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}})}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(".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){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("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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}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(".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){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("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(){var t=e(".rechargeRule"),n=e("#rechargeScroll").width();console.log(n),t.css("left",(n-t.width())/2)},10),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -95,9 +95,9 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			/* 家电清洗 */
 			$.newTouch('.btn-appliances', function (event) {
 				event.preventDefault();
-			
+
 				var type = parseInt($(this).attr('data-product-type'));
-			
+
 				$doc.trigger('spa:navigate', {
 					hash: 'product',
 					pushData: {
@@ -107,7 +107,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 					}
 				});
 			}, $view);
-		
+
 			// 双十一活动
 			$.newTouch('.btn-home-day', function (event) {
 				event.preventDefault();
@@ -229,6 +229,15 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
+			setTimeout(function () {
+				/*设置页面高度*/
+				var homeBox = $('.home-box');
+				var boxAlignCenter = $('.box-align-center').height();
+				var preventScroll = $('.prevent-scroll').height();
+				homeBox.height(boxAlignCenter * 2.2 + preventScroll);
+			}, 500);
+
+
 			/* 如果需要重新加载，就请求服务列表。 */
 			if (!pageData.pushData.dontNeedReload) {
 				$doc.trigger('spa:openloader');
@@ -254,13 +263,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				/* 建立IScroll */
 				setTimeout(function () {
 					pageData.scroll = new IScroll('#homeScroll');
-					/*设置页面高度*/
-					var homeBox = $('.home-box');
-					var boxAlignCenter = $('.box-align-center').height();
-					var preventScroll = $('.prevent-scroll').height();
-					homeBox.height(boxAlignCenter * 4 + preventScroll);
-
-				}, 1000);
+				}, 500);
 				setTimeout(function () {
 					var swiper = new Swiper('.swiper-container', {
 						pagination: '.pagination',

www/webapp/o2o/js/page/mine.js

@@ -86,8 +86,8 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 					hash: 'recharge',
 					pushData: {
 						needReload: true,
-						backHash:'mine'
-						
+						backHash: 'mine'
+
 					}
 				});
 			}, $view);
@@ -141,6 +141,14 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 			var $view = this;
 			var $doc = $(document);
 
+			setTimeout(function () {
+				/*设置页面高度*/
+				var mineType = $('.mine-type');
+				var boxAlignCenter = mineType.children("div").height();
+				var preventScroll = $('.prevent-scroll').height();
+				mineType.height(boxAlignCenter * 2.3 + preventScroll);
+			}, 500);
+
 			if (pageData.pushData && pageData.pushData.needReset) {
 				var addressStr = '';
 				var defaultAddress = address.defaultAddress;
@@ -154,7 +162,7 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 					showNavBar: !config.isWX,
 					userName: user.name == '' ? '未登录' : user.name,
 					userBalance: user.balance,
-					userAvatar:user.avatar,
+					userAvatar: user.avatar,
 					defaultAddress: addressStr
 				});
 

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

@@ -120,6 +120,7 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 					case 2:
 						$('#reviewContainer').show();
 						if (cachePageData.needReloadReview) {
+							console.log(cachePageData.reviewScroll);
 							cachePageData.needReloadReview = false;
 							$doc.trigger('spa:openloader');
 							review.getList(cachePageData.product.type, function (res) {

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

@@ -26,20 +26,17 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			// 返回
 			$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);
 			});
 //点击展示协议   vactivity-text
-			$.newTouch('.pay-agreement',function (event) {
+			$.newTouch('.pay-agreement', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 					hash: 'activity-text',
@@ -49,7 +46,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				});
 			}, $view);
 			//规则 pay-rule
-			$.newTouch('.pay-rule',function (event) {
+			$.newTouch('.pay-rule', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 					hash: 'activity-rule',
@@ -114,6 +111,13 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 						var value = $('.btn-add-recharge').attr('data-index');
 						for (var i = value; i < 2; i++) {
 						}
+						/*设置返现协议居中*/
+						setTimeout(function () {
+							var rechargeRule=$(".rechargeRule");
+							var window=$("#rechargeScroll").width();
+							console.log(window);
+							rechargeRule.css("left",(window-rechargeRule.width())/2);
+						},10);
 						setTimeout(function () {
 							pageData.scroll = new IScroll('#rechargeScroll');
 						}, 500);

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

@@ -17,6 +17,9 @@
     <button class="btn btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}" data-index="{{ i }}" style="background-color: rgba(146,118,3,1);color: rgb(233,233,216);border: 0;border-radius: 0px;">立即充值</button>
 </li>
 {{ /each }}-->
+
+
+
 {{ each recharges as recharge i }}
 <li class="media btn-add-recharge" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"
     data-index="{{ i }}">

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

@@ -14,9 +14,12 @@
 			<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;display: block;" >《<span class="pay-agreement" style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
+			<div class="ad-hide rechargeRule" style="text-align: center;position: fixed;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>-->
 			</div>
 		</div>
 	</div>