csj

tooth/integral-log.html

@@ -44,9 +44,9 @@
 			<!--头部选项卡-->
 			<div id="pro-top-menu" class="mui-segmented-control">
 				<!--(默认选中哪个就加上mui-active)，其他不加-->
-				<a class="mui-control-item" name="1" href="#item1">收入记录</a>
-				<a class="mui-control-item" name="3" href="#item2">待入记录</a>
-				<a class="mui-control-item mui-active" name="2" href="#item3">全部记录</a>
+				<a class="mui-control-item" id="status_1" name="1" href="#item1">收入记录</a>
+				<a class="mui-control-item" id="status_3" name="3" href="#item2">待入记录</a>
+				<a class="mui-control-item mui-active" id="status_2" name="2" href="#item3">全部记录</a>
 			</div>
 		</div>
 		<!--内容开始-->
@@ -228,7 +228,7 @@
 		<script src="js/main.js"></script>
 		<script>
 			
-			
+			var item = getParam("integralStatus");
 			var pageNumber = 0,pagesize = 10;//pageNumber第几页，pagesize每页条数
 			mui.init({
 				pullRefresh: {
@@ -339,7 +339,7 @@
 //			}	
 //			
 			
-			//全部记录
+			
 			
 			function pullupRefresh() {		
 				
@@ -374,6 +374,9 @@
 							if(item == 1) {
 								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) {
@@ -393,6 +396,9 @@
 							}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-pull-caption-nomore").hide();
+										}
 							var li = document.createElement('li');//创建li标签
 									li.className='mui-table-view-cell';//給li标签className
 									if(dt.data.stayIntegralCount == undefined && dt.data.stayIntegralCount == null){
@@ -405,12 +411,15 @@
 									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>';
+									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标签
 									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){
@@ -439,7 +448,7 @@
 									}else if(this.integralType == 2){
 										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-red">'+'-'+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>';
 									}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>';
+										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);
 									table.appendChild(li);//将li插入table
@@ -456,7 +465,7 @@
 		}
 
 //		头部选项卡点击事件
-			var item = 2;
+//			var item = 2;
 			$(document).on('tap', '#pro-top-menu>a', function() {
 				item = $(this).attr('name');
 				pageNumber=0;//页数归零
@@ -467,7 +476,25 @@
 			mui.ready(function() {
 				$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
 				mui('#item').pullRefresh().pullupLoading();//重新加载数据
+				
+				
+				$(".mui-segmented-control>a").removeClass("mui-active");
+				console.log(item);
+				if(item == null || item == ""){
+					item = 2;
+					$("#status_2").addClass("mui-active");
+				}else if(item == 1){
+					$("#status_1").addClass("mui-active");
+				}else if(item == 3){
+					$("#status_3").addClass("mui-active");
+				}else if(item == 2){
+					$("#status_2").addClass("mui-active");
+				}
+				
 			});
+			
+			
+			
 		</script>
 	</body>
 

tooth/my-center.html

@@ -66,15 +66,15 @@
 			</div>
 			<div class="jifen-box">
 				<div id="jifen-menu-nav" class="mui-segmented-control">
-					<!--<a class="mui-control-item mui-active">可用积分
-						<div>999</div>
+					<a class="mui-control-item mui-active" status="1">可用积分
+						<div></div>
 					</a>
-					<a class="mui-control-item">待入积分
-						<div>999</div>
+					<a class="mui-control-item" status="3">待入积分
+						<div></div>
+					</a>
+					<a class="mui-control-item" status="2">累计积分
+						<div></div>
 					</a>
-					<a class="mui-control-item">累计积分
-						<div>999</div>
-					</a>-->
 				</div>
 			</div>
 			<div class="order-menu-box">
@@ -142,7 +142,7 @@
 				</li>
 			</ul>
 			<div class="mui-content-padded mui-text-center">客服电话：
-				<a class="tel" href="tel:4006781860">400-6781860</a>
+				<a class="tel" href="400-6781860">400-6781860</a>
 			</div>
 		</div>
 		<!-- 加载ing -->
@@ -161,6 +161,7 @@
 //				mui(progressbar1).progressbar().setProgress(50); //设置进度条50（单位%）
 				$(".loading").hide().css("opacity", "0");//隐藏loadilng
 				var userIdentity;
+				mask.show(); //显示遮罩层蒙板
 			});
 			
 			$.ajax(base_path + '/wechat/userIntegral/getRankRule?dates=' + new Date().getTime(), {
@@ -177,23 +178,39 @@
 							location.href = dt.redirectURL;
 						} else {
 							if(dt.status) {//判断接口返回状态status
+								
 								if(dt.data.memberInfo){//判断用户信息是否为空
-									
-									var user = document.body.querySelector('.user-head');
+									$(".mui-backdrop").remove(); //移除遮罩层
+									var user = document.body.querySelector('.user-head');//头像容器
 									var head= document.createElement('li');
 									var userHead=dt.data.memberInfo.userHead;
 									
 									if(userHead == null || userHead == "" || typeof(userHead) == "undefined"){//判断头像是否为空
-										head.innerHTML='<img id="headDiv" src="images/tx-1.png" />';//默认头像
+										head.innerHTML='<img id="headDiv" src="images/logo.png" />';//默认头像
 									}else{
 										head.innerHTML='<img id="headDiv" src="'+userHead+'" />';//用户头像
 									}
-									
 									user.appendChild(head);//添加头像
-									$("#userNickname").text(dt.data.memberInfo.userNickname);//昵称
+									
+									var userNickname=dt.data.memberInfo.userNickname;
+									if(userNickname == null || userNickname == "" || typeof(userNickname) == "undefined") {//判断昵称是否为空
+										$("#userNickname").text("微信用户");
+									}else{
+										$("#userNickname").text(dt.data.memberInfo.userNickname);
+									}
+									
+									if(dt.data.notSendCount){//判断未发货数量
+//											$(".my-badge-danger").text(dt.data.notSendCount);
+											var daifahuo = document.body.querySelector('.icon-daifahuo');
+											var s = document.createElement('li');//创建li标签
+											s.innerHTML ='<span class="mui-badge my-badge-danger">'+dt.data.notSendCount+'</span>';
+											daifahuo.appendChild(s);//插入代发货数量
+										}
+									
 									userIdentity=dt.data.memberInfo.userIdentity;
+									
 									if(userIdentity==1){//判断用户身份是否为会员
-
+										
 										if(!window.sessionStorage) {
 											mui.alert("您的浏览器不支持sessionStorage");
 										} else {
@@ -207,25 +224,27 @@
 											//json格式化插入    
 											sessionStorage.setItem('user_data', JSON.stringify(obj));
 										}
-										var table = document.body.querySelector('.progressbar-box');
-										var div = document.createElement('li');//创建li标签
-										var ico= document.createElement('li');
+										
+										var table = document.body.querySelector('.progressbar-box');//进度条容器
+										var div = document.createElement('li');//创建li标签（进度条）
+										
+										var ico= document.createElement('li');//创建li标签（等级图标）
 										ico.innerHTML='<span class="user-leave"><img src="'+dt.data.listRankRule[0].rankIco+'" /></span>';
 										user.appendChild(ico);//添加图标
 										var progressbar1 = mui('#demo1');
 										var lislength=dt.data.listRankRule.length;
 										if(lislength>2){//判断是否有下下级
 											
-											var poorIntegral=dt.data.listRankRule[1].rankRuleIntegral-dt.data.memberInfo.userIntegral;//距离下一个等级的积分
+											var poorIntegral=dt.data.listRankRule[0].rankRuleIntegral-dt.data.memberInfo.userIntegral;//距离下一个等级的积分
 											div.innerHTML ='<div><span style="float: left;">'//插入等级信息
 													+dt.data.listRankRule[0].rankRuleName+'</span><span class="mui-h5">'
 													+dt.data.listRankRule[1].rankRuleName+'</span><span style="float: right;" class="mui-h5">'
 													+dt.data.listRankRule[2].rankRuleName+'</span></div><h6 class="my-h6">还剩'
 													+poorIntegral+'积分即可升级</h6>';
-											mui(progressbar1).progressbar().setProgress(dt.data.memberInfo.userIntegral/dt.data.listRankRule[1].rankRuleIntegral*100);//进度条%
+											mui(progressbar1).progressbar().setProgress(dt.data.memberInfo.userIntegral/dt.data.listRankRule[0].rankRuleIntegral*100);//进度条%
 											table.appendChild(div);
 										}else if(lislength==2){//只有下一级的情况
-											mui(progressbar1).progressbar().setProgress(dt.data.memberInfo.userIntegral/dt.data.listRankRule[1].rankRuleIntegral*100);//进度条%
+											mui(progressbar1).progressbar().setProgress(dt.data.memberInfo.userIntegral/dt.data.listRankRule[0].rankRuleIntegral*100);//进度条%
 											$(".user-leave img").attr("src",dt.data.listRankRule[0].rankIco);//修改图标
 											var poorIntegral=dt.data.listRankRule[0].rankRuleIntegral-dt.data.memberInfo.userIntegral;//距离下一个等级的积分
 											div.innerHTML ='<div><span style="float: left;">'//插入等级信息
@@ -244,6 +263,7 @@
 										var userStayIntegral=dt.data.memberInfo.userStayIntegral;
 										var userSurplusIntegral=dt.data.memberInfo.userSurplusIntegral;
 										var userIntegral=dt.data.memberInfo.userIntegral;
+										//判断积分是否为空
 										if(userStayIntegral == null || userStayIntegral == "" || typeof(userStayIntegral) == "undefined") {
 											userStayIntegral = 0;
 										}
@@ -254,23 +274,20 @@
 											userIntegral = 0;
 										}
 										
-										var table1 = document.body.querySelector('.mui-segmented-control');
-										var a = document.createElement('li');//创建li标签
-										a.innerHTML ='<a class="mui-control-item mui-active">可用积分<div>'//插入积分信息
-										+userSurplusIntegral+'</div></a><a class="mui-control-item">待入积分<div>'
-										+userStayIntegral+'</div></a><a class="mui-control-item">累计积分<div>'
-										+userIntegral+'</div></a>';
-										table1.appendChild(a);
-									
-										if(dt.data.notSendCount){//判断未发货数量
-//											$(".my-badge-danger").text(dt.data.notSendCount);
-											var daifahuo = document.body.querySelector('.icon-daifahuo');
-											var s = document.createElement('li');//创建li标签
-											s.innerHTML ='<span class="mui-badge my-badge-danger">'+dt.data.notSendCount+'</span>';
-											daifahuo.appendChild(s);//插入代发货数量
-										}
+//										var table1 = document.body.querySelector('.mui-segmented-control');
+//										var a = document.createElement('li');//创建li标签
+//										a.innerHTML ='<a class="mui-control-item mui-active status="1"">可用积分<div>'//插入积分信息
+//										+userSurplusIntegral+'</div></a><a class="mui-control-item status="3"">待入积分<div>'
+//										+userStayIntegral+'</div></a><a class="mui-control-item status="2"">累计积分<div>'
+//										+userIntegral+'</div></a>';
+//										table1.appendChild(a);
+										$("#jifen-menu-nav a div").eq(0).text(userSurplusIntegral);
+										$("#jifen-menu-nav a div").eq(1).text(userStayIntegral);
+										$("#jifen-menu-nav a div").eq(2).text(userIntegral);
 									}else{//当为微信用户时
-										$(".userIdentity").text("微信用户");//不是会员时显示微信用户
+										if(userNickname){
+											$(".userIdentity").text("微信用户");//不是会员时显示微信用户
+										}
 										$("#my-toothbrush").hide();//隐藏我的牙刷
 										$(".jifen-box").hide();//隐藏积分
 										$(".progressbar-box").hide();//隐藏进度条
@@ -283,7 +300,7 @@
 								}
 								
 							} else {
-								mui.alert("读取数据错我！请刷新试试");
+								mui.alert("进入失败！网络错误");
 							}
 						}
 					},
@@ -313,13 +330,12 @@
 					
 				}
 			});
