Browse Source

watero微商城会员积分页面修改
1:会员中心页面
2:积分页面
3:优惠券页面
4:结算页面

wangxiaoming 5 years ago
parent
commit
e2b01009ba

File diff suppressed because it is too large
+ 826 - 843
watero/clearing.html


File diff suppressed because it is too large
+ 903 - 0
watero/clearing_备份.html


File diff suppressed because it is too large
+ 488 - 241
watero/coupon_bag.html


+ 496 - 0
watero/coupon_bag1.html

@@ -0,0 +1,496 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>我的券包</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<link rel="stylesheet" type="text/css" href="css/mui.min.css?v=2018111001" />
+		<link rel="stylesheet" type="text/css" href="css/iconfont.css?v=2018111001" />
+		<link rel="stylesheet" type="text/css" href="css/style.css?v=2018111001" />
+		<style>
+			.my-yhq-list {
+				background-color: transparent;
+				padding: 0 15px;
+			}
+			
+			.my-yhq-list:before,
+			.my-yhq-list:after {
+				display: none;
+			}
+			
+			.my-yhq-list .my-yhq-cell {
+				margin: 13px 0;
+				position: relative;
+			}
+			
+			.my-yhq-list .my-yhq-cell:last-child {
+				margin-bottom: 0;
+			}
+			
+			.my-yhq-list .fixed-box {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+			}
+			
+			.my-yhq-list .table {
+				display: table;
+				height: 100%;
+				width: 100%;
+			}
+			
+			.my-yhq-list .left-cell {
+				display: table-cell;
+				width: 69%;
+				height: 100%;
+				padding: 15px 10px;
+			}
+			
+			.my-yhq-list .right-cell {
+				display: table-cell;
+				width: 28%;
+				height: 100%;
+				text-align: right;
+				padding-right: 14px;
+				vertical-align: middle;
+			}
+			
+			.my-yhq-list .left-cell .tit {
+				font-size: 15px;
+			}
+			
+			.my-yhq-list .left-cell .time {
+				font-size: 12px;
+				margin-bottom: 0;
+				margin-top: 10px;
+				color: #999;
+			}
+			
+			.my-yhq-list .left-cell .condition {
+				position: absolute;
+				left: 10px;
+				bottom: 15px;
+				font-size: 12px;
+				color: #999;
+			}
+			
+			.my-yhq-list .right-cell .money {
+				color: #fff;
+				margin: 5px 0;
+			}
+			
+			.my-yhq-list .right-cell .money>span {
+				font-size: 20px;
+				color: #63ccde;
+			}
+			
+			.my-yhq-list .right-cell .my-btn {
+				color: #fff;
+				padding: 8px 10px;
+				font-size: 14px;
+				border-radius: 5px;
+			}
+			
+			.my-yhq-list .right-cell .my-btn:active {
+				background-color: rgba(0, 0, 0, .5);
+			}
+			
+			.grayscale {
+				color: #807f80 !important;
+			}
+			
+			.my-yhq-list .right-cell .my-btn.grayscale {
+				opacity: 0;
+			}
+			
+			.mui-table-view-chevron .mui-table-view-cell {
+				padding-right: 15px;
+			}
+			
+			.mui-segmented-control .mui-control-item {
+				line-height: 1;
+				height: 50px;
+				vertical-align: bottom;
+				border: 0;
+				border-bottom: 0;
+				color: #444;
+				background-color: transparent !important;
+				padding-bottom: 3px;
+			}
+			
+			.mui-segmented-control .mui-control-item.mui-active {
+				background-color: transparent !important;
+				border-bottom: 0;
+			}
+			
+			.mui-segmented-control .mui-control-item.mui-active:after {
+				content: '';
+				width: 70px;
+				height: 2px;
+				background: #63CCDE;
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				margin-left: -35px;
+			}
+			
+			.tab-yhq-list .mui-control-item.mui-active {
+				color: #1cc9f4 !important;
+				border-bottom: 0;
+			}
+			
+			.tab-yhq-list {
+				background: #fff;
+				border: 0;
+				border-bottom: 1px solid rgba(0, 0, 0, .1);
+				position: fixed;
+				left: 0;
+				top: 0;
+				width: 100%;
+				z-index: 10;
+			}
+			
+			.tab-yhq-list .mui-control-item {
+				position: relative;
+			}
+			
+			.mui-control-item.mui-active .mui-tab-label {
+				color: #1cc9f4;
+			}
+			
+			.tab-yhq-list .mui-control-item {
+				color: #a1a1a1;
+			}
+			
+			.mui-control-content {
+				margin-top: 70px;
+			}
+			
+			.icon-all>span:first-child {
+				min-width: 28px;
+				min-height: 25px;
+				background-size: 100%;
+				position: absolute;
+				top: 16px;
+				left: 50%;
+				-webkit-transform: translateX(-50%);
+				transform: translateX(-50%);
+			}
+			
+			.icon-all.mui-active>span:first-child {}
+			
+			.icon-noused>span:first-child {
+				min-width: 25px;
+				min-height: 25px;
+				background-size: 100%;
+				position: absolute;
+				top: 16px;
+				left: 50%;
+				-webkit-transform: translateX(-50%);
+				transform: translateX(-50%);
+			}
+			
+			.icon-noused.mui-active>span:first-child {}
+			
+			.icon-used>span:first-child {
+				min-width: 25px;
+				min-height: 25px;
+				background-size: 100%;
+				position: absolute;
+				top: 16px;
+				left: 50%;
+				-webkit-transform: translateX(-50%);
+				transform: translateX(-50%);
+			}
+			
+			.icon-used.mui-active>span:first-child {}
+			
+			.icon-overdue>span:first-child {
+				min-width: 25px;
+				min-height: 25px;
+				background-size: 100%;
+				position: absolute;
+				top: 16px;
+				left: 50%;
+				-webkit-transform: translateX(-50%);
+				transform: translateX(-50%);
+			}
+			
+			.icon-overdue.mui-active>span:first-child {}
+			
+			.mui-scroll-wrapper {
+				padding-top: 10px;
+				bottom: 100px;
+			}
+			
+			.middle-center {
+				display: table-cell;
+				text-align: center;
+				vertical-align: middle;
+				color: #fff;
+			}
+			
+			.right-bottom {
+				position: absolute;
+				right: 15px;
+				bottom: 15px;
+				color: #fff;
+			}
+			
+			.coupon-href {
+				text-align: center;
+				width: 120px;
+				margin: 0 auto;
+				position: fixed;
+				bottom: 80px;
+				left: 50%;
+				margin-left: -60px;
+				text-decoration: underline;
+				font-size: 12px;
+				color: #666;
+			}
+			
+			.see-details {
+				color: #63ccde;
+				margin-left: 20px;
+			}
+		</style>
+		<script type="text/javascript">
+			// 屏蔽分享
+			window.hiddenAllWechatMenu = true;
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<nav class="mui-bar mui-bar-tab" id="footer-bar">
+			<a class="mui-tab-item">
+				<div class="iconfont icon-shouye"></div>
+				<span class="mui-tab-label">首页</span>
+			</a>
+			<a class="mui-tab-item">
+				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+				<span class="mui-tab-label">购物车</span>
+			</a>
+			<a class="mui-tab-item">
+				<div class="iconfont icon-dingdan"></div>
+				<span class="mui-tab-label">订单</span>
+			</a>
+			<a class="mui-tab-item mui-active">
+				<div class="iconfont icon-wode"></div>
+				<span class="mui-tab-label">我的</span>
+			</a>
+		</nav>
+		<div class="mui-content">
+			<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper" style="background: #fff;">
+				
+				<div class="mui-scroll">
+					<ul class="my-yhq-list">
+						
+						<!-- <li class="my-yhq-cell">
+							<img width="100%" src="images/yhq_used_bg.png" />
+							<div class="fixed-box">
+								<div class="table go_web_link" url="#">
+									<div class="left-cell">
+										<span class="tit">滤芯兑换券</span>
+										<p class="time">与其他产品下单时方可可用</p>
+										<span class="condition">有效期至2019-11-24</span>
+									</div>
+									<div class="right-cell">
+										<div class="money">
+											<span>T1/T2</span>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li class="my-yhq-cell">
+							<img width="100%" src="images/yhq_noused_bg.png" />
+							<div class="fixed-box">
+								<div class="table go_web_link" url="#">
+									<div class="left-cell">
+										<span class="tit">优惠券</span>
+										<p class="time">满500元可使用</p>
+										<span class="condition">有效期至2019-11-24</span>
+									</div>
+									<div class="right-cell">
+										<div class="money">
+											<span>¥500</span>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li class="my-yhq-cell">
+							<img width="100%" src="images/yhq_used_bg.png" />
+							<div class="fixed-box">
+								<div class="table go_web_link" url="#">
+									<div class="left-cell">
+										<span class="tit">用户关注券</span>
+										<p class="time">仅部分产品可用<u class="see-details">查看详情</u></p>
+										<span class="condition">有效期至2019-11-24</span>
+									</div>
+									<div class="right-cell">
+										<div class="money">
+											<span>¥500</span>
+										</div>
+									</div>
+								</div>
+							</div>
+						</li> -->
+						
+					</ul>
+				</div>
+			</div>
+		</div>
+		<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>
+			var tabindex = 0,
+				pageNumber = 0,
+				pagesize = 10;
+			mui.init({
+				pullRefresh: {
+					container: '#pullrefresh_yhq_list',
+					down: {
+						//callback: pulldownRefresh
+					},
+					up: {
+						contentrefresh: '正在加载...',
+						contentnomore: '没有更多数据了!',
+						callback: pullupRefresh
+					}
+				}
+			});
+			/**
+			 * 上拉加载具体业务实现
+			 */
+			function pullupRefresh() {
+				++pageNumber;
+				var btnArray = ['否', '是'];
+				var src = '';
+				if(tabindex == 1) {
+					src = base_path + '/coupon/couponItemList?useStatus=1';
+				} else {
+					src = base_path + '/coupon/couponItemList?useStatus=2';
+				}
+				$.ajax(src, {
+					data: {},
+					dataType: 'json',
+					type: 'post',
+					timeout: 15000,
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					success: function(dt) {
+						if(dt.isRedirect) {
+							location.href = dt.redirectURL;
+						} else {
+							if(dt.status) {
+								var table = document.body.querySelector('.my-yhq-list');
+								
+								if(pageNumber == 1 && tabindex == 2){
+									var li = document.createElement('li');
+									li.className = 'my-yhq-cell';
+									li.innerHTML = '<img width="100%" src="images/yhq_used_bg.png" />'+
+										'<div class="fixed-box">'+
+										'	<div class="table go_web_link" url="#">'+
+										'		<div class="left-cell">'+
+										'		<span class="tit">滤芯套装优惠</span>'+
+										'		<p class="time">会员购买滤芯套装优惠100元</p>'+
+										'		<span class="condition"></span>'+
+										'	</div>'+
+										'	<div class="right-cell">'+
+										'		<div class="money">'+
+										'			<span></span>'+
+										'		</div>'+
+										'	</div>'+
+										'</div>';
+									table.appendChild(li);
+								}
+								
+								
+								mui(dt.data.itemList).each(function(index) {
+									var li = document.createElement('li');
+									var re_moeny = '';
+									if(this.couponType == 1){
+										re_moeny = accDiv(this.couponReduce, 100)+'元'
+									}else if(this.couponType == 2){
+										re_moeny =  "-" + (100 - this.couponReduce) + "%"
+									}else if(this.couponType == 3){
+										re_moeny =  "T1/T2"
+									}
+									
+									li.className = 'my-yhq-cell';
+									li.innerHTML = '<img width="100%" src="images/yhq_used_bg.png" />'+
+										'<div class="fixed-box">'+
+										'	<div class="table go_web_link" url="#">'+
+										'		<div class="left-cell">'+
+										'		<span class="tit">'+ this.couponName +'</span>'+
+										'		<p class="time">'+ cufte(this.couponItemRemark) +'</p>'+
+										'		<span class="condition">有效期至'+ this.couponUseEndDate +'</span>'+
+										'	</div>'+
+										'	<div class="right-cell">'+
+										'		<div class="money">'+
+										'			<span>'+ re_moeny +'</span>'+
+										'		</div>'+
+										'	</div>'+
+										'</div>';
+									table.appendChild(li);
+								})
+								
+								if(pageNumber == 1 && tabindex == 1 && dt.data.itemList.length == 0 ){
+									mui('#pullrefresh_yhq_list').pullRefresh().disablePullupToRefresh();
+									var li = document.createElement('li');
+									li.className = 'my-yhq-cell';
+									li.innerHTML = '<img style="width:100px;display:block;margin:60px auto 20px auto;" src="images/null-3.png" /><h6 class="mui-text-center">暂无任何优惠券哟!</h6>';
+									table.appendChild(li);
+								}
+								
+								mui('#pullrefresh_yhq_list').pullRefresh().disablePullupToRefresh();
+							} else {
+								mui.confirm(dt.message + '是否重新加载页面?', '提示', btnArray, function(e) {
+									if(e.index == 1) {}
+								})
+							}
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						console.log(xhr)
+					}
+				})
+			}
+			mui.ready(function() {
+				tabindex = getParam("type");
+				
+				if(tabindex == 2){
+					document.title = '会员专享';
+				}
+				
+				mui('#pullrefresh_yhq_list').pullRefresh().pullupLoading();
+				console.log("页面加载完毕")
+				document.querySelector('.loading-bg').style.display = 'none';
+			});
+			$(document).on('tap', '.coupon-href', function() {
+				location.href = 'coupon_dec.html';
+			});
+			$(document).on('tap', '.go_web_link', function() {
+				location.href = $(this).attr("url");
+			});
+		</script>
+	</body>
+
+</html>

+ 51 - 15
watero/css/iconfont.css

@@ -1,5 +1,5 @@
 @font-face {font-family: "iconfont";
-  src: url('../fonts/iconfont.ttf?t=1564364262479') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  src: url('../fonts/iconfont.ttf?t=1574569959287') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 }
 
 .iconfont {
@@ -78,14 +78,6 @@
   content: "\e602";
 }
 
-.icon-daifahuo:before {
-  content: "\e603";
-}
-
-.icon-daifukuan:before {
-  content: "\e604";
-}
-
 .icon-jfshop:before {
   content: "\e607";
 }
@@ -126,10 +118,6 @@
   content: "\e611";
 }
 
