Home Explore Help
Sign In
liujiankang
/
static
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

积分商城

qihanjiao 7 years ago
parent
d1f5767522
commit
46ac51ddbb
11 changed files with 311 additions and 313 deletions
Split View Show Diff Stats
  1. 8 7
      tooth/cash-coupon-dic.html
  2. 11 89
      tooth/cash-coupon-log.html
  3. 18 59
      tooth/cash-coupon.html
  4. 15 5
      tooth/clearing.html
  5. 3 3
      tooth/css/main.css
  6. 13 58
      tooth/index.html
  7. 13 7
      tooth/my-center.html
  8. 56 54
      tooth/my-vip-message.html
  9. 49 17
      tooth/register-vip.html
  10. 1 1
      tooth/shopping-cart.html
  11. 124 13
      tooth/vip-explain.html

+ 8 - 7
tooth/cash-coupon-dic.html
View File 

@@ -9,9 +9,13 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
 
-		<script type="text/javascript">
 
-			// 屏蔽分享
 
-			window.hiddenAllWechatMenu = true;
 
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
+		<script>
 
+			//屏蔽分享
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				// 通过下面这个API隐藏右上角按钮
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 	</head>
 
 	<body>
 
@@ -35,17 +39,14 @@
 
 	<script type="text/javascript" src="js/mui.min.js"></script>
 
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 
 	<script type="text/javascript" src="js/main.js"></script>
 
-	<!--<script src="js/wechat-utils-1.0.js"></script>-->
 
 	<script type="text/javascript">
 
 		window.addEventListener('pageshow', function(e) {
 
 				// 通过persisted属性判断是否存在 BF Cache
 
 				if(e.persisted) {
 
 					location.reload();
 
 				}
 
-		});
 
-	var orderId=getParam("orderId");	
+		});	
 	mui.ready(function(){
 
-		var parameter = {}; //ajax参数json集合
 
 		$(".loading").hide().css("opacity", "0");//隐藏（正在加载...）
 
 	});	
 	</script>

File diff suppressed because it is too large
+ 11 - 89
tooth/cash-coupon-log.html


+ 18 - 59
tooth/cash-coupon.html
View File 

@@ -9,9 +9,13 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 
 		<link rel="stylesheet" type="text/css" href="css/main.css" />
 
-		<script type="text/javascript">
 
-			// 屏蔽分享
 
-			window.hiddenAllWechatMenu = true;
 
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
+		<script>
 
+			//屏蔽分享
 
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
 
+				// 通过下面这个API隐藏右上角按钮
 
+				WeixinJSBridge.call('hideOptionMenu');
 
+			});
 
 		</script>
 
 	</head>
 
 	<body>
 
@@ -46,7 +50,6 @@
 
 	<script type="text/javascript" src="js/mui.min.js"></script>
 
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 
 	<script type="text/javascript" src="js/main.js"></script>
 
-	<!--<script src="js/wechat-utils-1.0.js"></script>-->
 
 	<script type="text/javascript">
 
 		window.addEventListener('pageshow', function(e) {
 
 				// 通过persisted属性判断是否存在 BF Cache
 
@@ -73,6 +76,11 @@
 
 						} else {
 
 							if(dt.status) {
 
 								console.log(dt)
 
+								$(".bn-box").html('<img src="'+dt.data.integralProduct.integralProductImg+'" />');
 
+								$("#integralProductName").text(dt.data.integralProduct.integralProductName);
 
+								$(".integralProductDesc").text(dt.data.integralProduct.integralProductDesc);
 
+								$("#convertDfbi").text(dt.data.integralProduct.convertDfbi+"朵粉币");
 
+								$("#btn-cash").attr("name",dt.data.integralProduct.integralProductId);
 
 							} else {
 
 								mui.alert("获取数据失败！");
 
 							}
 
@@ -80,56 +88,13 @@
 
 					},
 
 					error: function(xhr, type, errorThrown) {
 
 						console.log(xhr);
 
-						//mui.alert("获取数据失败！网络错误");
 
-						var dt={
 
-  "status": true,
 
-  "message": "SUCCESS",
 
-  "data": {
 
-  	"pictureList": [
 
-  		{
 
-  			"pictureId": 1,
 
-  			"integralProductId": 2,
 
-  			"pictureUrl": "img/1.jpg",
 
-  			"pictureCreateDate": 1525688297000
 
-  		},
 
-  		{
 
-  			"pictureId": 2,
 
-  			"integralProductId": 2,
 
-  			"pictureUrl": "img/2.jpg",
 
-  			"pictureCreateDate": 1525688302000
 
-  		}
 
-  	],
 
-  	"integralProduct": {
 
-  		"integralProductId": 2,
 
-  		"integralProductImg":"images/50-quan.jpg",
 
-  		"integralProductName": "兑换券",
 
-  		"integralProductDesc": "兑换券",
 
-  		"integralProductType": 1,
 
-  		"integralProductNum": 1000,
 
-  		"integralProductRemainingNum": 1,
 
-  		"integralProductImagetext": "1213",
 
-  		"integralProductStatus": 1,
 
-  		"integralProductCreateTime": 1525225200000,
 
-  		"integralProductUpdateTime": 1525607456000,
 
-  		"convertId": 1,
 
-		"convertDfbi": 100,
 
-		"convertIsMailing": 2,
 
-		"convertIsPay": 1,
 
-		"convertPrice": 0
 
-  		}
 
-  	},
 
-  	"resultCode": "200"
 
-}
 
-						$(".bn-box").html('<img src="'+dt.data.integralProduct.integralProductImg+'" />');
 
-						$("#integralProductName").text(dt.data.integralProduct.integralProductName);
 
-						$(".integralProductDesc").text(dt.data.integralProduct.integralProductDesc);
 
-						$("#convertDfbi").text(dt.data.integralProduct.convertDfbi+"朵粉币");
 
-						$("#btn-cash").attr("name",dt.data.integralProduct.integralProductId);
 
+						mui.alert("获取数据失败！网络错误");	
 					}
 
-				});
 
