屏蔽分享

tooth/clearing.html

@@ -57,7 +57,7 @@
 					<li>
 						<div class="mui-input-row">
 							<label class="lbl-remarks">订单备注</label>
-							<input class="ipt-remarks" type="text" placeholder="选填：您对订单有特殊要求，可以在此备注">
+							<input class="ipt-remarks" id="textarea" type="text" placeholder="选填：您对订单有特殊要求，可以在此备注">
 						</div>
 					</li>
 				</ul>

tooth/exchange-goods.html

@@ -116,7 +116,10 @@
 							if(status == 2){
 								$("#addressInfo").hide();
 								$("#msg").html("提示：提交审核成功后,将在3个工作日内退款将退回原支付账户");
-							}else if(status == 5){
+							}else if(newStatus == 4){  //退货退款
+								$("#addressInfo").show();
+								$("#msg").html("<p>提示：</p><p>1：提交成功后，需联系客服并寄回产品，且将寄回单号和 寄件人信息提供给客服、方便核实</p><p>2：客服将在收到寄回产品后，会在3个工作日内将退款退回原支付账户</p>" );
+							}else if(newStatus == 7){ 
 								$("#addressInfo").show();
 								$("#msg").html("提示：提交成功后，需联系客服并寄回产品，并且将寄回单号和 寄件人信息、需要更换的机器信息一起提供给客服" );
 							}

tooth/integral-log.html

@@ -50,8 +50,8 @@
 			</div>
 		</div>
 		<!--内容开始-->
-		<div id="item" class="mui-content" style="padding-top: 44px;">
-
+		<div id="item" class="mui-content mui-scroll-wrapper" style="top: 44px;">
+			<div class="mui-scroll">
 			<!--选项卡item1显示区域(默认选中哪个就加上mui-active)，其他不加-->
 			<div id="item1"  class="mui-control-content mui-active">
 				<ul class="mui-table-view my-grid-view-no integral-list ">
@@ -104,6 +104,7 @@
 					</li>-->
 				</ul>
 			</div>
+			</div>
 			<!--选项卡item2显示区域-->
 			<!--<div id="item2" class="mui-control-content">
 				<ul class="mui-table-view my-grid-view-no integral-list">-->
@@ -235,6 +236,7 @@
 				}
 			});
 			
+			var isShowTitle = false;  //是否需要展示顶部，积分数
 			var item = getParam("integralStatus");
 			var pageNumber = 0,pagesize = 10;//pageNumber第几页，pagesize每页条数
 			mui.init({
@@ -251,119 +253,16 @@
 			});
 			
 			