-.icon-yifahuo:before {
-  content: "\e612";
-}
-
 .icon-lipin:before {
   content: "\e71d";
 }
@@ -554,7 +542,7 @@
   content: "\e714";
 }
 
-.icon-dingdan:before {
+.icon-dingdan1:before {
   content: "\e715";
 }
 
@@ -564,4 +552,52 @@
 
 .icon-naozhong:before {
   content: "\e712";
-}
+}
+
+.icon-daifukuan:before {
+  content: "\e723";
+}
+
+.icon-zhucewancheng:before {
+  content: "\e724";
+}
+
+.icon-w-xuanzegou:before {
+  content: "\e725";
+}
+
+.icon-w-huiyuanjifengouwuche:before {
+  content: "\e726";
+}
+
+.icon-dingdan:before {
+  content: "\e727";
+}
+
+.icon-w-shoujihao:before {
+  content: "\e729";
+}
+
+.icon-w-shengri:before {
+  content: "\e72a";
+}
+
+.icon-w-xingbie:before {
+  content: "\e72e";
+}
+
+.icon-w-xingming:before {
+  content: "\e72f";
+}
+
+.icon-w-yanzhengma:before {
+  content: "\e730";
+}
+
+.icon-daifahuo:before {
+  content: "\e731";
+}
+
+.icon-yifahuo:before {
+  content: "\e732";
+}

+ 9 - 9
watero/css/style.css