-		$(document).on('tap', '#btn-cash', function() {
 
+				});	
+		$(".loading").hide().css("opacity", "0");//隐藏（正在加载...）
 
+	});	
+	$(document).on('tap', '#btn-cash', function() {
 
 			var th=$(this);
 
-			console.log(th.attr("name"))
 
 			if(th.attr("name")!="undefined"){
 
 				$.ajax(base_path + '/wechat/integral_order/add_order?dates=' + new Date().getTime(), {
 
 							data: {"integralProductId":integralProductId},
 
@@ -155,17 +120,11 @@
 
 							},
 
 							error: function(xhr, type, errorThrown) {
 
 								console.log(xhr);
 
-								//mui.alert("获取数据失败！网络错误");
 
-								var dt={"status": true,"message": "SUCCESS","data": "兑换成功","resultCode": "200"}
 
-								mui.alert("兑换成功！",function(){
 
-									location.href="cash-coupon-log.html";
 
-								});
 
+								mui.alert("获取数据失败！网络错误");
 
 							}
 
 						});
 
 				
 			}
 
-		});		
-		$(".loading").hide().css("opacity", "0");//隐藏（正在加载...）
 
 	});	
 	</script>
 
 	</body>

File diff suppressed because it is too large
+ 15 - 5
tooth/clearing.html


+ 3 - 3
tooth/css/main.css
View File 