-			//ready事件    收入记录
-//			mui.ready(function() {
-//				$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
-//				mui('#item').pullRefresh().pullupLoading();//重新加载数据
-//			});
-//			function pullupRefresh() {		
-//				++pageNumber;//每次上拉页数+1
-//				$.ajax(base_path + '/wechat/userIntegral/listGainIntegralInfo?dates=' + new Date().getTime(), {
-//					data:{
-//						"useType":1,
-//						"pageNo":pageNumber,//pageNo第几页
-//						"pageSize":pagesize//pageSize每页条数
-//						},
-//					dataType: 'json',
-//					xhrFields: {
-//						withCredentials: true
-//					},
-//					crossDomain: true,
-//					type: 'post',
-//					timeout: 15000,
-//					success:function(dt){
-//						if(dt.isRedirect){
-//							location.href = dt.redirectURL;
-//						} else {
-//							if(dt.status){
-//								console.log(dt);
-//								var table = document.body.querySelector('.integral-list');//table是插入数据li的父级容器
-//								mui('#item').pullRefresh().endPullupToRefresh(dt.data.listGainIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载
-//								var li = document.createElement('li');//创建li标签
-//										li.className='mui-table-view-cell';//給li标签className
-//										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div></div>';
-//										table.appendChild(li);//将li插入table
-//								mui.each(dt.data.listGainIntegralInfo, function(index) {
-//										var li = document.createElement('li');//创建li标签
-//										li.className='mui-table-view-cell';//給li标签className
-//										li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-blue">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName+'</span><span class="mui-h6 mui-pull-right">'+this.integralCreateTime+'</span></div></div>';
-//										table.appendChild(li);//将li插入table
-//									});
-//							} else {
-//								mui.alert("获取数据失败！");
-//							}
-//						}
-//					},
-//				});
-//			}
-//		
-//			
-//			//待入记录
-//			mui.ready(function() {
-//				$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
-//				mui('#item').pullRefresh().pullupLoading();//重新加载数据
-//			});
-//			function pullupRefresh() {		
-//				++pageNumber;//每次上拉页数+1
-//			$.ajax(base_path + '/wechat/userIntegral/listStayIntegral?dates=' + new Date().getTime(), {
-//				data:{
-//					"useType":3,
-//					"pageNo":pageNumber,//pageNo第几页
-//					"pageSize":pagesize//pageSize每页条数
-//				},
-//				dataType: 'json',
-//				xhrFields: {
-//					withCredentials: true
-//				},
-//				crossDomain: true,
-//				type: 'post',
-//				timeout: 15000,
-//				success:function(dt){
-//					if(dt.isRedirect){
-//						location.href = dt.redirectURL;
-//					} else {
-//						if(dt.status){
-//							console.log(dt);
-//							var table = document.body.querySelector('.integral-list');//table是插入数据li的父级容器
-//							mui('#item').pullRefresh().endPullupToRefresh(dt.data.listStayIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载
-//							var li = document.createElement('li');//创建li标签
-//									li.className='mui-table-view-cell';//給li标签className
-//									li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div></div>';
-//									table.appendChild(li);//将li插入table
-//							mui.each(dt.data.listStayIntegralInfo, function(index) {
-//									
-//									var li = document.createElement('li');//创建li标签
-//									li.className='mui-table-view-cell';//給li标签className
-//									li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-yellow">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName+'</span><span class="mui-h6 mui-pull-right">'+this.integralCreateTime+'</span></div></div>';
-//									table.appendChild(li);//将li插入table
-//								});
-//						} else {
-//							mui.alert("获取数据失败！");
-//						}
-//					}
-//				},
-//			});
-//			}	
-//			
-			
-			
-			
 			function pullupRefresh() {		
 				
 				++pageNumber;//每次上拉页数+1
 				var parameter = {}; //ajax参数json集合
-				parameter["pageNo"] = pageNumber;
+				parameter["pageNO"] = pageNumber;
 				parameter["pageSize"] = pagesize;
 				if(item != 2){
 					parameter["useType"] = item;
 				}
 			$.ajax(base_path + '/wechat/userIntegral/listAllIntegralInfo?dates=' + new Date().getTime(), {
-				
-//				data:{
-//					parameter
-//					"pageNo":pageNumber,//pageNo第几页
-//					"pageSize":pagesize//pageSize每页条数
-//				},
 				data:parameter,
 				dataType: 'json',
 				xhrFields: {
@@ -382,31 +281,33 @@
 								var table = document.body.querySelector('.integral-list');//table是插入数据li的父级容器
 								mui('#item').pullRefresh().endPullupToRefresh(dt.data.listIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载
 								if(dt.data.listIntegralInfo.length<pagesize){
-											$(".mui-pull-caption-nomore").hide();
-										}
-								var li = document.createElement('li');//创建li标签
-										li.className='mui-table-view-cell';//給li标签className
-										if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null) {
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div></div>';
-											table.appendChild(li);//将li插入table
-										}else {
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div></div>';
-											table.appendChild(li);//将li插入table
-										}
+									$(".mui-pull-caption-nomore").hide();
+								}
+								if(!isShowTitle){
+									var li = document.createElement('li');//创建li标签
+									li.className='mui-table-view-cell';//給li标签className
+									
+									if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null) {
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div></div>';
+									}else {
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div></div>';
+									}
+									table.appendChild(li);//将li插入table
+								}
 								mui.each(dt.data.listIntegralInfo, function(index) {
 										var li = document.createElement('li');//创建li标签
 										li.className='mui-table-view-cell';//給li标签className
 										li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-blue">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName+'</span><span class="mui-h6 mui-pull-right">'+this.integralCreateTime+'</span></div></div>';
 										table.appendChild(li);//将li插入table
-										
-									});
+								});
 							}else if(item == 3) {
 								var table = document.body.querySelector('.integral-list');//table是插入数据li的父级容器
-							mui('#item').pullRefresh().endPullupToRefresh(dt.data.listIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载	
-							if(dt.data.listIntegralInfo.length<pagesize){
+								mui('#item').pullRefresh().endPullupToRefresh(dt.data.listIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载	
+								if(dt.data.listIntegralInfo.length<pagesize){
 											$(".mui-pull-caption-nomore").hide();
-										}
-							var li = document.createElement('li');//创建li标签
+									}
+								if(!isShowTitle){
+									var li = document.createElement('li');//创建li标签
 									li.className='mui-table-view-cell';//給li标签className
 									if(dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null){
 										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div></div>';
@@ -414,39 +315,45 @@
 										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div></div>';
 									}
 									table.appendChild(li);//将li插入table
-							mui.each(dt.data.listIntegralInfo, function(index) {
-									console.log(dt.data);
-									var li = document.createElement('li');//创建li标签
-									li.className='mui-table-view-cell';//給li标签className
-									li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-yellow">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName +'</span><span class="mui-h6 mui-pull-right">'+this.stayRecordedTime+'(待入)'+'</span></div></div>';
-									table.appendChild(li);//将li插入table
+								}
+								
+								mui.each(dt.data.listIntegralInfo, function(index) {
+										console.log(dt.data);
+										var li = document.createElement('li');//创建li标签
+										li.className='mui-table-view-cell';//給li标签className
+										li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-yellow">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName +'</span><span class="mui-h6 mui-pull-right">'+this.stayRecordedTime+'(待入)'+'</span></div></div>';
+										table.appendChild(li);//将li插入table
 								});
 							} else {
 								var table = document.body.querySelector('.integral-list');//table是插入数据li的父级容器
-							mui('#item').pullRefresh().endPullupToRefresh(dt.data.listIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载
-							if(dt.data.listIntegralInfo.length<pagesize){
-											$(".mui-pull-caption-nomore").hide();
-										}
-							var li = document.createElement('li');//创建li标签
+								mui('#item').pullRefresh().endPullupToRefresh(dt.data.listIntegralInfo.length<pagesize);//endPullupToRefresh(ture)表示没有更多数据了，停止上拉加载
+								if(dt.data.listIntegralInfo.length<pagesize){
+									$(".mui-pull-caption-nomore").hide();
+								}
+								
+							if(!isShowTitle){
+								var li = document.createElement('li');//创建li标签
 									li.className='mui-table-view-cell';//給li标签className
-										if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
-										}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
-										}else{
-											li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
-										}
+									if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount == undefined && dt.data.gainIntegralCount == null && dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null && dt.data.useIntegralCount != undefined && dt.data.useIntegralCount != null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+0+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
+									}else if(dt.data.gainIntegralCount != undefined && dt.data.gainIntegralCount != null && dt.data.stayIntegralCount != undefined && dt.data.stayIntegralCount != null && dt.data.useIntegralCount == undefined && dt.data.useIntegralCount == null){
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+0+'</h3></div></div>';
+									}else{
+										li.innerHTML += '<div class="mui-table mui-text-center"><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-blue">'+'+'+dt.data.gainIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-yellow">'+'+'+dt.data.stayIntegralCount+'</h3></div><div class="mui-table-cell mui-col-xs-4"><h3 class="mui-ellipsis cl-red">'+'-'+dt.data.useIntegralCount+'</h3></div></div>';
+									}
 									table.appendChild(li);//将li插入table
+							}
+									
 							mui.each(dt.data.listIntegralInfo, function(index) {
 									var li = document.createElement('li');//创建li标签
 									li.className='mui-table-view-cell';//給li标签className 
@@ -457,12 +364,11 @@
 									}else{
 										li.innerHTML += '<div class="mui-table my-integral-cell"><div class="mui-table-cell mui-col-xs-3 mui-text-center"><div class="integral-number"><span class="cl-yellow">'+'+'+this.integralNumber+'</span></div></div><div class="mui-table-cell mui-col-xs-9"><span>'+this.integralConfigName+'</span><span class="mui-h6 mui-pull-right">'+this.stayRecordedTime +'(待入)'+'</span></div></div>';
 									}
-									console.log(li);
+									//console.log(li);
 									table.appendChild(li);//将li插入table
-									
 								});
 							}
-								
+								isShowTitle = true;
 						} else {
 							mui.alert("获取数据失败！");
 						}
