Merge branch 'master' of http://git.iamberry.com/liujiankang/static

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/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() {