@@ -50,9 +50,9 @@ p{color: #999;}
 
 #index-top-menu .mui-control-item.mui-active{background-color: #fff;color: #333;}

 #index-top-menu .mui-control-item.mui-active:after{content: '';position: absolute;left: 50%;bottom: 4px;width: 30px;margin-left: -15px;height: 1px;background-color: #333;}

 #vip-top-menu{border: 0;width: 80%;display: block;margin: -20px auto 0 auto;box-shadow:0px 1px 3px 1px #ccc;border-radius: 50px;}

-#vip-top-menu .mui-control-item,#vip-top-menu .mui-control-item.mui-active{color: #333;border: 0;position: relative;background-color: #fff;}

-#vip-top-menu .mui-control-item.active{background-color: #fff;color: #333;}

-#vip-top-menu .mui-control-item.active:after{content: '';position: absolute;left: 50%;bottom: 1px;width: 20px;margin-left: -10px;height: 1px;background-color: #333;}

+#vip-top-menu .mui-control-item{color: #333;border: 0;position: relative;background-color: #fff;}

+#vip-top-menu .mui-control-item.mui-active{background-color: #fff;color: #333;}

+#vip-top-menu .mui-control-item.mui-active:after{content: '';position: absolute;left: 50%;bottom: 1px;width: 20px;margin-left: -10px;height: 1px;background-color: #333;}

 #pro-top-menu{border: 0;padding-top: 5px;}

 #pro-top-menu .mui-control-item{color: #333;border: 0;position: relative;}

 #pro-top-menu .mui-control-item.mui-active{background-color: #fff;color: #333;}

+ 13 - 58
tooth/index.html
View File 

@@ -306,6 +306,10 @@
 
 //			var clickdate = JSON.parse(localStorage.getItem('clickdate'));

 			//ready事件

 			mui.ready(function() {

+				if(getParam("nav")==2){

+					$("#index-top-menu>.mui-control-item,#item1").removeClass("mui-active");

+					$("#index-top-menu>.mui-control-item:last-child,#item2").addClass("mui-active");

+				}

 				//banner轮播图

 				var slider = mui("#slider");

 				slider.slider({

@@ -338,7 +342,14 @@
 
 							location.href = dt.redirectURL;

 						} else {

 							if(dt.status) {

-								console.log(dt)

+								//console.log(dt)

+								var table=document.body.querySelector("#grid-view");

+						mui.each(dt.data.integralProductList, function(index) {

+							var li = document.createElement('li');//创建li标签

+							li.className='mui-table-view-cell mui-media mui-col-xs-6';

+							li.innerHTML='<a><img class="mui-media-object" src="'+this.integralProductImg+'"><div class="mui-media-body">'+this.integralProductName+'</div><h6>'+this.integralProductDesc+'</h6><div class="prices">'+this.convertDfbi+'朵粉币</div><div><button type="button" class="mui-btn" name="'+this.integralProductId+'">兑换</button></div></a>';

+							table.appendChild(li);//将li插入table

+						});

 							} else {

 								mui.alert("获取数据失败！");

 							}

@@ -346,63 +357,7 @@
 
 					},

 					error: function(xhr, type, errorThrown) {

 						console.log(xhr);

-						//mui.alert("获取数据失败！网络错误");

-						var dt={

-	"status": true,

-	"message": "SUCCESS",

-	"data": {

-		"integralProductList": [

-			{

-				"integralProductId": 1,

-				"integralProductImg":"images/100-quan.jpg",

-				"integralProductName": "积分商品一",

-				"integralProductDesc": "积分商品一，其他",

-				"integralProductType": 2,

-				"integralProductNum": 1000,

-				"integralProductRemainingNum": 0,

-				"integralProductImagetext": "1111",

-				"integralProductStatus": 1,

-				"integralProductCreateTime": 1525225128000,

-				"integralProductUpdateTime": 1525225204000,

-				"convertId": 1,

-				"convertDfbi": 100,

-				"convertIsMailing": 2,

-				"convertIsPay": 1,

-				"convertPrice": 0

-			},

-			{

-				"integralProductId": 2,

-				"integralProductImg":"images/50-quan.jpg",

-				"integralProductName": "兑换券",

-				"integralProductDesc": "兑换券",

-				"integralProductType": 1,

-				"integralProductNum": 1000,

-				"integralProductRemainingNum": 1,

-				"integralProductImagetext": "1213",

-				"integralProductStatus": 1,

-				"integralProductCreateTime": 1525225200000,

-				"integralProductUpdateTime": 1525607456000,

-				"convertId": 2,

-				"convertDfbi": 100,

-				"convertIsMailing": 2,

-				"convertIsPay": 2,

-				"convertPrice": 0,

-				"couponId": 50000,

-				"couponType": 1,

-				"couponReduce": 10000

-			}

-		],

-		"integral": 240

-		},

-	"resultCode": "200"

-}

-						var table=document.body.querySelector("#grid-view");

-						mui.each(dt.data.integralProductList, function(index) {

-							var li = document.createElement('li');//创建li标签

-							li.className='mui-table-view-cell mui-media mui-col-xs-6';

-							li.innerHTML='<a><img class="mui-media-object" src="'+this.integralProductImg+'"><div class="mui-media-body">'+this.integralProductName+'</div><h6>'+this.integralProductDesc+'</h6><div class="prices">'+this.convertDfbi+'朵粉币</div><div><button type="button" class="mui-btn" name="'+this.integralProductId+'">兑换</button></div></a>';

-							table.appendChild(li);//将li插入table

-						});

+						mui.alert("获取数据失败！网络错误");

 					}

 				});

 				$(document).on('tap', '#grid-view .mui-table-view-cell .mui-btn', function() {

+ 13 - 7
tooth/my-center.html
View File 

@@ -54,7 +54,7 @@
 
 					<div class="user-name" id="userNickname"></div>

 					<!--用户身份-->

 					<div class="userIdentity"></div>

-					<h6 class="mui-h6" style="padding: 5px 0;">需300积分可升级</h6>

+					<h6 id="distanceNextLevelIntegral" class="mui-h6" style="padding: 5px 0;"></h6>

 					<!--进度条-->

 					<div id="demo1" class="progressbar-box">

 						<p class="mui-progressbar mui-progressbar-in" data-progress="100"><span></span></p>

@@ -68,7 +68,7 @@
 
 			<div class="jifen-box">

 				<div id="jifen-menu-nav" class="mui-segmented-control">

 					<a class="mui-control-item mui-active" status="1">朵粉币

-						<div>0</div>

+						<div id="userSurplusIntegral">0</div>

 					</a>

 					<a class="mui-control-item" status="3">待入账

 						<div>0</div>

@@ -137,7 +137,7 @@
 
 							<span class="iconfont icon-jifen"></span>积分商城

 						</div>

 						<div class="mui-table-cell mui-col-xs-5 mui-text-right">

-							<i>敬请期待</i> <span class="mui-icon mui-icon-arrowright"></span>

+							<!--<i>敬请期待</i>--> <span class="mui-icon mui-icon-arrowright"></span>

 						</div>

 					</div>

 				</li>

@@ -196,7 +196,7 @@
 
 							location.href = dt.redirectURL;

 						} else {

 							if(dt.status) {//判断接口返回状态status

-								

+								//console.log(dt)

 								if(dt.data.memberInfo){//判断用户信息是否为空

 									$(".mui-backdrop").remove(); //移除遮罩层

 									var user = document.body.querySelector('.user-head');//头像容器

@@ -224,7 +224,13 @@
 
 											s.innerHTML ='<span class="mui-badge my-badge-danger">'+dt.data.notSendCount+'</span>';

 											daifahuo.appendChild(s);//插入代发货数量

 										}

-									

+									if(typeof(dt.data.distanceNextLevelIntegral)!="undefined"){

+										if(dt.data.distanceNextLevelIntegral>0){

+											$("#distanceNextLevelIntegral").text('需'+dt.data.distanceNextLevelIntegral+'积分可升级');

+										}else{

+											$("#distanceNextLevelIntegral").hide();

+										}	

+									}

 									userIdentity=dt.data.memberInfo.userIdentity;

 									

 									if(userIdentity==1){//判断用户身份是否为会员

@@ -236,7 +242,7 @@
 
 											var obj = {

 												userName: dt.data.memberInfo.userName,

 												sex: dt.data.memberInfo.userSex,

-												age: dt.data.memberInfo.userAgeStage,

+												userBirthDate: dt.data.memberInfo.userBirthDate,

 												tel: dt.data.memberInfo.userTel

 											};

 											//json格式化插入    

@@ -404,7 +410,7 @@
 
 			});

 			/*积分商城跳转*/

 			$(document).on('tap', '#jifen-shopping', function() {

-				mui.alert("敬请期待！");

+				location.href = 'index.html?nav=2';

 			});

 			$(document).on('tap', '#receive-charger', function() {

 				location.href = 'receive-charger.html';

+ 56 - 54
tooth/my-vip-message.html
View File 

@@ -10,6 +10,7 @@
 
 		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/mui.picker.css" />

 		<link rel="stylesheet" type="text/css" href="css/mui.poppicker.css" />

+		<link rel="stylesheet" type="text/css" href="css/mui.picker.min.css" />

 		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />

 		<link rel="stylesheet" type="text/css" href="css/main.css" />

 		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>

@@ -34,7 +35,7 @@
 
 					<a class="mui-navigate-right" id="btn-sex">性别 <i class="mui-pull-right update">请选择</i></a>

 				</li>

 				<li class="mui-table-view-cell">

-					<a class="mui-navigate-right" id="btn-age">年龄 <i class="mui-pull-right update">请选择</i></a>

+					<a class="mui-navigate-right" id="btn-age">生日 <i class="mui-pull-right update">请选择日期</i></a>

 				</li>

 				<li>

 					<div class="mui-input-row">

@@ -43,12 +44,15 @@
 
 					</div>

 				</li>

 			</ul>

-			<div class="mui-content-padded">

-				<p class="mui-h6">

+			<div class="mui-content-padded mui-text-center">

+				<br />

+				<a href="vip-explain.html" class="cl-red" style="text-decoration: underline;">会员说明</a>

+				<!--<p class="mui-h6">

 					<span class="iconfont icon-shuoming" style="color: #333;font-size: 16px;margin-right: 5px;"></span>会员说明：生日当天赠送积分、各种特权享不停。

-				</p>

+				</p>-->

 			</div>

 			<div class="mui-text-center mui-content-padded">

+				<br />

 				<button type="button" class="my-btn-block" id="my-btn-submit" style="margin: 0 auto;padding: 10px 0;">保存</button>

 			</div>

 		</div>

@@ -59,8 +63,8 @@
 
 		</div>

 		<!-- 加载ing end -->

 		<script type="text/javascript" src="js/mui.min.js"></script>

-		<script type="text/javascript" src="js/mui.picker.js"></script>

-		<script type="text/javascript" src="js/mui.poppicker.js"></script>

+		<script type="text/javascript" src="js/mui.picker.min.js"></script>

+		<!--<script type="text/javascript" src="js/mui.poppicker.js"></script>-->

 		<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>

 		<script type="text/javascript" src="js/main.js"></script>

 		<script type="text/javascript">

@@ -80,28 +84,28 @@
 
 					if(user_data != null) {

 						$("#ipt-name").val(user_data.userName);

 						$("#btn-sex i").text(user_data.sex==1?"男":"女").attr("name",user_data.sex);

-						var age='';

-						switch (user_data.age){

-							case 1:

-							age='80后'

-								break;

-							case 2:

-							age='85后'

-								break;

-							case 3:

-							age='90后'

-								break;

-							case 4:

-							age='95后'

-								break;	

-							case 5:

-							age='00后'

-								break;	

-							default:

-							age='其他'

-								break;

-						}

-						$("#btn-age i").text(age).attr("name",user_data.age);

+//						var age='';

+//						switch (user_data.age){

+//							case 1:

+//							age='80后'

+//								break;

+//							case 2:

+//							age='85后'

+//								break;

+//							case 3:

+//							age='90后'

+//								break;

+//							case 4:

+//							age='95后'

+//								break;	

+//							case 5:

+//							age='00后'

+//								break;	

+//							default:

+//							age='其他'

+//								break;

+//						}

+						$("#btn-age i").text(user_data.userBirthDate).attr("name",user_data.userBirthDate);

 						$("#ipt-tel").val(user_data.tel);

 					}else{

 						mui.alert("sessionStorage异常！",function(){

@@ -127,30 +131,23 @@
 
 					});

 				}, false);

 				//选择年龄

-				var userPicker1 = new mui.PopPicker();

-				userPicker1.setData([{

-					value: '1',

-					text: '80后'

-				}, {

-					value: '2',

-					text: '85后'

-				}, {

-					value: '3',

-					text: '90后'

-				}, {

-					value: '4',

-					text: '95后'

-				}, {

-					value: '5',

-					text: '00后'

-				}, {

-					value: '6',

-					text: '其他'

-				}]);

+				//var userPicker1 = new mui.PopPicker();

+				var date = new Date();

+				var y = date.getFullYear();

+				var m = date.getMonth();//获取当前月份的日期

+				var d = date.getDate();

+				var userPicker1 = new mui.DtPicker({

+					type: "date", //设置日历初始视图模式 

+					beginDate: new Date(1930, 00, 01), //设置开始日期 

+					endDate: new Date(2010,00, 01) //设置结束日期 

+				});

 				var showUserPickerButton1 = dc('btn-age');

 				showUserPickerButton1.addEventListener('tap', function(event) {

 					userPicker1.show(function(items) {

-						$("#btn-age i").text(items[0].text).attr("name",items[0].value);

+						//$("#btn-age i").text(items[0].text).attr("name",items[0].value);

+						$("#btn-age i").text(items.text);

+					userPicker1.dispose();

+					userPicker1 = null;	

 						//返回 false 可以阻止选择框的关闭

 						//return false;

 					});

@@ -168,7 +165,7 @@
 
 						if(parameter["userAgeStage"] != null && parameter["userAgeStage"] != "" && typeof(parameter["userAgeStage"])) {

 							parameter["userAgeStage"] =6;

 						}else{

-							parameter["userAgeStage"] = $("#btn-age i").attr("name"); //年龄段

+							parameter["userBirthDate"] = $("#btn-age i").attr("name"); //年龄段

 						}

 						

 						parameter["userTel"] = $("#ipt-tel").val().trim(); //电话

@@ -210,11 +207,14 @@
 
 				var ch_en_num = /^[A-Za-z_\-\u4e00-\u9fa5]{2,10}$/; //简体中文英文(2-10位)

 				var telCode = /^(0?(13|14|15|17|18)[\d]{9}$|(01|02|03|04|05|06|07|08|09)[\d]{7,10}$|(400|800)[0-9]{7}$)/; //手机号,座机(400-800)

 				var name = $("#ipt-name").val().trim(),tel = $("#ipt-tel").val().trim();

+				var full_date = /^\d{4}(\-|\/|.)\d{1,2}\1\d{1,2}$/; //日期格式 (2016\12\12,2016-12-12,2016.12.12)

+				

 				if(ch_en_num.test(name)) {

 					if($("#btn-sex i").text() != '请选择') {

 						//选择性别通过

-						if($("#btn-age i").text() != '请选择') {

-							//选择年龄通过

+						if($("#btn-age i").text() != '请选择日期') {

+							if(full_date.test($("#btn-age i").text())) {

+							//选择生日通过

 							if(telCode.test(tel)) {

 								//电话验证通过

 								validate_flag = true;

@@ -226,10 +226,12 @@
 
 									dalog_msg = '请您填写电话号码';

 								}

 								validate_flag = false;

+							}}else{

+								dalog_msg = '您的生日格式不正确';

 							}

 						} else {

-							//选择年龄未通过验证

-							dalog_msg = '请选择您的年龄段';

+							//选择生日未通过验证

+							dalog_msg = '请选择您的生日';

 						}

 					} else {

 						//选择性别未通过验证

+ 49 - 17
tooth/register-vip.html
View File 

@@ -123,7 +123,7 @@
 
 					<div class="mui-table-cell mui-col-xs-3">

 						<div class="mui-input-row mui-radio mui-left">

 							<label class="my-label">天猫</label>

-							<input name="radio2" class="radio2" type="radio" checked="" value="2">

+							<input name="radio2" class="radio2" type="radio" checked="" value="1">

 						</div>

 					</div>

 					<div class="mui-table-cell mui-col-xs-3">

@@ -135,7 +135,7 @@
 
 					<div class="mui-table-cell mui-col-xs-3">

 						<div class="mui-input-row mui-radio mui-left">

 							<label class="my-label">JD</label>

-							<input name="radio2" class="radio2" type="radio" value="1">

+							<input name="radio2" class="radio2" type="radio" value="3">

 						</div>

 					</div>

 				</div>

@@ -146,19 +146,19 @@
 
 					<div class="mui-table-cell mui-col-xs-3">

 						<div class="mui-input-row mui-radio mui-left">

 							<label class="my-label">一条</label>

-							<input name="radio2" class="radio2" type="radio" value="5">

+							<input name="radio2" class="radio2" type="radio" value="6">

 						</div>

 					</div>

 					<div class="mui-table-cell mui-col-xs-3">

 						<div class="mui-input-row mui-radio mui-left">

 							<label class="my-label">小红书</label>

-							<input name="radio2" class="radio2" type="radio" value="6">

+							<input name="radio2" class="radio2" type="radio" value="7">

 						</div>

 					</div>

 					<div class="mui-table-cell mui-col-xs-3">

 						<div class="mui-input-row mui-radio mui-left">

 							<label class="my-label">其他</label>

-							<input name="radio2" class="radio2" type="radio" value="3">

+							<input name="radio2" class="radio2" type="radio" value="5">

 						</div>

 					</div>

 				</div>

@@ -372,7 +372,7 @@
 
 									} else {

 										mui.alert("查询失败！");

 									}

-								}

+								}}

 							},

 							error: function(xhr, type, errorThrown) {

 								console.log(xhr);

@@ -386,9 +386,11 @@
 
 				validate();//验证文本框

 				var userName = $("#ipt-name").val();

 				var userSex = $('input[name="radio0"]:checked ').val();

-				var userAgeStage = $('input[name="radio1"]:checked ').val();

-				var apparatusStore = $('input[name="radio2"]:checked ').val();

+				var userBirthDate = $('#newDate').val();

+				var apparatusStore = $('input[name="radio2"]:checked').val();

 				var buyDate = $("#buyDate").val();

+				var tel = $("#ipt-phone").val();

+				var code=$("#code").val();

 				var selectDate = new Date(Date.parse(buyDate));

 				var nowDate = new Date(Date.parse(new Date().toLocaleDateString()));

 				//if(selectDate>nowDate){

@@ -402,8 +404,10 @@
 
 								"barCode":qrCode,//条码

 								"userName":userName,//用户姓名

 								"userSex":userSex,//用户姓名

-								"userAgeStage":userAgeStage,//年龄阶段1:80后 2:85后 3:90后 4:95后 5:00后 6:其他

-								"apparatusStore":apparatusStore,//渠道id 1：天猫2：淘宝3：京东4：微信

+								"userTel":tel,//手机

+								"code":code,//验证码

+								"userBirthDate":userBirthDate,//出生日期

+								"apparatusStore":apparatusStore,//渠道id 1:天猫 2:淘宝 3:京东 4:微信 5:其他 6:一条 7:小红书

 								"buyDate":buyDate//购买日期

 							},

 							dataType: 'json',

@@ -456,11 +460,43 @@
 
 			var dalog_msg='',validate_flag=false;

 			function validate() {

 				var ch_en_num = /^[A-Za-z_\-\u4e00-\u9fa5]{2,10}$/; //简体中文英文(2-10位)

+				var positive_int = /^[0-9]\d*$/; //正整数0-9

+				var code_int = /^[0-9]{4}$/; //正整数0-9,4位数字

+				var mobile = /^(13|14|15|17|18)[0-9]{9}$/; //手机号码

 				var full_date = /^\d{4}(\-|\/|.)\d{1,2}\1\d{1,2}$/; //日期格式 (2016\12\12,2016-12-12,2016.12.12)

-				var name = $("#ipt-name").val().trim();

+				var name = $("#ipt-name").val().trim(),tel=$("#ipt-phone").val(),code=$("#code").val();

 				if(ch_en_num.test(name)) {

 					//验证通过

-					validate_flag=true;

+					if($("#newDate").val() == null || $("#newDate").val() == "") {

+						validate_flag=false;

+						dalog_msg='请选择出生日期';

+					}else{

+						if(mobile.test(tel)) {

+							console.log(code_int.test(code))

+							if(code_int.test(code)) {

+								if($("#buyDate").val() == null || $("#buyDate").val() == ""){

+									dalog_msg='请选择购买日期';

+									validate_flag=false;

+								}else{

+									validate_flag=true;

+								}

+							}else{

+								if(code != '') {

+									dalog_msg='验证码格式不正确';

+								}else{

+									dalog_msg='请填写验证码';

+								}

+								validate_flag=false;

+							}

+						}else{

+							validate_flag=false;

+							if(tel != '') {

+								dalog_msg='手机格式不正确';

+							}else{

+								dalog_msg='请填写手机号码';

+							}

+						}

+					}

 				} else {

 					//未通过验证

 					if(name != '') {

@@ -469,11 +505,7 @@
 
 						dalog_msg='请填写名字';

 					}

 					validate_flag=false;

-				}

-				if($("#buyDate").val() == null || $("#buyDate").val() == ""){

-					dalog_msg='请选择购买日期';

-					validate_flag=false;

-				}

+				}				

 				return dalog_msg;//返回提示信息

 			}

 		</script>

+ 1 - 1
tooth/shopping-cart.html
View File 

@@ -78,7 +78,7 @@
 
 		<script src="js/mui.min.js"></script>

 		<script src="js/jquery-2.1.1.min.js"></script>

 		<script src="js/main.js"></script>

-		<script src="js/wechat-utils-1.0.js"></script>

+		<!--<script src="js/wechat-utils-1.0.js"></script>-->

 		<script>

 			window.addEventListener('pageshow', function(e) {

 				// 通过persisted属性判断是否存在 BF Cache

+ 124 - 13
tooth/vip-explain.html
View File 

@@ -20,44 +20,155 @@
 
 			</div>
 
 			<div id="vip-top-menu" class="mui-segmented-control">
 
 					<!--(默认选中哪个就加上active)，其他不加-->
 
-					<a class="mui-control-item active" href="#item1">花朵</a>
 
+					<a class="mui-control-item mui-active" href="#item1">花朵</a>
 
 					<a class="mui-control-item" href="#item2">霞朵</a>
 
 					<a class="mui-control-item" href="#item3">云朵</a>
 
-					<a class="mui-control-item" href="#item3">云朵</a>
 
+					<a class="mui-control-item" href="#item4">上朵</a>
 
 			</div>
 
+			<!--选项卡item1显示区域-->
 
+			<div id="item1" class="mui-control-content mui-active">
 
+			<ul class="mui-table-view mui-grid-view mui-grid-9" id="vip-grid-9">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-quan"></span>
 
+		                    <span class="quan-number">99</span>
 
+		                    <div class="mui-media-body">所需积分</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-huan"></span>
 
+		                    <div class="mui-media-body">会员兑换</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-liwu"></span>
 
+		                    <div class="mui-media-body">生日礼物</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-zhuanjia"></span>
 
+		                    <div class="mui-media-body">口腔专家</div></a></li> 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-xiyaquan"></span>
 
+		                    <div class="mui-media-body">超值洗牙券</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-tiyan"></span>
 
+		                    <div class="mui-media-body">新品免费体验</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-viptongdao"></span>
 
+		                    <div class="mui-media-body">vip处理通道</div></a></li>       
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-tiqian"></span>
 
+		                    <div class="mui-media-body">限量提前购</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-kezi"></span>
 
+		                    <div class="mui-media-body">免费刻字</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-dingzhi"></span>
 
+		                    <div class="mui-media-body">免费定制</div></a></li>         
+		        </ul>
 
+		        </div>
 
+		        <!--选项卡item2显示区域-->
 
+			<div id="item2" class="mui-control-content">
 
 			<ul class="mui-table-view mui-grid-view mui-grid-9" id="vip-grid-9">
 
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-quan"></span>
 
-		                    <span class="quan-number">9999</span>
 
+		                    <span class="quan-number">199</span>
 
 		                    <div class="mui-media-body">所需积分</div></a></li>
 
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-huan"></span>
 
 		                    <div class="mui-media-body">会员兑换</div></a></li>
 
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-liwu"></span>
 
 		                    <div class="mui-media-body">生日礼物</div></a></li>
 
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-zhuanjia"></span>
 
 		                    <div class="mui-media-body">口腔专家</div></a></li> 
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-xiyaquan"></span>
 
 		                    <div class="mui-media-body">超值洗牙券</div></a></li>  
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-tiyan"></span>
 
 		                    <div class="mui-media-body">新品免费体验</div></a></li>    
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
 		                    <span class="iconfont icon-viptongdao"></span>
 
 		                    <div class="mui-media-body">vip处理通道</div></a></li>       
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
 		                    <span class="iconfont icon-tiqian"></span>
 
 		                    <div class="mui-media-body">限量提前购</div></a></li>    
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
 		                    <span class="iconfont icon-kezi"></span>
 
 		                    <div class="mui-media-body">免费刻字</div></a></li>  
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a href="#">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
 		                    <span class="iconfont icon-dingzhi"></span>
 
 		                    <div class="mui-media-body">免费定制</div></a></li>         
 		        </ul>
 
+		        </div>
 
+		        <!--选项卡item3显示区域-->
 
+			<div id="item3" class="mui-control-content">
 
+			<ul class="mui-table-view mui-grid-view mui-grid-9" id="vip-grid-9">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-quan"></span>
 
+		                    <span class="quan-number">299</span>
 
+		                    <div class="mui-media-body">所需积分</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-huan"></span>
 
+		                    <div class="mui-media-body">会员兑换</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-liwu"></span>
 
+		                    <div class="mui-media-body">生日礼物</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-zhuanjia"></span>
 
+		                    <div class="mui-media-body">口腔专家</div></a></li> 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-xiyaquan"></span>
 
+		                    <div class="mui-media-body">超值洗牙券</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-tiyan"></span>
 
+		                    <div class="mui-media-body">新品免费体验</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-viptongdao"></span>
 
+		                    <div class="mui-media-body">vip处理通道</div></a></li>       
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-tiqian"></span>
 
+		                    <div class="mui-media-body">限量提前购</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-kezi"></span>
 
+		                    <div class="mui-media-body">免费刻字</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3 active"><a>
 
+		                    <span class="iconfont icon-dingzhi"></span>
 
+		                    <div class="mui-media-body">免费定制</div></a></li>         
+		        </ul>
 
+		        </div>
 
+		        <!--选项卡item4显示区域-->
 
+			<div id="item4" class="mui-control-content">
 
+			<ul class="mui-table-view mui-grid-view mui-grid-9" id="vip-grid-9">
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-quan"></span>
 
+		                    <span class="quan-number">499</span>
 
+		                    <div class="mui-media-body">所需积分</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-huan"></span>
 
+		                    <div class="mui-media-body">会员兑换</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-liwu"></span>
 
+		                    <div class="mui-media-body">生日礼物</div></a></li>
 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-zhuanjia"></span>
 
+		                    <div class="mui-media-body">口腔专家</div></a></li> 
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-xiyaquan"></span>
 
+		                    <div class="mui-media-body">超值洗牙券</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-tiyan"></span>
 
+		                    <div class="mui-media-body">新品免费体验</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-viptongdao"></span>
 
+		                    <div class="mui-media-body">vip处理通道</div></a></li>       
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-tiqian"></span>
 
+		                    <div class="mui-media-body">限量提前购</div></a></li>    
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-kezi"></span>
 
+		                    <div class="mui-media-body">免费刻字</div></a></li>  
+		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
 
+		                    <span class="iconfont icon-dingzhi"></span>
 
+		                    <div class="mui-media-body">免费定制</div></a></li>         
+		        </ul>
 
+		        </div>
 
 		        <div class="mui-content-padded">
 
 		        	<h4 class="mui-text-center">文字说明</h4>
 
 		        	<div class="explain">