提交代码

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/my-vip-message.html

@@ -20,7 +20,7 @@
 			});
 		</script>
 	</head>
-
+	
 	<body>
 		<div class="mui-content">
 			<ul class="mui-table-view mui-table-view-chevron my-vip-msg-list">
@@ -39,7 +39,7 @@
 				<li>
 					<div class="mui-input-row">
 						<label>电话</label>
-						<input id="ipt-tel" class="mui-text-right" type="text" placeholder="请输入电话号码" value="">
+						<input id="ipt-tel" class="mui-text-right" type="text"  placeholder="请输入电话号码" value="">
 					</div>
 				</li>
 			</ul>
@@ -158,8 +158,14 @@
 					var parameter = {}; //ajax参数json集合
 					    parameter["userName"] = $("#ipt-name").val().trim(); //姓名
 						parameter["userSex"] = $("#btn-sex i").attr("name"); //性别
-						parameter["userAgeStage"] = $("#btn-age i").attr("name"); //年龄段
+						if(typeof(parameter["userAgeStage"])){
+							parameter["userAgeStage"] =6;
+						}else{
+							parameter["userAgeStage"] = $("#btn-age i").attr("name"); //年龄段
+						}
+						
 						parameter["userTel"] = $("#ipt-tel").val().trim(); //电话
+						console.log(parameter);
 						$.ajax(base_path + '/wechat/member/updateMyMember?dates=' + new Date().getTime(), {
 							data: parameter,
 							dataType: 'json',

tooth/order-details.html

@@ -208,7 +208,7 @@
 							if(statusHtml == null || statusHtml == "" || typeof(statusHtml) == "undefined") {
 								statusHtml = '';
 							}
-							if(status != 1) {
+							if(status != 1 && status != 3) {
 								if(order.salesPostFirm != null && order.salesPostFirm != "" && typeof(order.salesPostFirm) != "undefined" && order.salesPostNum != null && order.salesPostNum != "" && typeof(order.salesPostNum) != "undefined"){
 									statusHtml += '<button type="button" class="my-btn-black order_operate order_logistics" fixedStatus="logistics" orderId>查询物流</button>';
 								}

tooth/order-list.html

@@ -298,7 +298,7 @@
 										'<span class="mui-pull-left">共<span class="cl-red">' + allNum + '</span>件</span>' +
 										'</li>' +
 										'<li class="mui-table-view-cell mui-media mui-col-xs-6 mui-text-right">' +
-										'合计：<span class="cl-red">¥' + accDiv(this.salesYetAmount,100) + '</span>' +
+										'实付：<span class="cl-red">¥' + accDiv(this.salesYetAmount,100) + '</span>' +
 										'</li>' +
 										'<li class="mui-table-view-cell mui-media mui-col-xs-5 mui-text-left">'
 										//+'<h6>58分钟后，订单将失效</h6>'