@@ -471,22 +377,26 @@
 			});
 		}
 
-//		头部选项卡点击事件
+//			头部选项卡点击事件
 //			var item = 2;
 			$(document).on('tap', '#pro-top-menu>a', function() {
+				isShowTitle = false;
+				pageNumber = 0;
 				item = $(this).attr('name');
 				pageNumber=0;//页数归零
 				$('.integral-list').empty();//清空产品列表
-				mui('#item').pullRefresh().pullupLoading();//重新加载数据
+				mui('#item').pullRefresh().refresh(true);
+				//mui('#item').pullRefresh().pullupLoading();//重新加载数据
+				mui('.mui-scroll-wrapper').scroll().scrollTo(0,0,500);//500毫秒滚动到顶
 			});
 			
 			mui.ready(function() {
+				
 				$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
 				mui('#item').pullRefresh().pullupLoading();//重新加载数据
 				
-				
 				$(".mui-segmented-control>a").removeClass("mui-active");
-				console.log(item);
+				//console.log(item);
 				if(item == null || item == ""){
 					item = 2;
 					$("#status_2").addClass("mui-active");
@@ -497,11 +407,7 @@
 				}else if(item == 2){
 					$("#status_2").addClass("mui-active");
 				}
-				
 			});
-			
-			
-			
 		</script>
 	</body>
 