+			/*弹窗按钮状态跳转*/
 			$(document).on('tap', '#bt-weixin', function() {
 				location.href = 'pro-list.html';
 			});
 				
-			$(document).on('tap', '.jifen-box', function() {
-				location.href = 'integral-log.html';
-			});	
+			
 			//进度条弹窗
 			$(document).on('tap', '#demo1', function() {
 				mask.show(); //显示遮罩层蒙板
@@ -350,6 +366,13 @@
 				location.href = 'order-list.html?salesStatus='+status;
 			});
 			
+			/*积分div跳转积分页面*/
+			$(document).on('tap', '#jifen-menu-nav>a', function() {
+				var status = $(this).attr("status");
+				location.href = 'integral-log.html?integralStatus='+status;
+				console.log(status);
+			});	
+			
 			/*我的券包跳转*/
 			$(document).on('tap', '#my-coupon-list', function() {
 				location.href = 'coupon_list.html';

tooth/order-details.html

@@ -13,6 +13,26 @@
 	</head>
 
 	<body>
+		<!--底部菜单开始-->
+		<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
+			<a class="mui-tab-item mui-active">
+				<span class="iconfont icon-shouye"></span>
+				<span class="mui-tab-label">首页</span>
+			</a>
+			<a class="mui-tab-item">
+				<span class="iconfont icon-liebiao"></span>
+				<span class="mui-tab-label">列表</span>
+			</a>
+			<a class="mui-tab-item">
+				<span class="iconfont icon-gouwuche"></span>
+				<span class="mui-tab-label">购物车</span>
+			</a>
+			<a class="mui-tab-item">
+				<span class="iconfont icon-huiyuan"></span>
+				<span class="mui-tab-label">会员</span>
+			</a>
+		</footer>
+		<!--底部菜单结束-->
 		<div class="mui-content">
 			<div class="address-cantainner">
 				<input type="hidden"  id="salesPostFirm" name="salesPostFirm" value=""/>

tooth/order-list.html

@@ -250,7 +250,7 @@
 					},
 					dataType: 'json',
 					xhrFields: {
-						withCredentials: true
+						withCredentials: true	
 					},
 					crossDomain: true,
 					type: 'get',

tooth/pay-win.html

@@ -32,8 +32,8 @@
 					记得收货后扫描产品唯一码 <br /> 还有400积分可领取哟！
 				</p>
 				<div style="padding:40px 0 20px 0;">
-					<button type="button" class="mui-btn my-btn go-pro-list">继续逛逛</button>&nbsp;&nbsp;&nbsp;&nbsp;
-					<button type="button" class="mui-btn my-btn go_order_details">查看订单</button>
+					<button type="button" class="my-btn-black my-btn go-pro-list">继续逛逛</button>&nbsp;&nbsp;&nbsp;&nbsp;
+					<button type="button" class="my-btn-black my-btn go_order_details">查看订单</button>
 				</div>
 				</div>	
 			</div>

tooth/pro-details.html

@@ -218,6 +218,7 @@
 			//弹窗的确定
 			$(document).on('tap', '.my-picker .mui-col-xs-12 .my-btn-buy-know', function() {
 				add();
+				mui.toast('加入购物车成功！');
 			});
 			//判断是加减删，ajax分别调用不同的URL
 			function add() {