@@ -36,9 +36,9 @@ ul{list-style: none;padding: 0;margin: 0;}
 .my-content-padded img{width: 100%;border-radius: 5px;}
 .iconfont .mui-badge {font-size: 10px;line-height: 1.3;position: absolute;top:0;left: 60%;padding: 1px 5px;color: #fff;background:#55c0dc;}
 .mui-bar-tab~.mui-content{padding-bottom: 50px !important;}
-#footer-bar{background-color: #fff;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.45);box-shadow: 0 0 1px rgba(0,0,0,0.45)}
+#footer-bar{background-color: #fff;-webkit-box-shadow: rgba(0,0,0,.1) 0px 0px 2px;box-shadow: rgba(0,0,0,.1) 0px 0px 2px;}
 #footer-bar .mui-tab-label{font-size: 12px;}
-#footer-bar .mui-tab-item{vertical-align: bottom;color:#d5d5d5;position: relative;}
+#footer-bar .mui-tab-item{vertical-align: bottom;color:#999;position: relative;}
 #footer-bar .mui-tab-item.mui-active{color: #55c0dc;}
 #footer-bar .mui-tab-item .iconfont{font-size: 24px;}
 .loading-bg{width: 100%;min-width:100%;height: 100%;min-height:100%; background-color:#F0F0F0;position: fixed;left: 0;top: 0;z-index: 999;}
@@ -344,16 +344,16 @@ article, section, time, aside {display: block;}
 .mui-pull-bottom-pocket .mui-pull-caption{font-size: 12px;}
 #pullrefresh_order_list .mui-table-view:before{left: 15px;right: 15px;}
 
-.address-cantainner{margin:14px 14px 0 14px;background-color: #f3f3f3;text-align: center;}
-.address-cantainner .mui-table-view-cell{background-color: #f3f3f3;border-radius: 5px;padding: 11px 8px;}
-.address-cantainner .mui-table-view-cell.mui-active{background-color: #f3f3f3;}
+.address-cantainner{margin:0;background-color: #fff;text-align: center;border-bottom: 8px solid #f2f2f2;}
+.address-cantainner .mui-table-view-cell{background-color: #fff;border-radius: 5px;padding: 11px 8px;}
+.address-cantainner .mui-table-view-cell.mui-active{background-color: #fff;}
 .address-cantainner .mui-table{max-height: 80px;min-height: 42px;}
-.address-cantainner .add-address{height: 20px;position: relative;width: 150px; margin: 0 auto;}
+.address-cantainner .add-address{height: 20px;position: relative;width: 150px; margin: 0;}
 .address-cantainner .icon-jia{position: absolute;left:0%;top: 0;font-size: 20px;}
-.address-cantainner p{font-size: 12px;padding-top: 7px;}
-.icon-dingwei{color: #f16071;}
+.address-cantainner p{font-size: 12px;}
+.icon-dingwei{color: #f16071;margin-left: 5px;}
 .btn-add-address{height: 20px;line-height: 20px; position: relative;width: 110px; margin: 0 auto;text-align: right;color: #666;}
-.btn-add-address .icon-jia{position: absolute;left:12%;top: 0;font-size: 25px;}
+.btn-add-address .icon-jia{position: absolute;left:7px;top: 0;font-size: 25px;}
 .my-grid-view-no:after,.my-grid-view-no:before,.my-grid-view-no .mui-table-view-cell:after{display: none;}
 @media (device-height:480px) and (min-width:320px) and (-webkit-min-device-pixel-ratio:2){
 

+ 188 - 4
watero/css/vip_center.css

@@ -19,7 +19,7 @@
 .my-tab-view3 li {padding: 10px 10px 0 10px;}
 .vip_icon{width: 20px;-webkit-transform: translateY(20%);margin-left: 5px;}
 #userNickname{white-space: nowrap;height: 25px;}
-#footer-bar{-webkit-box-shadow: 0 0 1px rgba(0,0,0,.4);box-shadow: 0 0 1px rgba(0,0,0,.4);}
+#footer-bar{-webkit-box-shadow:rgba(0,0,0,.1) 0px 0px 2px;box-shadow:rgba(0,0,0,.1) 0px 0px 2px;}
 .my-view-order .mui-table-view-cell:after{background-color: #e5e5e5;}
 .my-view-order .mui-media-body {padding-top: 0;}
 .btn-box{bottom:auto;top:12px;}
@@ -28,7 +28,7 @@
 #menu-nav {border: 0;border-radius: 3px;}
 #menu-nav .mui-control-item.mui-active {color: #333;background-color:rgba(0,0,0,.1);}
 #menu-nav .iconfont{color: #55c0dc;padding: 10px 0;}
-#menu-order .mui-control-item {line-height: 1;color: #333;border-color: #fff;border:0;padding: 6px 0 10px 0;font-size: 12px;}
+#menu-order .mui-control-item {line-height: 1;color: #999;border-color: #fff;border:0;padding: 4px 0 16px 0;font-size: 12px;}
 #menu-order {border: 0;border-radius: 3px;}
 #menu-order .iconfont{color: #24cae9;font-size: 26px;padding: 5px 0;}
 #menu-order .mui-control-item.mui-active {color: #333;background-color:rgba(0,0,0,.1);}
@@ -53,6 +53,190 @@
 .center-middle{font-size: 12px;    position: absolute;left: 90px;top: 50%;-webkit-transform: translateY(-50%);transform: translateY(-50%);}
 .see-rights{color:#8f8f94;background: #fff;border-radius: 6px;padding: 3px 10px;float: right;margin-right: 10px;font-size: 13px;}
 .vip-show{background: #dff4fa;border-radius: 25px;font-size: 12px;text-align: center;width: 90%;margin:0 auto;padding: 3px 0;display: none;}
-#center-menu .mui-table-view-cell:after,#center-menu:before,#center-menu:after{left: 10px;right: 10px;}
+#center-menu .mui-table-view-cell:after,#center-menu:before{left: 15px;right: 15px;background: #e5e5e5;}
+#center-menu .mui-table-view-cell:last-child:after,#center-menu:after{display: none;}
 #center-menu .mui-table-view-cell.mui-active{background: #fff;}
-#center-menu .mui-table-view-cell .mui-icon-arrowright:before{color: #999;font-size: 22px;}
+html,body{background: #F2F2F2;}
+.order-box .mui-table-view:after{left: 15px;right: 15px; background: #e5e5e5;}
+.tel{color: #999;}
+.my-center-no .mui-table-view-cell:last-child:after{height: 0;display: none;}
+			.mui-content {
+				background: #f2f2f2;
+			}
+			
+			.center-header {
+				position: relative;
+			}
+			
+			.center-header .wecat-head {
+				width: 100%;
+				text-align: center;
+				color: #fff;
+			}
+			
+			.center-header .bottom-vip {
+				font-size: 12px;
+				background: #232e51;
+				position: absolute;
+				left: 14px;
+				right: 14px;
+				bottom: 0;
+				height: 40px;
+				border-radius: 15px 15px 0 0;
+				color: #ffe1b3;
+				padding: 10px 0;
+			}
+			
+			.center-header .bottom-vip .mui-table-cell:last-child {
+				width: 7.8em;
+			}
+			
+			.center-header .vip-l {
+				margin: 0 7px;
+				vertical-align: middle;
+			}
+			
+			.center-header .vip-icon {
+				display: inline-block;
+				vertical-align: middle;
+				margin-right: 2px;
+				width: 15px;
+			}
+			
+			.center-header .vip-title {
+				vertical-align: middle;
+				padding-left: 14px;
+				font-size: 18px;
+			}
+			
+			.center-header .vip-arrow {
+				display: inline-block;
+				vertical-align: middle;
+				margin-left: 5px;
+				margin-right: 12px;
+				width: 14px;
+				padding-bottom: 1px;
+			}
+			.vip-line{width: 1px;background: #ffe1b3;display: inline-block;height: 12px;vertical-align: middle;margin-bottom: 2px;-webkit-transform: scaleX(.5);margin-left: 10px;}
+			.user-head{
+				    position: absolute;
+    top: 30%;
+    left: 50%;
+        width: 50px;
+    margin: -25px 0 0 -25px;
+    border-radius: 50%;
+    overflow: hidden;
+    line-height: 0;
+    font-size: 0;
+    border: 1px solid rgba(255,255,255,.5);
+			}
+.user-head img{width: 100%;display: block;}
+			
+			.center-header #userNickname {
+				font-size: 14px;
+				position: absolute;
+    top: 48%;
+    left: 0;
+    width: 100%;
+    color: #333;
+			}
+			
+			#menu-nav .mui-control-item {
+				line-height: 1.2;
+				padding: 6px 0 12px 0;
+				color: #666;
+				font-size: 12px;
+			}
+			p{color: #999;font-size: 12px;margin-bottom: 0;}
+			.my-count>.mui-table-cell:after{content: '';position: absolute;width: 1px;height: 20px;background:#e1e1e1;right: 0;top: 50%;margin-top: -10px; -webkit-transform: scaleX(.5);transform: scaleX(.5);}
+			.my-count>.mui-table-cell:last-child:after{display: none;}
+			.center-content{background: #f2f2f2;padding:10px 14px 14px 14px;}
+			.center-content .my-count{padding: 12px 0;background: #fff;border-radius: 6px;margin-bottom: 8px;}
+			.center-content .mui-navigate-right:after{font-size: 20px;color: #999;top: 48%;}
+			
+			.my-center-no .mui-table-view-cell .mui-icon{color: #999;font-size: 18px;}
+			.my-center-no .mui-table-view-cell{color: #666;padding: 10px 15px 8px 15px;}
+			.order-box{padding:0;background: #fff;margin-bottom: 8px;border-radius: 6px;overflow: hidden;}
+			.order-box .mui-badge{background: transparent;color: #bbb;font-size: 12px;}
+			strong{font-size: 16px;}
+			.order-box strong{font-size: 14px;}
+			.my-center-no{border-radius: 6px;overflow: hidden;font-size: 12px;}
+			.dalog {
+				position: fixed;
+				left: 0;
+				top: 0;
+				bottom: 0;
+				right: 0;
+				background: rgba(0, 0, 0, .7);
+				display: none;
+				z-index: 99;
+			}
+			
+			.dalog>div {
+				position: absolute;
+				width: 270px;
+				height: 290px;
+				left: 50%;
+				margin-left: -135px;
+				top: 50%;
+				margin-top: -150px;
+				text-align: center;
+			}
+			
+			.dalog .tp-box {
+				background: #fff;
+				padding: 10px 12px;
+				border-radius: 6px;
+				margin-bottom: 8px;
+			}
+			.dalog ul{
+				padding-top: 12px;
+			}
+			.dalog ol{
+				list-style: none;
+				padding: 0 0 4px 0;
+				width: 185px;
+				display: block;
+				margin: 0 auto;
+				text-align: left;
+			}
+			.dalog ol>li{
+				font-size: 12px;
+				margin:0;
+				white-space: nowrap;
+				color: #666;
+			}
+			.dalog ul>li {
+				margin:0 0 16px 0;
+				color: #727171;
+			}
+			.dalog ul>li:last-child{
+				margin-bottom: 10px;
+			}
+			.dalog ul li p {
+				color: #666;
+			}
+			
+			.dalog .btn-see-integral {
+				border-radius: 25px;
+				background: #243052;
+				color: #fff;
+				padding: 5px 22px;
+				border: 0;
+				font-size: 14px;
+			}
+			
+			.dalog .icon-guanbi {
+				color: #fff;
+				font-size: 26px;
+			}
+			
+			.dalog strong {
+				font-size: 22px;
+				letter-spacing: 4px;
+				color: #243052;
+			}
+			
+			.dalog .icon-A-zhucewancheng {
+				font-size: 40px;
+			}

+ 348 - 0
watero/edit-phone.html

@@ -0,0 +1,348 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>更改手机号</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<style>
+			h4 {
+				font-size: 16px;
+			}
+			
+			.mui-input-row label {
+				width: 30%;
+			}
+			
+			.mui-input-row label {
+				padding: 5px 15px 7px 15px;
+				position: relative;
+			}
+			
+			.sex-group .mui-radio.mui-left label {
+				padding: 13px 15px 11px 35px;
+			}
+			
+			.mui-radio {
+				display: inline-block;
+			}
+			
+			.mui-input-group .mui-input-row {
+				height: 46px;
+				padding: 3px 0;
+			}
+			
+			.mui-input-row label~input {
+				width: 65%;
+				font-size: 14px;
+			}
+			
+			.mui-input-row label~input::-webkit-input-placeholder {
+				color: #bbb;
+			}
+			
+			.mui-radio.mui-left input[type=radio] {
+				left: 0;
+				top: 10px;
+			}
+			
+			.sex-group {
+				position: absolute;
+				left: 35%;
+				top: 0;
+				width: 65%;
+			}
+			
+			.mui-input-group:before,
+			.mui-input-group:after {
+				display: none;
+			}
+			
+			.my-lable {
+				position: absolute;
+				left: 45px;
+				top: 12px;
+				white-space: nowrap;
+				font-size: 14px;
+			}
+			
+			.my-lable i {
+				color: #ee5c5c;
+				font-size: 15px;
+			}
+			
+			.mui-input-row .iconfont {
+				color: #74c7dd;
+				font-size: 25px;
+			}
+			
+			.sex-group .mui-radio input[type=radio]::before {
+				font-family: "iconfont" !important;
+				font-size: 25px !important;
+				font-style: normal;
+				-webkit-font-smoothing: antialiased;
+				-moz-osx-font-smoothing: grayscale;
+				padding: 0 !important;
+				color: #eee;
+			}
+			
+			.sex-group .mui-radio input[type=radio].boy::before {
+				content: '\e721';
+			}
+			
+			.sex-group .mui-radio input[type=radio].girl::before {
+				content: '\e72e';
+			}
+			
+			.mui-radio input[type=radio].boy:checked:before,
+			.mui-radio input[type=radio].girl:checked:before {
+				color: #727171;
+			}
+			
+			.pull-code {
+				background: #74c7dd;
+				border-radius: 25px;
+				border: 1px solid #74c7dd;
+				color: #fff;
+				margin-top: 6px;
+				padding: 4px 2px 4px 2px;
+				font-size: 12px;
+				float: right;
+				width: 80px;
+				white-space: nowrap;
+			}
+			
+			.pull-code:disabled {
+				background: #fff;
+				color: #000;
+				border: 1px solid rgba(0, 0, 0, .5);
+			}
+			
+			.my-join-vip {
+				display: block;
+				width: 160px;
+				margin: 30px auto 50px auto;
+				padding: 8px 10px;
+				border-radius: 25px;
+				background: #fff;
+				color: #74c7dd;
+				border: 1px solid rgba(116, 199, 221, .5);
+				font-size: 16px;
+			}
+			
+			.my-join-vip:active {
+				background: #fff !important;
+				color: #74c7dd !important;
+				border: 1px solid rgba(116, 199, 221, .5) !important;
+			}
+			
+			.my-join-vip:disabled {
+				background: #fff;
+				color: #000;
+				border: 1px solid rgba(0, 0, 0, .5);
+			}
+			
+			.mui-icon-arrowdown {
+				position: absolute;
+				right: 10px;
+				top: 10px;
+				color: #999;
+				pointer-events: none;
+			}
+			
+			.mui-input-group .mui-input-row:after {
+				background-color: #e5e5e5;
+			}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content" style="background: #fff;">
+
+			<div style="margin:35px 30px 25px 18px;">
+				<div style="margin:12px 16px 25px 16px;">
+					<h4>请填写需要更改的手机号</h4>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-shoujihao"></span><span class="my-lable"><i>*</i>手机号</span></label>
+						<input type="tel" placeholder="请输入您的手机号" id="ipt-phone" maxlength="11">
+					</div>
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-yanzhengma"></span><span class="my-lable"><i>*</i>验证码</span></label>
+						<input style="width: 28% !important;float: none;padding-right: 0;margin-left: 5%;" type="tel" placeholder="短信验证码" maxlength="4" id="code"><button type="button" class="pull-code" disabled="disabled">获取验证码</button>
+					</div>
+				</form>
+				<button type="button" class="mui-btn my-join-vip" disabled="disabled">确认修改</button>
+			</div>
+		</div>
+		<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 type="text/javascript">
+			var countdown = 60;
+			mui.ready(function() {
+				console.log("页面加载完毕")
+				document.querySelector('.loading-bg').style.display = 'none';
+			});
+			//实时监听文本框字数
+			document.getElementById("ipt-phone").addEventListener("input", function() {
+				var phone = this.value;
+				var mobile = /^(13|14|15|16|17|18|19)[0-9]{9}$/; //手机号码
+				if(phone.length == 11) {
+					if(mobile.test(phone) && countdown == 60) {
+						$(".pull-code").removeAttr("disabled");
+					} else {
+						$(".pull-code").attr("disabled", "disabled");
+					}
+				} else {
+					$(".pull-code").attr("disabled", "disabled");
+				}
+			});
+			// 成为会员			
+			$(document).on('tap', '.my-join-vip', function() {
+				validate();
+				if(validate_flag) {
+					var num = /^[0-9]{4,4}$/; //数字(4位)
+					var code = $('#code').val();
+					if(num.test(code)) {
+						console.log('验证通过')
+						
+						var phone = $('#ipt-phone').val();
+						var code = $('#code').val();
+						$.ajax(base_path + '/agent/updateMemberPhone?dates=' + new Date().getTime(), {
+							data: {
+								userTel : phone,
+								code : code
+							},
+							dataType: 'json',
+							xhrFields: {
+								withCredentials: true
+							},
+							crossDomain: true,
+							type: 'get',
+							timeout: 15000,
+							success: function(dt) {
+								if(dt.isRedirect) {
+									location.href = dt.redirectURL;
+								} else {
+									if(dt.status){
+										mui.alert(' ', '更改成功!', function() {
+											location.href='vip_center.html';
+										});
+									}else{
+										mui.toast(dt.message);
+									}
+								}
+							},
+							error: function(xhr, type, errorThrown) {
+								console.log(xhr);
+							}
+						});
+						
+						// $ajax
+					} else {
+						if(code != '') {
+							show_msg = '验证码格式不正确';
+						} else {
+							show_msg = '请输入短信验证码';
+						}
+						mui.alert(show_msg);
+					}
+				} else {
+					mui.alert(show_msg);
+				}
+			});
+			//发送验证码
+			var validate_flag = false,
+				show_msg = '';
+			$(document).on('tap', '.pull-code', function() {
+				validate();
+				if(validate_flag) {
+					settime($(this));
+					$(".my-join-vip").removeAttr("disabled");
+					var phone = $('#ipt-phone').val();
+					$.ajax(base_path + '/agent/send_phone?dates=' + new Date().getTime(), {
+						data: {
+							phone: phone
+						},
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'get',
+						timeout: 15000,
+						success: function(dt) {
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.status) {
+									console.log("获取短信成功!");
+									$(".my-join-vip").removeAttr("disabled");
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+						}
+					});
+				} else {
+					mui.alert(show_msg);
+				}
+			});
+
+			function settime(obj) {
+				if(countdown == 0) {
+					obj.removeAttr("disabled");
+					obj.text("获取验证码");
+					countdown = 60;
+					return;
+				} else {
+					obj.attr("disabled", true);
+					obj.text("重新发送" + countdown + "");
+					countdown--;
+				}
+				setTimeout(function() {
+					settime(obj)
+				}, 1000)
+			}
+
+			function validate() {
+				var mobile = /^(13|14|15|17|18)[0-9]{9}$/; //手机号码
+				var phone = $("#ipt-phone").val();
+				if(mobile.test(phone)) {
+					validate_flag = true;
+				} else {
+					validate_flag = false;
+					if(phone != '') {
+						show_msg = '手机号码格式不正确';
+					} else {
+						show_msg = '请输入您的手机号';
+					}
+					return false;
+				}
+			}
+		</script>
+	</body>
+
+</html>

BIN
watero/fonts/iconfont.ttf


BIN
watero/images/jifen-bg.jpg


BIN
watero/images/jifen-next.jpg


BIN
watero/images/tx-1.jpg


BIN
watero/images/v.png


BIN
watero/images/vip-center-bg.jpg


BIN
watero/images/vip-quanyi.jpg


BIN
watero/images/yhq_noused_bg.png


+ 333 - 0
watero/integral-center.html

@@ -0,0 +1,333 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>积分中心</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<style>
+			.mui-content{background: #fff;}
+			.jifen-top{position: relative;border-bottom: 10px solid #f2f2f2;}
+			.jifen-top img{
+				display: block;
+				width: 100%;
+			}
+			.jifen-middle{position: absolute;top: 50%;left: 40px;right: 40px;height: 24px;margin-top: -12px;color: #74c7dd;}
+			.jifen-middle .mui-table-cell{vertical-align: middle;}
+			.jifen-middle strong{font-size: 26px;}
+			.jifen-middle .mui-btn{border-radius: 25px;border: 0;padding: 3px 10px 3px 10px;color: #fff;font-size: 12px;background: #74c7dd;}
+			.jifen-middle .mui-btn:active{background: #74c7dd !important;}
+			.jifen-title{color: #243052;font-size: 17px;font-weight: bold;margin-bottom: 15px;}
+			.jifen-box{padding:28px 16px;border-bottom: 10px solid #f2f2f2;}
+			.btn-go-shop{border-radius: 25px;padding:3px 16px 3px 16px;color: #243052;border: 1px solid rgba(36,48,82,.5);font-size: 12px;}
+			.btn-go-shop:active{background: #fff !important;color: #243052 !important;border: 1px solid rgba(36,48,82,.5);}
+			.date-yuan{width: 39px;border: 1px solid rgba(51,51,51,.1);border-radius: 40px;text-align: center;padding: 8px 0;font-size: 12px;color: #666;}
+			.table-yuan{border-radius: 25px;border: 1px solid rgba(51,51,51,.1);padding: 7px 16px;font-size: 14px;}
+			.jifen-list>li{margin: 15px 0;color: #333;}
+			.jifen-list>li>.mui-table{
+				margin: 10px 0;
+			}
+			.jifen-list i{color: #74c7dd;font-style: normal;}
+			.jifen-list i.mui-h5{color: #333;}
+			.mui-col-xs-10{vertical-align: middle;}
+			.mui-pull-bottom-pocket{height: 0px;}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content">
+			<div class="jifen-top">
+				<img src="images/jifen-bg.jpg" />
+				<div class="jifen-middle">
+					<div class="mui-table">
+					<div class="mui-table-cell">
+						<strong class="user-integeal">0</strong> 积分
+					</div>
+					<div class="mui-table-cell mui-text-right">
+						<button type="button" class="mui-btn go-integral-rule">积分规则</button>
+					</div>
+				</div>
+				</div>
+			</div>
+			<div class="jifen-box">
+			<div class="jifen-title">积分商城</div>
+			<img width="62%" src="images/jifen-next.jpg" />
+			</div>
+			<div class="jifen-box">
+			<div class="jifen-title">领积分</div>
+			<div>
+				<div class="mui-table">
+		                <div class="mui-table-cell mui-col-xs-2" style="vertical-align: middle;">
+		                    <i class="iconfont icon-w-huiyuanjifengouwuche" style="font-size: 36px;color: #57b5f9;margin-left: 5px;"></i>
+		                </div>
+		                <div class="mui-table-cell mui-col-xs-7" style="padding-left: 5px;vertical-align: middle;">
+		                    <div>消费领积分</div>
+		                    <p class="mui-h6 mui-ellipsis">消费10元,可获得1积分</p>
+		                </div>
+		                <div class="mui-table-cell mui-col-xs-3 mui-text-right" style="vertical-align: middle;">
+		                    <button type="button" class="mui-btn btn-go-shop">去下单</button>
+		                </div>
+		            </div>
+			</div>
+			</div>
+			<div class="jifen-box" style="border: 0;padding-bottom: 50px;">
+			<div class="jifen-title">积分明细</div>
+			<ul class="jifen-list">
+			
+				<li id="pullrefresh_yhq_list" >
+					<div></div>
+					
+					<!-- <div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-2">
+							<div class="date-yuan">
+								11.14
+							</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-10">
+							<div class="mui-table table-yuan">
+								<div class="mui-table-cell">
+									购买滤芯
+								</div>
+								<div class="mui-table-cell mui-text-right">
+									<i>+2699</i>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-2">
+							<div class="date-yuan">
+								11.14
+							</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-10">
+							<div class="mui-table table-yuan">
+								<div class="mui-table-cell">
+									购买滤芯
+								</div>
+								<div class="mui-table-cell mui-text-right">
+									<i>+2699</i>
+								</div>
+							</div>
+						</div>
+					</div> -->
+				</li>
+				
+				<!-- <li>
+					<div>2018年</div>
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-2">
+							<div class="date-yuan">
+								11.14
+							</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-10">
+							<div class="mui-table table-yuan">
+								<div class="mui-table-cell">
+									购买滤芯
+								</div>
+								<div class="mui-table-cell mui-text-right">
+									<i>+2699</i>
+								</div>
+							</div>
+						</div>
+					</div>
+					
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-2">
+							<div class="date-yuan">
+								11.14
+							</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-10">
+							<div class="mui-table table-yuan">
+								<div class="mui-table-cell">
+									购买滤芯
+								</div>
+								<div class="mui-table-cell mui-text-right">
+									<i class="mui-h5">-2699</i>
+								</div>
+							</div>
+						</div>
+					</div>
+				</li> -->
+				
+				
+			</ul>
+			</div>
+		</div>
+		<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 type="text/javascript">
+			window.addEventListener('pageshow', function(e) {
+				// 通过persisted属性判断是否存在 BF Cache
+				if(e.persisted) {
+					location.reload();
+				}
+			});
+			var pageNO = 0,
+				pageSize = 10;
+			
+			mui.init({
+				pullRefresh: {
+					container: '#pullrefresh_yhq_list',
+					down: {
+						height: 0,
+						//callback: pulldownRefresh
+					},
+					up: {
+						contentdown: '',
+						contentrefresh: '正在加载...',
+						contentnomore: '',
+						callback: pullupRefresh
+					}
+					// down: {
+					// 	height: 75,
+					// 	callback: false,
+					// },
+					// up: {
+					// 	auto: false,
+					// 	offset: 100, //距离底部高度(到达该高度即触发)
+					// 	show: true,
+					// 	contentdown: '',
+					// 	contentrefresh: '正在加载...',
+					// 	contentnomore: '',
+					// 	callback: pullupRefresh
+					// },
+				}
+			});
+			
+			
+			/**
+			 * 上拉加载具体业务实现
+			 */
+			function pullupRefresh() {
+				++pageNO; //每次上拉页数+1
+				$.ajax(base_path + '/integralLog/getIntegral?dates=' + new Date().getTime(), {
+					data: {
+						pageSize:pageSize,
+						pageNO:pageNO
+					},
+					dataType: 'json',
+					type: 'post',
+					timeout: 15000,
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					success: function(dt) {
+						console.log(dt);
+						if(dt.isRedirect) {
+							location.href = dt.redirectURL;
+						}else{
+							
+							mui('#pullrefresh_yhq_list').pullRefresh().endPullupToRefresh(dt.data.list.length < pageSize); //endPullupToRefresh(ture)表示没有更多数据了,停止上拉加载
+							var html='';
+							for(var i=0;i<dt.data.list.length;i++){
+								var item = dt.data.list[i];
+								
+								var newDate = new Date(item.inteLogCreateTime);
+								var year = newDate.getFullYear();
+								var month = newDate.getMonth() + 1;
+								var date = newDate.getDate();
+								html+='<div class="mui-table integral-li" year="'+ year +'">'
+								html+='<div class="mui-table-cell mui-col-xs-2"><div class="date-yuan">'+ month +'.'+ date +'</div></div>'
+								
+								html+='<div class="mui-table-cell mui-col-xs-10">'
+								html+='<div class="mui-table table-yuan">'
+								html+='<div class="mui-table-cell">'+ item.inteConfName +'</div>'
+								if(item.inteLogType == 1){
+									html+='<div class="mui-table-cell mui-text-right"><i>+'+ item.inteLogChangeNum +'</i></div>'
+								}else if(item.inteLogType == 2){
+									html+='<div class="mui-table-cell mui-text-right"><i>-'+ item.inteLogChangeNum +'</i></div>'
+								}
+								html+='</div>'
+								html+='</div>'
+								html+='</div>'
+							}
+							$('#pullrefresh_yhq_list').append(html);
+							setYear();
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						errorfn(xhr)
+					}
+				});
+			}
+			
+			mui.ready(function() {
+				document.querySelector('.loading-bg').style.display = 'none';
+				mui('#pullrefresh_yhq_list').pullRefresh().pullupLoading(); //首次加载
+				
+				$.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
+					dataType: 'json',
+					type: 'post',
+					timeout: 15000,
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					success: function(dt) {
+						if(dt.isRedirect) {
+							location.href = dt.redirectURL;
+						} else {
+							var data = dt.data;
+							if(dt.status) {
+								$(".user-integeal").html(data.userSurplusIntegral);
+							}
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						console.log(xhr)
+					}
+				});
+			});
+			$(document).on('tap', '.go-integral-rule', function() {
+				location.href='integral-rule.html';
+			});
+			$(document).on('tap', '.btn-go-shop', function() {
+				location.href='chanpin_list.html';
+			});
+			
+			function setYear(){
+				var oldyear = '';
+				$("#pullrefresh_yhq_list").find(".integral-li").each(function(){
+					var year = $(this).attr('year')+'年';
+					if(oldyear != year){
+						oldyear = year;
+						
+						var $prevNode = $(this).prev() //返回上一个兄弟节点
+						var yearVal = '';
+						if($prevNode != null){
+							yearVal = $prevNode.html();
+						}
+						if(yearVal != year){
+							$(this).before("<div>"+ year +"</div>");
+						}
+					}
+				})
+			}
+		</script>
+	</body>
+
+</html>

+ 162 - 0
watero/integral-rule.html

@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>积分规则</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<style>
+			.mui-content{background: #fff;color: #333;}
+			.rule-box{margin: 24px 0;}
+			.rule-box .mui-table{padding: 4px 0 4px 16px;margin: 0 16px;width: auto;}
+			.rule-title{background: #243052;padding: 5px 15px;font-size: 17px;color: #fff;border-radius:0 25px 25px 0;display: inline-block;margin:5px 0 15px 0;}
+			.rule-title-line{position: relative;padding-left: 14px;font-size: 15px;}
+			.rule-title-line:after{content: '';position: absolute;left: 0; top: 50%;height: 12px;margin-top: -6px; width: 2px;background: #74c7dd;border-radius: 2px;}
+			.rule-content{color: #999;font-size: 12px;padding:0 14px;line-height: 1.5;}
+			.rule-tips{background: #f4fafb;border-radius: 8px;color: #65a0b4;padding: 10px 14px;font-size: 12px;margin: 14px 16px;}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content">
+			<div class="rule-box">
+				<div class="rule-title">
+					积分该怎么花?
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							消费抵现
+						</div>
+						<div class="rule-content">
+							在微商城内任意消费,按照10积分=1元的比例抵扣
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							换购商品
+						</div>
+						<div class="rule-content">
+							积分可以积分+现金的方式,优惠价格轻松换购商品
+						</div>
+					</div>
+				</div>
+				<br />
+				<div class="rule-title">
+					该怎么赚积分?
+				</div>
+				<div style="padding-left: 30px;margin-top: 5px;">以下方式获得积分可叠加</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							商品消费
+						</div>
+						<div class="rule-content">
+							所有商品消费(实付金额为准)满10元即可获得1积分
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							注册会员
+						</div>
+						<div class="rule-content">
+							注册会员即可获得100积分
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							会员生日
+						</div>
+						<div class="rule-content">
+							会员生日当天,所有商品消费(实付金额为准)可获得3倍积分。还能额外获得一张满99元立减50元的优惠券
+						</div>
+					</div>
+				</div>
+				<div class="rule-tips">
+					<div>* 积分说明:</div>
+					<div>
+						会员积分在客户确认收货后立即到账,积分仅可作为消费抵扣,商品换购,不得折换现金或转让
+					</div>
+				</div>
+				<br />
+				<div class="rule-title">
+					常见问题
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							如何查看自己的积分?
+						</div>
+						<div class="rule-content">
+							公众号底部菜单栏点击“我的爱贝源-会员中心”,即可查看
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							积分清零规则?
+						</div>
+						<div class="rule-content">
+							积分将在确认收货后立即到账,所有未使用积分将在次年6月30日统一清零。积分清零前一个月,您将会收到提示信息,请尽快使用积分
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							积分扣减原则?
+						</div>
+						<div class="rule-content">
+							下单时使用积分抵现,在整笔订单退款时,则会退回所有未失效积分。在积分商城使用积分兑换,订单退款时不会退回积分
+						</div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell">
+						<div class="rule-title-line">
+							换购商品可以退换货吗?
+						</div>
+						<div class="rule-content">
+							换购商品属于特惠折扣商品,除质量问题外,换购商品 均不退换
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<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 type="text/javascript">
+			mui.ready(function() {
+				document.querySelector('.loading-bg').style.display = 'none';
+			});
+		</script>
+	</body>
+
+</html>

+ 41 - 1
watero/js/main.js

@@ -480,4 +480,44 @@ function setCookie() {
     var exp = new Date();
     exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
     document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
-};
+};
+
+
+/**
+ * 该方法用于将Undefined转换为空值
+ * @param val
+ */
+function convertUndefinedToEmpty(val) {
+    if (undefined == val || null == val||typeof val == undefined || typeof val == 'undefined'|| 'undefined' == val) {
+        val = "";
+    }
+    return val;
+}
+
+/**
+ * 该方法用于将Undefined转换为空值
+ * @param val
+ */
+function cufte(val) {
+    return convertUndefinedToEmpty(val);
+}
+
+/**
+ * 空值返回0,其他值返回原值
+ * @param val
+ */
+function cufteInt(val) {
+    if(convertUndefinedToEmpty(val) == "")
+        return 0;
+    return val;
+}
+
+/**
+ * 空值返回false
+ * @param val
+ */
+function isEmpty(val) {
+    if(convertUndefinedToEmpty(val) == "")
+        return false;
+    return true;
+}

+ 41 - 1
watero/js/page/main.js

@@ -549,4 +549,44 @@ function setCookie() {
     var exp = new Date();
     exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
     document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
-};
+};
+
+
+/**
+ * 该方法用于将Undefined转换为空值
+ * @param val
+ */
+function convertUndefinedToEmpty(val) {
+    if (undefined == val || null == val||typeof val == undefined || typeof val == 'undefined'|| 'undefined' == val) {
+        val = "";
+    }
+    return val;
+}
+
+/**
+ * 该方法用于将Undefined转换为空值
+ * @param val
+ */
+function cufte(val) {
+    return convertUndefinedToEmpty(val);
+}
+
+/**
+ * 空值返回0,其他值返回原值
+ * @param val
+ */
+function cufteInt(val) {
+    if(convertUndefinedToEmpty(val) == "")
+        return 0;
+    return val;
+}
+
+/**
+ * 空值返回false
+ * @param val
+ */
+function isEmpty(val) {
+    if(convertUndefinedToEmpty(val) == "")
+        return false;
+    return true;
+}

+ 1 - 1
watero/js/page/order_list.js

@@ -185,7 +185,7 @@ function pullupRefresh() {
 
 						}
 
-						a += '<li class="mui-table-view-cell"><div class="btn-zu">' + str1 + '<a class="mui-btn my-btn-orange mui-pull-right mr-5 go_order_details" value=' + this.salesOrderid + ' '+isSpellStr+'>订单详情</a></div><div>共'+allcount+'件     合计:<span class="mui-h5 cl-red">¥' + accDiv(this.salesAmount, 100) + '</span></div></li>';
+						a += '<li class="mui-table-view-cell"><div class="btn-zu">' + str1 + '<a class="mui-btn my-btn-orange mui-pull-right mr-5 go_order_details" value=' + this.salesOrderid + ' '+isSpellStr+'>订单详情</a></div><div>共'+allcount+'件     合计:<span class="mui-h5 cl-red">¥' + accDiv(this.salesYetAmount, 100) + '</span></div></li>';
 						
 						this.salesPostFirm == null ? this.salesPostFirm = "" : this.salesPostFirm;
 						if(this.salesPostFirm == 'sto') {

+ 501 - 0
watero/register-vip.html

@@ -0,0 +1,501 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>注册会员</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<link rel="stylesheet" type="text/css" href="css/mui.min.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/style.css" />
+		<style>
+			h4 {
+				font-size: 16px;
+			}
+			
+			.dalog {
+				position: fixed;
+				left: 0;
+				top: 0;
+				bottom: 0;
+				right: 0;
+				background: rgba(0, 0, 0, .7);
+				display: none;
+			}
+			
+			.dalog>div {
+				position: absolute;
+				width: 270px;
+				height: 290px;
+				left: 50%;
+				margin-left: -135px;
+				top: 50%;
+				margin-top: -150px;
+				text-align: center;
+			}
+			
+			.dalog .tp-box {
+				background: #fff;
+				padding: 14px 12px 8px 12px;
+				border-radius: 8px;
+				margin-bottom: 8px;
+			}
+			
+			.dalog li {
+				margin: 10px 0;
+				color: #727171;
+			}
+			
+			.dalog li p {
+				color: #666;
+				font-size: 12px;
+				margin-bottom: 0;
+				margin-top: 17px;
+			}
+			
+			.dalog .btn-see-integral {
+				border-radius: 25px;
+				background: #243052;
+				color: #fff;
+				padding: 5px 22px;
+				border: 0;
+				font-size: 14px;
+				margin-top: 11px;
+			}
+			
+			.dalog .icon-guanbi {
+				color: #fff;
+				font-size: 26px;
+			}
+			
+			.dalog strong {
+				font-size: 20px;
+				letter-spacing: 3px;
+				color: #243052;
+			}
+			
+			.dalog .icon-zhucewancheng {
+				font-size: 40px;
+				color: #243052;
+			}
+			
+			.mui-input-row label {
+				width: 30%;
+			}
+			
+			.mui-input-row label {
+				padding: 5px 15px 7px 15px;
+				position: relative;
+			}
+			
+			.sex-group .mui-radio.mui-left label {
+				padding: 13px 15px 11px 35px;
+				font-size: 14px;
+			}
+			
+			.mui-radio {
+				display: inline-block;
+			}
+			
+			.mui-input-group .mui-input-row {
+				height: 46px;
+				padding: 3px 0;
+			}
+			
+			.mui-input-row label~input {
+				width: 65%;
+				font-size: 14px;
+			}
+			
+			.mui-input-row label~input::-webkit-input-placeholder {
+				color: #bbb;
+			}
+			
+			.mui-radio.mui-left input[type=radio] {
+				left: 0;
+				top: 10px;
+			}
+			
+			.sex-group {
+				position: absolute;
+				left: 35%;
+				top: 0;
+				width: 65%;
+			}
+			
+			.mui-input-group:before,
+			.mui-input-group:after {
+				display: none;
+			}
+			
+			.my-lable {
+				position: absolute;
+				left: 45px;
+				top: 12px;
+				white-space: nowrap;
+				font-size: 14px;
+			}
+			
+			.my-lable i {
+				color: #ee5c5c;
+				font-size: 15px;
+			}
+			
+			.mui-input-row .iconfont {
+				color: #74c7dd;
+				font-size: 25px;
+			}
+			
+			.sex-group .mui-radio input[type=radio]::before {
+				font-family: "iconfont" !important;
+				font-size: 25px !important;
+				font-style: normal;
+				-webkit-font-smoothing: antialiased;
+				-moz-osx-font-smoothing: grayscale;
+				padding: 0 !important;
+				color: #eee;
+			}
+			
+			.sex-group .mui-radio input[type=radio]::before {
+				content: '\e725';
+			}
+			
+			.mui-radio input[type=radio]:checked:before {
+				color: #243052;
+			}
+			
+			.pull-code {
+				background: #74c7dd;
+				border-radius: 25px;
+				border: 1px solid #74c7dd;
+				color: #fff;
+				margin-top: 6px;
+				padding: 4px 2px 4px 2px;
+				font-size: 12px;
+				float: right;
+				width: 80px;
+				white-space: nowrap;
+			}
+			
+			.pull-code:disabled {
+				background: #fff;
+				color: #000;
+				border: 1px solid rgba(0, 0, 0, .5);
+			}
+			
+			.my-join-vip {
+				display: block;
+				width: 160px;
+				margin: 30px auto 50px auto;
+				padding: 8px 10px;
+				border-radius: 25px;
+				background: #fff;
+				color: #74c7dd;
+				border: 1px solid rgba(116, 199, 221, .5);
+				font-size: 16px;
+			}
+			
+			.my-join-vip:active {
+				background: #fff !important;
+				color: #74c7dd !important;
+				border: 1px solid rgba(116, 199, 221, .5) !important;
+			}
+			
+			.my-join-vip:disabled {
+				background: #fff;
+				color: #000;
+				border: 1px solid rgba(0, 0, 0, .5);
+			}
+			
+			.mui-icon-arrowdown {
+				position: absolute;
+				right: 10px;
+				top: 12px;
+				color: #666;
+				font-size: 20px;
+				pointer-events: none;
+			}
+			
+			.mui-input-group .mui-input-row:after {
+				background-color: #e5e5e5;
+			}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content" style="background: #fff;">
+
+			<div style="margin:35px 30px 25px 18px;">
+				<div style="margin:12px 16px 25px 16px;">
+					<h4>请完善下列会员信息</h4>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-xingming"></span><span class="my-lable"><i>*</i>姓名</span></label>
+						<input type="text" placeholder="请输入您的姓名" id="ipt-name" maxlength="18">
+					</div>
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-shengri"></span><span class="my-lable"><i>*</i>生日</span></label>
+						<input type="text" placeholder="请选择出生日期" id="ipt-birthday" readonly="readonly">
+						<i class="mui-icon mui-icon-arrowdown"></i>
+					</div>
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-xingbie"></span><span class="my-lable"><i>&nbsp;</i>性别</span></label>
+						<div class="mui-input-group sex-group">
+							<div class="mui-input-row mui-radio mui-left">
+								<label>男</label>
+								<input class="boy" name="radio1" type="radio" value="1" checked="checked">
+							</div>
+							<div class="mui-input-row mui-radio mui-left" style="margin-left: 15%;">
+								<label>女</label>
+								<input class="girl" name="radio1" type="radio" value="2">
+							</div>
+						</div>
+					</div>
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-shoujihao"></span><span class="my-lable"><i>*</i>手机号</span></label>
+						<input type="tel" placeholder="请输入您的手机号" id="ipt-phone" maxlength="11">
+					</div>
+					<div class="mui-input-row">
+						<label><span class="iconfont icon-w-yanzhengma"></span><span class="my-lable"><i>*</i>验证码</span></label>
+						<input style="width: 28% !important;float: none;padding-right: 0;margin-left: 5%;" type="tel" placeholder="请输入验证码" maxlength="4" id="code"><button type="button" class="pull-code" disabled="disabled">获取验证码</button>
+					</div>
+				</form>
+				<button type="button" class="mui-btn my-join-vip" disabled="disabled">成为会员</button>
+			</div>
+			<div class="dalog">
+				<div>
+					<div class="tp-box">
+						<ul>
+							<li><i class="iconfont icon-zhucewancheng"></i></li>
+							<li><strong>恭喜您注册成功</strong></li>
+							<li>
+								<p>100积分已发放至您的账户,可在会员积分查 看,购买产品可享受积分专属抵扣,还有积分 商品特惠换购</p>
+							</li>
+							<li><button type="button" class="mui-btn btn-see-integral">查看积分</button></li>
+						</ul>
+					</div>
+					<br />
+					<div class="mui-text-center">
+						<i class="iconfont icon-guanbi"></i>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script type="text/javascript" src="js/mui.min.js"></script>
+		<script type="text/javascript" src="js/mui.picker.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 type="text/javascript">
+			var countdown = 60;
+			mui.ready(function() {
+				console.log("页面加载完毕")
+				document.querySelector('.loading-bg').style.display = 'none';
+			});
+			// 选择生日
+			$(document).on('tap', '#ipt-birthday', function() {
+				var th = $(this);
+				var dtPicker = new mui.DtPicker({
+					"type": "date",
+					"beginYear": 1949,
+					"endYear": new Date().getFullYear()
+				});
+				dtPicker.setSelectedValue('1990')
+				dtPicker.show(function(selectItems) {
+					// console.log(selectItems.y); //{text: "2016",value: 2016} 
+					// console.log(selectItems.m); //{text: "05",value: "05"} 
+					th.val(selectItems);
+				})
+			});
+			//实时监听文本框字数
+			document.getElementById("ipt-phone").addEventListener("input", function() {
+				var phone = this.value;
+				var mobile = /^(13|14|15|16|17|18|19)[0-9]{9}$/; //手机号码
+				if(phone.length == 11) {
+					if(mobile.test(phone) && countdown == 60) {
+						$(".pull-code").removeAttr("disabled");
+					} else {
+						$(".pull-code").attr("disabled", "disabled");
+					}
+				} else {
+					$(".pull-code").attr("disabled", "disabled");
+				}
+			});
+			// 成为会员			
+			$(document).on('tap', '.my-join-vip', function() {
+				validate();
+				if(validate_flag) {
+					var num = /^[0-9]{4,4}$/; //数字(4位)
+					var code = $('#code').val();
+					if(num.test(code)) {
+						console.log('验证通过')
+						var phone = $('#ipt-phone').val();
+						var userBirthDate = $('#ipt-birthday').val();
+						var userName = $('#ipt-name').val();
+						var userSex = $('[name="radio1"]:checked').val();
+						
+						$.ajax(base_path + '/agent/updateMemberInfo?dates=' + new Date().getTime(), {
+							data: {
+								userName : userName,
+								userSex : userSex, // 1:男   2:女
+								userBirthDate : userBirthDate, //生日
+								userTel : phone, //
+								code : code //
+							},
+							dataType: 'json',
+							xhrFields: {
+								withCredentials: true
+							},
+							crossDomain: true,
+							type: 'get',
+							timeout: 15000,
+							success: function(dt) {
+								if(dt.isRedirect) {
+									location.href = dt.redirectURL;
+								} else {
+									if(dt.status){
+										$(".dalog").show();
+									}else{
+										mui.toast(dt.message);
+									}
+								}
+							},
+							error: function(xhr, type, errorThrown) {
+								console.log(xhr);
+							}
+						});
+						
+					} else {
+						if(code != '') {
+							show_msg = '验证码格式不正确';
+						} else {
+							show_msg = '请输入短信验证码';
+						}
+						mui.alert(show_msg);
+					}
+				} else {
+					mui.alert(show_msg);
+				}
+			});
+			//发送验证码
+			var validate_flag = false,
+				show_msg = '';
+			$(document).on('tap', '.pull-code', function() {
+				validate();
+				if(validate_flag) {
+					settime($(this));
+					$(".my-join-vip").removeAttr("disabled");
+					var phone = $('#ipt-phone').val();
+					$.ajax(base_path + '/agent/send_phone?dates=' + new Date().getTime(), {
+						data: {
+							phone: phone
+						},
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'get',
+						timeout: 15000,
+						success: function(dt) {
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.status) {
+									console.log("获取短信成功!");
+									$(".my-join-vip").removeAttr("disabled");
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+						}
+					});
+					
+				} else {
+					mui.alert(show_msg);
+				}
+			});
+
+			function settime(obj) {
+				if(countdown == 0) {
+					obj.removeAttr("disabled");
+					obj.text("获取验证码");
+					countdown = 60;
+					return;
+				} else {
+					obj.attr("disabled", true);
+					obj.text("重新发送" + countdown + "");
+					countdown--;
+				}
+				setTimeout(function() {
+					settime(obj)
+				}, 1000)
+			}
+
+			function validate() {
+				var ch_en = /^[A-Za-z_\-\u4e00-\u9fa5]{2,10}$/; //简体中文英文(2位以上)
+				var en_num = /^[A-Za-z0-9_]{1,20}$/; //英文数字(1位以上)
+				var mobile = /^(13|14|15|17|18)[0-9]{9}$/; //手机号码
+				var name = $("#ipt-name").val();
+				var birthday = $("#ipt-birthday").val();
+				var phone = $("#ipt-phone").val();
+				if(ch_en.test(name)) {
+					validate_flag = true;
+				} else {
+					validate_flag = false;
+					if(name != '') {
+						show_msg = '姓名格式不正确';
+					} else {
+						show_msg = '请输入您的姓名';
+					}
+					return false;
+				}
+				if(birthday.length > 0) {
+					validate_flag = true;
+				} else {
+					validate_flag = false;
+					show_msg = '请选择出生日期';
+					return false;
+				}
+				if(mobile.test(phone)) {
+					validate_flag = true;
+				} else {
+					validate_flag = false;
+					if(phone != '') {
+						show_msg = '手机号码格式不正确';
+					} else {
+						show_msg = '请输入您的手机号';
+					}
+					return false;
+				}
+			}
+			// 关闭弹窗
+			$(document).on('tap', '.icon-guanbi', function() {
+				$('.dalog').hide();
+			});
+			// 查看积分
+			$(document).on('tap', '.btn-see-integral', function() {
+				location.href = 'integral-center.html';
+			});
+		</script>
+	</body>
+
+</html>

+ 155 - 0
watero/vip-equity.html

@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>成为会员</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<style>
+			.mui-content {
+				background: #fff;
+			}
+			
+			.vip-equity-list {
+				margin: 40px auto;
+				display: block;
+				width: 250px;
+				list-style: none;
+				padding: 0;
+			}
+			
+			.vip-equity-list>li {
+				position: relative;
+				width: 100%;
+				margin: 12px 0;
+				color: #666;
+				padding: 3px 0;
+			}
+			
+			.vip-equity-list>li .content {
+				border-radius: 25px;
+				width: 100%;
+				padding: 3px 0 3px 50px;
+				border: 1px solid rgba(0, 0, 0, .1);
+				margin: 0;
+				font-size: 12px;
+				white-space: nowrap;
+			}
+			
+			.vip-equity-list>li .icon {
+				border-radius: 35px;
+				padding: 7px;
+				background: #243052;
+				border: 1px solid #243052;
+				width: 35px;
+				height: 35px;
+				text-align: center;
+				color: #fff;
+				position: absolute;
+				left: 0;
+				top: 0;
+				font-size: 18px;
+				font-weight: bold;
+			}
+			
+			.my-join-vip {
+				display: block;
+				width: 160px;
+				margin: 30px auto 50px auto;
+				padding: 9px 16px;
+				border-radius: 25px;
+				background: #fff;
+				border: 1px solid rgba(36,48,82,.5);
+				font-size: 16px;
+				color: #243052;
+			}
+			
+			.my-join-vip:active {
+				background: #fff !important;
+				color: #333 !important;
+			}
+			
+			.my-join-vip:disabled {
+				background: #fff;
+				color: #999;
+			}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content">
+			<img width="100%" src="images/vip-quanyi.jpg" />
+			<ul class="vip-equity-list">
+				<li>
+					<div class="content">
+						注册会员即可获得100积分
+					</div>
+					<div class="icon">
+						1
+					</div>
+				</li>
+				<li>
+					<div class="content">
+						会员专享折扣
+					</div>
+					<div class="icon">
+						2
+					</div>
+				</li>
+				<li>
+					<div class="content">
+						购买产品,享受积分抵扣现金优惠
+					</div>
+					<div class="icon">
+						3
+					</div>
+				</li>
+				<li>
+					<div class="content">
+						积分换购特惠商品权益
+					</div>
+					<div class="icon">
+						4
+					</div>
+				</li>
+				<li>
+					<div class="content">
+						会员专享生日大礼包
+					</div>
+					<div class="icon">
+						5
+					</div>
+				</li>
+			</ul>
+			<!-- <button type="button" class="mui-btn my-join-vip">成为会员</button> -->
+		</div>
+		<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 type="text/javascript">
+			mui.ready(function() {
+				document.querySelector('.loading-bg').style.display = 'none';
+			});
+		</script>
+	</body>
+
+</html>

+ 146 - 0
watero/vip-info.html

@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>会员信息</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<style>
+			.v-top {
+				background: #74c7dd;
+				height: 80px;
+			}
+			
+			.v-middle {
+				position: absolute;
+				background: transparent;
+				top: 28px;
+				left: 0;
+				width: 100%;
+			}
+			
+			.v-content {
+				position: absolute;
+				left: 15px;
+				right: 15px;
+				top: 30px;
+				background: #fff;
+				padding-top: 90px;
+				border-radius: 8px;
+				overflow: hidden;
+				box-shadow:rgba(0,0,0,.2) 0px 0px 6px;
+			}
+			.v-image{width: 56px;display: block;position: absolute;left: 50%;top: 0;margin-left: -28px;border-radius: 56px;}
+			.v-title{position: absolute;left: 0;top: 72px;text-align: center;font-size: 16px;color: #333;right: 0;}
+			.v-content .mui-table-view-cell:after{left: 15px;right: 15px;background-color: #e5e5e5;}
+			.v-content .mui-table-view-cell:last-child:after{display: none;}
+			.v-content .mui-table-view-cell>a:not(.mui-btn).mui-active{background: #fff;}
+			.v-content .mui-table-view:after,.v-content .mui-table-view:before{display: none;}
+			.v-content .mui-badge{background: transparent;color: #999;}
+		</style>
+		<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');
+			});
+		</script>
+	</head>
+
+	<body style="background: #fff;">
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+		<div class="mui-content">
+			<div class="v-top">
+				<div class="v-middle">
+					<div class="v-content">
+						<ul class="mui-table-view">
+							<li class="mui-table-view-cell">
+								<a class="mui-navigate-right">
+									<span class="mui-badge likeName-head"></span>姓名
+								</a>
+							</li>
+							<li class="mui-table-view-cell">
+								<a class="mui-navigate-right">
+									<span class="mui-badge birthdate-head"></span>生日
+								</a>
+							</li>
+							<li class="mui-table-view-cell">
+								<a class="mui-navigate-right">
+									<span class="mui-badge sex-head"></span>性别
+								</a>
+							</li>
+							<li class="mui-table-view-cell">
+								<a class="mui-navigate-right go-edit-phone">
+									<span class="mui-badge tel-head"></span>手机号
+								</a>
+							</li>
+						</ul>
+					</div>
+					<img class="v-image img_head" src="images/tx-1.jpg" />
+					<div class="v-title name_head"></div>
+				</div>
+			</div>
+		</div>
+		<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 type="text/javascript">
+			mui.ready(function() {
+				console.log("页面加载完毕")
+				document.querySelector('.loading-bg').style.display = 'none';
+				
+				$.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
+					dataType: 'json',
+					type: 'post',
+					timeout: 15000,
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					success: function(dt) {
+						if(dt.isRedirect) {
+							location.href = dt.redirectURL;
+						} else {
+							var data = dt.data;
+							if(dt.status) {
+								$('.img_head').attr('src',data.userHead);
+								if(data.userNickname != null && typeof(data.userNickname) != "undefined" && data.userNickname != '') {
+									$(".name_head").html(decodeURI(data.userNickname))
+								}
+								$('.likeName-head').text(data.userName);
+								$('.birthdate-head').text(data.userBirthDate);
+								$('.tel-head').text(data.userTel);
+								if(data.userSex == 1){
+									$('.sex-head').text('男');
+								}else{
+									$('.sex-head').text('女');
+								}
+							} else {
+								
+							}
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						console.log(xhr)
+					}
+				});
+			});
+			
+			$(document).on('tap', '.go-edit-phone', function() {
+				location.href='edit-phone.html'
+			});
+		</script>
+	</body>
+
+</html>

+ 503 - 389
watero/vip_center.html

@@ -1,409 +1,523 @@
 <!DOCTYPE html>
 <html>
-<head>
-	<meta charset="UTF-8">
-	<title></title>
-	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-	<meta name="apple-mobile-web-app-capable" content="yes">
-	<meta name="apple-mobile-web-app-status-bar-style" content="black">
-	<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/style.css" />
-	<link rel="stylesheet" type="text/css" href="css/vip_center.css" />
-	<script>
-        // 屏蔽分享
-        window.hiddenAllWechatMenu = true;
-	</script>
-</head>
-<body style="background: #fff;">
-<div class="loading-bg">
-	<div class="mui-loading">
-		<div class="mui-spinner">
-		</div>
-		&nbsp;&nbsp;加载中...
-	</div>
-</div>
-<nav class="mui-bar mui-bar-tab" id="footer-bar">
-	<a class="mui-tab-item" >
-		<div class="iconfont icon-shouye"></div>
-		<span class="mui-tab-label">首页</span>
-	</a>
-	<a class="mui-tab-item">
-		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-		<span class="mui-tab-label">购物车</span>
-	</a>
-	<a class="mui-tab-item">
-		<div class="iconfont icon-dingdan"></div>
-		<span class="mui-tab-label">订单</span>
-	</a>
-	<a class="mui-tab-item mui-active">
-		<div class="iconfont icon-wode"></div>
-		<span class="mui-tab-label">我的</span>
-	</a>
-</nav>
-<div class="mui-content" style="background: #fff;">
-	<div class="vip-tt">
-		<!-- <img src="/iamberry/common/shop/images/member_photo-bg_2.png"> -->
-		<div class="tx bg-orange" id="headDiv">
-			<img src="images/logo_head.png" id="userHead">
-		</div>
-		<div class="nikname">
-			<div>
-				<span id="userNickname">水时代</span>
-			</div>
-			<div >
-				<span id="vipName">普通用户</span>
-				<!--<span class="go_daili_2wm"  id="2WM"  style="display:none">立即分享二维码 ></span>-->
-				<span class="see-rights">查看权益<span class="mui-icon mui-icon-arrowright" style="font-size: 18px;"></span></span>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>我的</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<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/style.css" />
+		<link rel="stylesheet" type="text/css" href="css/vip_center.css" />
+		<script>
+			// 屏蔽分享
+			window.hiddenAllWechatMenu = true;
+		</script>
+	</head>
+
+	<body>
+		<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
 			</div>
 		</div>
-	</div>
-	<div class="vip-show">
-		凡购买滤芯套装,立减100元/套,结算时系统自动减免
-	</div>
-	<br />
-	<ul class="mui-table-view my-view-order">
-		<li class="mui-table-view-cell">
-			<a class="mui-navigate-right">
-		       <span class="mui-badge">查看全部</span>
-		                    我的订单
-		    </a>
-		</li>
-	</ul>
-	<div style="padding:0 0 20px 0;background: #fff;">
-		<div id="menu-order" class="mui-segmented-control">
-			<a class="mui-control-item go_pay_count">
-				<div class="iconfont icon-daifukuan"></div>
-				待付款
+		<nav class="mui-bar mui-bar-tab" id="footer-bar">
+			<a class="mui-tab-item">
+				<div class="iconfont icon-shouye"></div>
+				<span class="mui-tab-label">首页</span>
 			</a>
-			<a class="mui-control-item go_pay_ping">
-				<div class="iconfont icon-pindan"></div>
-				拼单中
+			<a class="mui-tab-item">
+				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+				<span class="mui-tab-label">购物车</span>
 			</a>
-			<a class="mui-control-item go_deliver_count">
-				<div class="iconfont icon-daifahuo"></div>
-				待发货
+			<a class="mui-tab-item">
+				<div class="iconfont icon-dingdan"></div>
+				<span class="mui-tab-label">订单</span>
 			</a>
-			<a class="mui-control-item go_delivered_count">
-				<div class="iconfont icon-yifahuo"></div>
-				已发货
+			<a class="mui-tab-item mui-active">
+				<div class="iconfont icon-wode"></div>
+				<span class="mui-tab-label">我的</span>
 			</a>
-			<!--<a class="mui-control-item go_all_count">
-				<div class="iconfont icon-alldingdan"></div>
-				全部订单
-			</a>-->
-		</div>
-	</div>
-	<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-center-no" id="center-menu" >
-		<li class="mui-table-view-cell" href="coupon_bag.html?tabindex=10">
-			<div class="mui-table">
-				<div class="mui-table-cell mui-col-xs-5 table-middle">
-					我的券包
-				</div>
-				<div class="mui-table-cell mui-col-xs-5 mui-text-right">
-					<span class="mui-icon mui-icon-arrowright"></span>
+		</nav>
+		<div class="mui-content">
+			<div class="center-header">
+				<div class="wecat-head">
+					<img style="display: block;width: 100%; "  src="images/vip-center-bg.jpg" />
+					<div class="user-head">
+						<img id="headDiv" class="img_head" src="images/tx-1.jpg" />
+					</div>
+					<div id="userNickname">微信用户</div>
+					<!--<div class="mui-table" style="padding-top: 15px;">
+						<div class="mui-table-cell amount-div">
+							<h5 style="font-size: 14px;padding-bottom: 10px;">待入帐</h5>
+							<div class="cl-red" style="font-size: 20px;">¥<span id="await-amount">0</span></div>
+						</div>
+						<div class="mui-table-cell amount-div">
+							<h5 style="font-size: 14px;padding-bottom: 10px;">可提现</h5>
+							<div class="cl-red" style="font-size: 20px;">¥<span id="uables-amount">0</span></div>
+							<div style="width: 1px;height: 30px;background: #ccc;-webkit-transform: scaleX(.3);position: absolute;right: 0;bottom: 5px;"></div>
+						</div>
+					</div>-->
 				</div>
-			</div>
-		</li>
-		<li class="mui-table-view-cell" href="faq.html">
-			<div class="mui-table">
-				<div class="mui-table-cell mui-col-xs-5">
-					常见问答
-				</div>
-				<div class="mui-table-cell mui-col-xs-5 mui-text-right">
-					<span class="mui-icon mui-icon-arrowright"></span>
+				<div class="bottom-vip">
+					<div class="mui-table">
+						<div class="mui-table-cell">
+							<span class="vip-title">WaterO</span> 会员
+							<div class="vip-line"></div>
+							<img class="vip-arrow" src="images/v.png" />
+						</div>
+						<div class="mui-table-cell join-vip mui-text-right">
+							<span class="vip-l">
+								<span class="vip-note" type="1">成为会员</span>
+								<i class="mui-icon mui-icon-arrowright" style="font-size: 17px;margin-left: 5px;"></i> 
+							</span>
+						</div>
+					</div>
 				</div>
 			</div>
-		</li>
-		<li class="mui-table-view-cell" href="after_service_watero.html">
-			<div class="mui-table">
-				<div class="mui-table-cell mui-col-xs-5">
-					售后服务
+			<div class="center-content">
+				<div class="mui-table mui-text-center my-count">
+					<div class="mui-table-cell go-integral-center">
+						<strong class="user-integeal">0</strong>
+						<p>积分</p>
+					</div>
+					<div class="mui-table-cell go-coupon-bag" >
+						<strong class="user-count">0</strong>
+						<p>券包</p>
+					</div>
+					<div class="mui-table-cell go-coupon-bag-2">
+						<strong class="user-vip-count">0</strong>
+						<p>会员专享</p>
+					</div>
 				</div>
-				<div class="mui-table-cell mui-col-xs-5 mui-text-right">
-					<span class="mui-icon mui-icon-arrowright"></span>
+
+				<div class="order-box">
+					<ul class="mui-table-view">
+						<li class="mui-table-view-cell" style="padding: 11px 15px 5px 15px;">
+							我的订单
+							<!--<a class="mui-navigate-right">
+						<span class="mui-badge">查看全部</span> 我的订单
+					</a>-->
+						</li>
+					</ul>
+					<div>
+						<div id="menu-order" class="mui-segmented-control">
+							<a class="mui-control-item go_pay_count">
+								<div class="iconfont icon-daifukuan"></div>
+								待付款
+							</a>
+							<!--<a class="mui-control-item go_pay_ping">
+						<div class="iconfont icon-pindan"></div>
+						拼单中
+					</a>-->
+							<a class="mui-control-item go_deliver_count">
+								<div class="iconfont icon-daifahuo"></div>
+								待发货
+							</a>
+							<a class="mui-control-item go_delivered_count">
+								<div class="iconfont icon-yifahuo"></div>
+								已发货
+							</a>
+							<a class="mui-control-item go_all_count">
+								<div class="iconfont icon-dingdan1"></div>
+								全部
+							</a>
+						</div>
+					</div>
 				</div>
+				<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-center-no" id="center-menu">
+					<li class="mui-table-view-cell" href="vip-info.html">
+						<div class="mui-table">
+							<div class="mui-table-cell mui-col-xs-5 table-middle">
+								个人信息
+							</div>
+							<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+								<span class="mui-icon mui-icon-arrowright"></span>
+							</div>
+						</div>
+					</li>
+					<li class="mui-table-view-cell" href="faq.html">
+						<div class="mui-table">
+							<div class="mui-table-cell mui-col-xs-5">
+								常见问答
+							</div>
+							<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+								<span class="mui-icon mui-icon-arrowright"></span>
+							</div>
+						</div>
+					</li>
+					<li class="mui-table-view-cell" href="after_service_watero.html">
+						<div class="mui-table">
+							<div class="mui-table-cell mui-col-xs-5">
+								售后服务
+							</div>
+							<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+								<span class="mui-icon mui-icon-arrowright"></span>
+							</div>
+						</div>
+					</li>
+					<li class="mui-table-view-cell" href="tel:400-8006692">
+						<div class="mui-table">
+							<div class="mui-table-cell mui-col-xs-5">
+								客服电话
+							</div>
+							<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+								<a class="tel" href="tel:400-8006692">400-8006692</a> <span class="mui-icon mui-icon-arrowright"></span>
+							</div>
+						</div>
+					</li>
+					<!--<li class="mui-table-view-cell" href="coupon_dec.html" id="coupon-sys">
+						<div class="mui-table">
+							<div class="mui-table-cell mui-col-xs-5">
+								滤芯兑换券
+							</div>
+							<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+								<span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 3px;">使用说明</span><span class="mui-icon mui-icon-arrowright"></span>
+							</div>
+						</div>
+					</li>-->
+				</ul>
 			</div>
-		</li>
-		<li class="mui-table-view-cell" href="tel:400-8006692">
-			<div class="mui-table">
-				<div class="mui-table-cell mui-col-xs-5">
-					客服电话
-				</div>
-				<div class="mui-table-cell mui-col-xs-5 mui-text-right">
-					<!--<span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 2px;">400-8006692</span>-->
-					<span class="mui-icon mui-icon-arrowright"></span>
+
+		</div>
+		<div class="dalog">
+				<div>
+					<div class="tp-box">
+						<ul>
+							<li><strong>积分也能当钱花</strong></li>
+							<li>
+								<ol>
+									<li>·注册会员即可获得100积分</li>
+									<li>·会员专享折扣</li>
+									<li>·购买产品,享受积分抵扣现金优惠</li>
+									<li>·积分换购特惠商品权益</li>
+									<li>·会员专享生日大礼包</li>
+								</ol>
+							</li>
+							<li><button type="button" class="mui-btn btn-see-integral">成为会员</button></li>
+						</ul>
+					</div>
+					<br />
+					<div class="mui-text-center">
+						<i class="iconfont icon-guanbi"></i>
+					</div>
 				</div>
 			</div>
-		</li>
-        <li class="mui-table-view-cell" href="coupon_dec.html" id="coupon-sys" style="display: none;">
-            <div class="mui-table">
-                <div class="mui-table-cell mui-col-xs-5">
-                	滤芯兑换券
-                </div>
-                <div class="mui-table-cell mui-col-xs-5 mui-text-right">
-                    <span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 3px;">使用说明</span><span class="mui-icon mui-icon-arrowright"></span>
-                </div>
-            </div>
-        </li>
-	</ul>
-</div>
-<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/page/wechat-utils-1.0.js"></script>
-<!--<script src="js/shop/vip_center.js?v=2017040701"></script>-->
-<script>
-    mui.ready(function() {
-        marquee_Show();
-        getCartNum();
-        $.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
-            dataType: 'json',
-            type: 'post',
-            timeout: 15000,
-            xhrFields: {
-				withCredentials: true
-			},
-			crossDomain: true,
-            success: function(dt) {
-            	if (dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-                var data = dt.data;
-                if(dt.status) {
-                    if(data.userHead != null && typeof(data.userHead) != "undefined" && data.userHead != '') {
-                        var imgObj = $("<img src='" + data.userHead + "?" + new Date().getTime() + "'/>");
-                        $("#headDiv").empty().append(imgObj)
-                    }
-                    if(data.userNickname != null && typeof(data.userNickname) != "undefined" && data.userNickname != '') {
-                        $("#userNickname").html(decodeURI(data.userNickname))
-                    }
-                    var userNickname = $("#userNickname").html();
-                    if(data.userIsVip == 2) {
-                        //$("#2WM").show();
-                        if(userNickname != "") {
-                            $("#userNickname").html(userNickname )
-							$("#vipName").html('<img style="width: 12px;" src="images/s-vip.png" /><span class="mui-h6">VIP用户</span>');
-                        }
-                        $(".vip-show,#coupon-sys").show();
-                    } else {
-                        if(userNickname != "") {
-                            $("#userNickname").html(userNickname)
-                            $("#vipName").html('<span class="mui-h6">普通用户</span>');
-                            $(".see-rights").hide();
-                        }
-                    }
-                    $.ajax({
-                        type: 'post',
-                        url: base_path + '/probationOrder/membersProbationOrder',
-                        data: {},
-                        dataType: 'json',
-                        timeout: 15000,
-                        xhrFields: {
-                        	withCredentials: true
-                        },
-                        crossDomain: true,
-                        success: function(dts) {
-                        	if (dt.isRedirect) {
-                        		location.href = dt.redirectURL;
-                        	} else {
-                            if(dts.status) {
-                                var str = '';
-                                if(dts.data.probationOrderDtoList.length == 0) {
-                                    $("#try_order_list").hide()
-                                }
-                                mui(dts.data.probationOrderDtoList).each(function(index) {
-                                    switch(this.probationStatus) {
-                                        case 1:
-                                            str = "待派送";
-                                            break;
-                                        case 2:
-                                            str = "派送中";
-                                            break;
-                                        case 3:
-                                            str = "待支付";
-                                            break;
-                                        case 4:
-                                            str = "暂停试用";
-                                            break;
-                                        case 5:
-                                            str = "支付完成";
-                                            break;
-                                        default:
-                                            str = "订单关闭";
-                                            break
-                                    }
-                                    var str1 = '',
-                                        str2 = '';
-                                    if(str == "待支付") {
-                                        str1 = '<a data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在支付" class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="' + this.probationOrderid + '">立即支付</a>';
-                                        str2 = '<div>试用剩余时间:<span id="time_out' + (index + 1) + '"></span></div>'
-                                    }
-                                    $("#try_order_list").append('<li class="mui-table-view-cell mui-media"><a class="go_try_order" proid="' + this.probationOrderid + '" style="margin-left: -20px;"><span class="mui-media-object mui-pull-left wh-80"><img src="' + this.productIntroduceImg + '"></span><div class="mui-media-body center-middle"><div>' + str + '</div><div>订单号:' + this.probationOrderid + '</div>' + str2 + '</div></a><div class="btn-box">' + str1 + '</div></li>');
-                                    if(str == "待支付") {
-                                        addTimer('time_out' + (index + 1), this.probationRemainingTime / 1000)
-                                    }
-                                })
-                            } else {
-                                mui.alert(dts.data.message)
-                            }
-                            }
-                        },
-                        error: function(xhr, type, errorThrown) {
-                            console.log(xhr);
-                            mui.alert("请检查网络或刷新页面重试!")
-                        }
-                    });
-                    document.querySelector('.loading-bg').style.display = 'none'
-                } else {
-                    var btnArray = ['否', '是'];
-                    mui.confirm(dt.message, '提示', btnArray, function(e) {
-                        if(e.index == 1) {
-                            location.reload(true)
-                        }
-                    })
-                }
-                }
-            },
-            error: function(xhr, type, errorThrown) {
-                console.log(xhr)
-            }
-        });
-        if(marquee != '') {
-            $('body').append('<div class="marquee-show"><div></div></div>')
-        }
-    });
+		<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/page/wechat-utils-1.0.js"></script>
+		<script>
+			mui.ready(function() {
+				marquee_Show();
+				getCartNum();
+				$.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
+					dataType: 'json',
+					type: 'post',
+					timeout: 15000,
+					xhrFields: {
+						withCredentials: true
+					},
+					crossDomain: true,
+					success: function(dt) {
+						if(dt.isRedirect) {
+							location.href = dt.redirectURL;
+						} else {
+							var data = dt.data;
+							if(dt.status) {
+								if(data.userHead != null && typeof(data.userHead) != "undefined" && data.userHead != '') {
+									// var imgObj = $("<img src='" + data.userHead + "?" + new Date().getTime() + "'/>");
+									// $("#headDiv").empty().append(imgObj)
+									$(".img_head").attr("src",data.userHead)
+								}
+								if(data.userNickname != null && typeof(data.userNickname) != "undefined" && data.userNickname != '') {
+									$("#userNickname").html(decodeURI(data.userNickname))
+								}
+								
+								$(".user-integeal").text(data.userSurplusIntegral);
+								$(".user-count").text(data.couponCount);
+								if(data.couponVipCount == null || data.couponVipCount == ""){
+									$(".user-vip-count").text(1);
+								}else{
+									$(".user-vip-count").text(data.couponVipCount+1);
+								}
+								
+								// var userNickname = $("#userNickname").html();
+								// if(data.userIsVip == 2) {
+								// 	//$("#2WM").show();
+								// 	if(userNickname != "") {
+								// 		$("#userNickname").html(userNickname)
+								// 		$("#vipName").html('<img style="width: 12px;" src="images/s-vip.png" /><span class="mui-h6">VIP用户</span>');
+								// 	}
+								// 	$(".vip-show,#coupon-sys").show();
+								// } else {
+								// 	if(userNickname != "") {
+								// 		$("#userNickname").html(userNickname)
+								// 		$("#vipName").html('<span class="mui-h6">普通用户</span>');
+								// 		$(".see-rights").hide();
+								// 	}
+								// }
+								if(data.userIsVip == 1){	//是否为vip :1:非vip  2:vip
+									$('.vip-note').text('注册会员')
+									$(".vip-note").attr('type',1); //1:成为会员  2:完善信息  3:会员权益
+								}else{
+									if(data.userArrange == 1){//是否已完善信息   1:已完善  2:未完善
+										$('.vip-note').text('会员权益')
+										$(".vip-note").attr('type',3); 
+									}else{
+										$('.vip-note').text('完善信息')
+										$(".vip-note").attr('type',2);
+									}
+								}
+								
+								
+								$.ajax({
+									type: 'post',
+									url: base_path + '/probationOrder/membersProbationOrder',
+									data: {},
+									dataType: 'json',
+									timeout: 15000,
+									xhrFields: {
+										withCredentials: true
+									},
+									crossDomain: true,
+									success: function(dts) {
+										if(dt.isRedirect) {
+											location.href = dt.redirectURL;
+										} else {
+											if(dts.status) {
+												var str = '';
+												if(dts.data.probationOrderDtoList.length == 0) {
+													$("#try_order_list").hide()
+												}
+												mui(dts.data.probationOrderDtoList).each(function(index) {
+													switch(this.probationStatus) {
+														case 1:
+															str = "待派送";
+															break;
+														case 2:
+															str = "派送中";
+															break;
+														case 3:
+															str = "待支付";
+															break;
+														case 4:
+															str = "暂停试用";
+															break;
+														case 5:
+															str = "支付完成";
+															break;
+														default:
+															str = "订单关闭";
+															break
+													}
+													var str1 = '',
+														str2 = '';
+													if(str == "待支付") {
+														str1 = '<a data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在支付" class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="' + this.probationOrderid + '">立即支付</a>';
+														str2 = '<div>试用剩余时间:<span id="time_out' + (index + 1) + '"></span></div>'
+													}
+													$("#try_order_list").append('<li class="mui-table-view-cell mui-media"><a class="go_try_order" proid="' + this.probationOrderid + '" style="margin-left: -20px;"><span class="mui-media-object mui-pull-left wh-80"><img src="' + this.productIntroduceImg + '"></span><div class="mui-media-body center-middle"><div>' + str + '</div><div>订单号:' + this.probationOrderid + '</div>' + str2 + '</div></a><div class="btn-box">' + str1 + '</div></li>');
+													if(str == "待支付") {
+														addTimer('time_out' + (index + 1), this.probationRemainingTime / 1000)
+													}
+												})
+											} else {
+												mui.alert(dts.data.message)
+											}
+										}
+									},
+									error: function(xhr, type, errorThrown) {
+										console.log(xhr);
+										mui.alert("请检查网络或刷新页面重试!")
+									}
+								});
+								document.querySelector('.loading-bg').style.display = 'none'
+							} else {
+								var btnArray = ['否', '是'];
+								mui.confirm(dt.message, '提示', btnArray, function(e) {
+									if(e.index == 1) {
+										location.reload(true)
+									}
+								})
+							}
+						}
+					},
+					error: function(xhr, type, errorThrown) {
+						console.log(xhr)
+					}
+				});
+				if(marquee != '') {
+					$('body').append('<div class="marquee-show"><div></div></div>')
+				}
+			});
 
-    var isPay = true;
-    mui('body').on('tap', '.try-btn-pay', function() {
-        var th = this;
-        if(isPay) {
-            mui(this).button('loading');
-            isPay = false;
-            $.ajax({
-                type: 'post',
-                url: base_path + '/probation/pay',
-                data: {
-                    "orderId": th.getAttribute("proid")
-                },
-                dataType: 'json',
-                timeout: 15000,
-                xhrFields: {
-				withCredentials: true
-			},
-			crossDomain: true,
-                success: function(dt) {
-                	if (dt.isRedirect) {
-                		location.href = dt.redirectURL;
-                	} else {
-                    if(dt.status) {
-                        var obj = JSON.parse("{" + dt.data.info + "}");
-                        WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-                            if(res.err_msg == 'get_brand_wcpay_request:ok') {
-                                $.ajax({
-                                    type: 'post',
-                                    url: base_path + '/probation/check_probation_pay_success',
-                                    data: {
-                                        "orderId": th.getAttribute("proid")
-                                    },
-                                    dataType: 'json',
-                                    timeout: 15000,
-                                    xhrFields: {
-                                    	withCredentials: true
-                                    },
-                                    crossDomain: true,
-                                    success: function(data) {
-                                    	if (dt.isRedirect) {
-                                    		location.href = dt.redirectURL;
-                                    	} else {
-                                        if(data.status) {
-                                            if(data.data == 5) {
-                                                mui.alert("支付成功", '', function() {
-                                                    mui.openWindow({
-                                                        url: base_path + '/probation/try_order?orderId=' + th.getAttribute("proid")
-                                                    })
-                                                })
-                                            } else {
-                                                mui.alert(data.message, '', function() {
-                                                    mui(th).button('reset')
-                                                })
-                                            }
-                                        } else {
-                                            mui(th).button('reset');
-                                            mui.alert(data.message)
-                                        }
-                                        }
-                                    },
-                                    error: function(xhr, type, errorThrown) {
-                                        isPay = true;
-                                        console.log(xhr);
-                                        mui(th).button('reset');
-                                        mui.alert("请检查网络或刷新页面重试!")
-                                    }
-                                })
-                            } else {
-                                isPay = true;
-                                mui(th).button('reset');
-                                mui.alert("对不起,支付失败!请稍后重试!")
-                            }
-                        })
-                    } else {
-                        mui(th).button('reset');
-                        mui.alert(dt.message)
-                    }
-                    }
-                },
-                error: function(xhr, type, errorThrown) {
-                    isPay = true;
-                    console.log(xhr);
-                    mui(th).button('reset');
-                    mui.alert("请检查网络或刷新页面重试!")
-                }
-            })
-        } else {
-            mui.alert("正在请求支付中~~请稍后!");
-            return
-        }
-    });
-    var addTimer = function() {
-        var list = [],
-            interval;
-        return function(id, time) {
-            if(!interval) {
-                interval = setInterval(go, 1000)
-            }
-            list.push({
-                ele: document.getElementById(id),
-                time: time
-            })
-        };
+			var isPay = true;
+			mui('body').on('tap', '.try-btn-pay', function() {
+				var th = this;
+				if(isPay) {
+					mui(this).button('loading');
+					isPay = false;
+					$.ajax({
+						type: 'post',
+						url: base_path + '/probation/pay',
+						data: {
+							"orderId": th.getAttribute("proid")
+						},
+						dataType: 'json',
+						timeout: 15000,
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						success: function(dt) {
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.status) {
+									var obj = JSON.parse("{" + dt.data.info + "}");
+									WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+										if(res.err_msg == 'get_brand_wcpay_request:ok') {
+											$.ajax({
+												type: 'post',
+												url: base_path + '/probation/check_probation_pay_success',
+												data: {
+													"orderId": th.getAttribute("proid")
+												},
+												dataType: 'json',
+												timeout: 15000,
+												xhrFields: {
+													withCredentials: true
+												},
+												crossDomain: true,
+												success: function(data) {
+													if(dt.isRedirect) {
+														location.href = dt.redirectURL;
+													} else {
+														if(data.status) {
+															if(data.data == 5) {
+																mui.alert("支付成功", '', function() {
+																	mui.openWindow({
+																		url: base_path + '/probation/try_order?orderId=' + th.getAttribute("proid")
+																	})
+																})
+															} else {
+																mui.alert(data.message, '', function() {
+																	mui(th).button('reset')
+																})
+															}
+														} else {
+															mui(th).button('reset');
+															mui.alert(data.message)
+														}
+													}
+												},
+												error: function(xhr, type, errorThrown) {
+													isPay = true;
+													console.log(xhr);
+													mui(th).button('reset');
+													mui.alert("请检查网络或刷新页面重试!")
+												}
+											})
+										} else {
+											isPay = true;
+											mui(th).button('reset');
+											mui.alert("对不起,支付失败!请稍后重试!")
+										}
+									})
+								} else {
+									mui(th).button('reset');
+									mui.alert(dt.message)
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							isPay = true;
+							console.log(xhr);
+							mui(th).button('reset');
+							mui.alert("请检查网络或刷新页面重试!")
+						}
+					})
+				} else {
+					mui.alert("正在请求支付中~~请稍后!");
+					return
+				}
+			});
+			var addTimer = function() {
+				var list = [],
+					interval;
+				return function(id, time) {
+					if(!interval) {
+						interval = setInterval(go, 1000)
+					}
+					list.push({
+						ele: document.getElementById(id),
+						time: time
+					})
+				};
 
-        function go() {
-            for(var i = 0; i < list.length; i += 1) {
-                list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
-                if(!list[i].time) {
-                    list.splice(i--, 1)
-                }
-            }
-        }
+				function go() {
+					for(var i = 0; i < list.length; i += 1) {
+						list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
+						if(!list[i].time) {
+							list.splice(i--, 1)
+						}
+					}
+				}
 
-        function getTimerString(time) {
-            d = Math.floor(time / 86400), h = Math.floor((time % 86400) / 3600), m = Math.floor(((time % 86400) % 3600) / 60), s = Math.floor(((time % 86400) % 3600) % 60);
-            if(time > 0) {
-                return d + "天" + h + "时" + m + "分" + s + "秒"
-            } else {
-                return "试用已结束"
-            }
-        }
-    }();
-	$(document).on('tap', '#center-menu>li', function() {
-		var href = $(this).attr("href");
-		location.href =href;
-	});
-    $(document).on('tap', '.see-rights', function() {
-        location.href ='member_benefits.html';
-    });
+				function getTimerString(time) {
+					d = Math.floor(time / 86400), h = Math.floor((time % 86400) / 3600), m = Math.floor(((time % 86400) % 3600) / 60), s = Math.floor(((time % 86400) % 3600) % 60);
+					if(time > 0) {
+						return d + "天" + h + "时" + m + "分" + s + "秒"
+					} else {
+						return "试用已结束"
+					}
+				}
+			}();
+			$(document).on('tap', '#center-menu>li', function() {
+				var href = $(this).attr("href");
+				location.href = href;
+			});
+			$(document).on('tap', '.see-rights', function() {
+				location.href = 'member_benefits.html';
+			});
+			// 弹窗
+			$(document).on('tap', '.join-vip', function() {
+				var type = $(".vip-note").attr('type');//1:成为会员  2:完善信息  3:会员权益
+				if(type == 1 || type == 2){
+					$('.dalog').show();
+				}else{
+					location.href='vip-equity.html';
+				}
+			});
+			// 关闭弹窗
+			$(document).on('tap', '.icon-guanbi', function() {
+				$('.dalog').hide();
+			});
+			// 成为会员
+			$(document).on('tap', '.btn-see-integral', function() {
+				var type = $(".vip-note").attr('type');
+				if(type == 1 || type == 2){	
+					location.href='register-vip.html';
+				}
+			});
+			// 积分
+			$(document).on('tap', '.go-integral-center', function() {
+				location.href='integral-center.html';
+			});
+			// 券包
+			$(document).on('tap', '.go-coupon-bag', function() {
+				location.href='coupon_bag1.html?type=1';
+			});
+			// 券包
+			$(document).on('tap', '.go-coupon-bag-2', function() {
+				location.href='coupon_bag1.html?type=2';
+			});
+		</script>
+	</body>
 
-</script>
-</body>
-</html>
+</html>