tooth/my-vip-message.html

@@ -15,9 +15,9 @@
 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 		<script>
 			//屏蔽分享
-			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-				WeixinJSBridge.call('hideOptionMenu');
-			});
+//			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+//				WeixinJSBridge.call('hideOptionMenu');
+//			});
 		</script>
 	</head>
 	
@@ -112,10 +112,10 @@
 				//选择性别
 				var userPicker = new mui.PopPicker();
 				userPicker.setData([{
-					value: '0',
+					value: '1',
 					text: '男'
 				}, {
-					value: '1',
+					value: '2',
 					text: '女'
 				}]);
 				var showUserPickerButton = dc('btn-sex');
@@ -165,7 +165,7 @@
 					var parameter = {}; //ajax参数json集合
 					    parameter["userName"] = $("#ipt-name").val().trim(); //姓名
 						parameter["userSex"] = $("#btn-sex i").attr("name"); //性别
-						if(typeof(parameter["userAgeStage"])){
+						if(parameter["userAgeStage"] != null && parameter["userAgeStage"] != "" && typeof(parameter["userAgeStage"])) {
 							parameter["userAgeStage"] =6;
 						}else{
 							parameter["userAgeStage"] = $("#btn-age i").attr("name"); //年龄段
@@ -180,7 +180,7 @@
 								withCredentials: true
 							},
 							crossDomain: true,
-							type: 'get',
+							type: 'post',
 							timeout: 15000,
 							success: function(dt) {
 								if(dt.isRedirect) {

tooth/order-list.html

@@ -12,9 +12,7 @@
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
 		<style>
 			.order_operate{
-				    color: #000!important;
-				    border-radius: 0px;
-				    border: 1px solid rgba(0,0,0,.5);
+				    color: #000!important;border-radius: 0px;border: 1px solid rgba(0,0,0,.5);    padding: 6px 0;width: 40%;
 			}
 		</style>
 		<script type="text/javascript">
@@ -308,7 +306,7 @@
 										statusHtml = '';
 									}
 									if(status != 1) {
-										statusHtml += '<button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>';
+										statusHtml += '<button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId style=" color: #000!important;border-radius: 0px;border: 1px solid rgba(0,0,0,.5);">订单详情</button>';
 									} 
 									statusHtml  = statusHtml.replace(/\orderId/g,'orderId="'+ this.salesOrderid +'"');
 									

tooth/pro-details.html

@@ -226,11 +226,14 @@
 			});
 			//弹窗的确定
 			$(document).on('tap', '.my-picker .mui-col-xs-12 .my-btn-buy-know', function() {
-				add();
+				
 //				mui.toast('加入购物车成功！');
-			if(cartStatus == null){
-				mui.toast('加入购物车成功！');
-			}
+				var number = $(".mui-input-numbox").val();
+				if(number != 0){
+					add();
+				}else{
+					mui.toast('请选择商品数量！');
+				}
 			});
 			
 			

tooth/register-vip.html

@@ -294,11 +294,13 @@
 													location.href="my-center.html";
 												}
 											}
-											
 							                     
 							               }); 
 									} else {
-										mui.alert(data.message);
+										mui.alert(dt.message, '提醒', function() {  
+											 location.href="my-center.html";
+							               }); 
+										//mui.alert(dt.message);
 									}
 								}
 							},