5 years ago · e221b49039
--- a/watero/20190512.html
+++ b/watero/20190512.html
@@ -150,10 +150,7 @@ $(window).ajaxStop(function(){
 
				 									console.log(dt)
			
 
				 									if(dt.resultCode == "200") {
			
 
				 										$(".loading").hide().css("opacity", "0");
			
 
				-										mui.alert('哎呀，您来晚了，别伤心，你写给妈妈的爱，已参与“妈妈的三行情书”评选征集，还有机会获得美丽大奖哦，祝你好运。', '确定', function() {
			
 
				-											location.reload();
			
 
				-										});
			
 
				-										return false;
			
 
				+										location.reload();
			
 
				 									} else {
			
 
				 										$(".loading").hide().css("opacity", "0");
			
 
				 										mui.alert(dt.message);
			
@@ -240,10 +237,6 @@ $(window).ajaxStop(function(){
 
				 								$(".message-box").addClass("box-shadow").html('<img src="http://w.iamberry.com/watero/' + dt.data.mothMovaImgUrl + '"><div class="mui-text-center mui-content-padded" style="color: #da4b79;">长按图片保存分享</div><h6 class="mui-text-center">在法律许可范围内本次活动最终解释权归爱贝源所有</h6>');
			
 
				 							}
			
 
				 						} else {
			
 
				-							if(dt.data.userStatus != 2){
			
 
				-								location.href = "watero_code.html";
			
 
				-								return false;
			
 
				-							}
			
 
				 							if(dt.status == false) {
			
 
				 								$("#headDiv").prop('src', dt.data.userHead);
			
 
				 								$("#userNickname").text(decodeURI(dt.data.userNickname));
			
--- a/watero/20190618.html
+++ b/watero/20190618.html
@@ -49,13 +49,6 @@
 
				 			.no-after .mui-table-view-cell.mui-active{background: #fff;}
			
 
				 			.pro-list .mui-media-body{font-size: 14px;}
			
 
				 		</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;">
			
@@ -183,6 +176,7 @@
 
				 		<script src="js/mui.min.js"></script>
			
 
				 		<script src="js/jquery-2.1.1.min.js"></script>
			
 
				 		<script src="js/main.js"></script>
			
 
				+		<script src="js/page/wechat-utils-1.0.js"></script>
			
 
				 	</body>
			
 
				 	<script>
			
 
				 		//ajax loading
			
@@ -196,8 +190,26 @@
 
				 			location.href = 'chanpin_list_20190618.html?proType=16';
			
 
				 		});
			
 
				 		mui.ready(function() {
			
 
				+			fenxiang();
			
 
				 			$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
			
 
				 		});
			
 
				+		//分享		
			
 
				+		function fenxiang() {
			
 
				+				var src = location.href;
			
 
				+				window.wxFriend = {
			
 
				+					"appId": "",
			
 
				+					"imgUrl": '//s.iamberry.com/watero/wechat/images/618share.jpg',
			
 
				+					"link": src,
			
 
				+					"desc": '618年中大促，全场惊喜价，买就送，满就减',
			
 
				+					"title": 'WaterO水时代',
			
 
				+					"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+					"shareTimeSuccess": "分享成功",
			
 
				+					"shareTimeCancel": "已取消分享",
			
 
				+					"shareAppSuccess": "分享成功!",
			
 
				+					"shareAppCancel": "已取消分享"
			
 
				+				};
			
 
				+				getConfig();
			
 
				+		}
			
 
				 	</script>
			
 
				 
			
 
				 </html>
			
--- a/watero/20190807.html
+++ b/watero/20190807.html
@@ -0,0 +1,354 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+
			
 
				+	<head>
			
 
				+		<meta charset="UTF-8">
			
 
				+		<title>WaterO</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>
			
 
				+			/*loading*/
			
 
				+			
			
 
				+			.loading {
			
 
				+				width: 100%;
			
 
				+				height: 100%;
			
 
				+				position: fixed;
			
 
				+				top: 0;
			
 
				+				padding-top: 50%;
			
 
				+				left: 0;
			
 
				+				background: rgba(0, 0, 0, 0.8);
			
 
				+				z-index: 999;
			
 
				+			}
			
 
				+			
			
 
				+			.loading-bj {
			
 
				+				background: url(images/loading.png);
			
 
				+				width: 20px;
			
 
				+				height: 20px;
			
 
				+				background-size: 20px;
			
 
				+				margin: 0.3rem auto 0;
			
 
				+				animation: rotateIn 1s .2s linear infinite;
			
 
				+				-moz-animation: rotateIn 1s .2s linear infinite;
			
 
				+				-webkit-animation: rotateIn 1s .2s linear infinite;
			
 
				+			}
			
 
				+			
			
 
				+			.loading p {
			
 
				+				color: #fff;
			
 
				+				opacity: .7;
			
 
				+				font-size: 12px;
			
 
				+				text-align: center;
			
 
				+				margin-top: 0.1rem;
			
 
				+			}
			
 
				+			
			
 
				+			.index-title {
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+			
			
 
				+			.no-after:after,
			
 
				+			.no-after:before,
			
 
				+			.no-after .mui-table-view-cell:after {
			
 
				+				display: none;
			
 
				+			}
			
 
				+			
			
 
				+			.no-after .mui-table-view-cell.mui-active {
			
 
				+				background: #fff;
			
 
				+			}
			
 
				+			
			
 
				+			.pro-list .mui-media-body {
			
 
				+				font-size: 14px;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order tr td:last-child {
			
 
				+				padding-right: 0;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order {
			
 
				+				font-size: 12px;
			
 
				+			}
			
 
				+			
			
 
				+			.cl-red {
			
 
				+				color: #ec6276;
			
 
				+			}
			
 
				+			
			
 
				+			.wh-120 {
			
 
				+				width: 130px !important;
			
 
				+				max-width: 130px !important;
			
 
				+				height: 130px !important;
			
 
				+				line-height: 130px;
			
 
				+				margin-top: 0;
			
 
				+				overflow: hidden;
			
 
				+				margin-right: 10px;
			
 
				+			}
			
 
				+			
			
 
				+			.wh-120 img {
			
 
				+				width: 100%;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order .btn-ping {
			
 
				+				background: #ec6276;
			
 
				+				border: 0;
			
 
				+				border-radius: 50px;
			
 
				+				color: #fff;
			
 
				+				min-width: 70px;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order .btn-qiang {
			
 
				+				background: #ec6276;
			
 
				+				border: 0;
			
 
				+				border-radius: 50px;
			
 
				+				color: #fff;
			
 
				+				min-width: 70px;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+			.my-table-order .btn-qiang[disabled]{
			
 
				+				background: #ccc;
			
 
				+			}
			
 
				+			.my-table-order h4 {
			
 
				+				margin: 0;
			
 
				+				font-size: 14px;
			
 
				+				font-weight: 500;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order h6 {
			
 
				+				margin: 0;
			
 
				+				color: #999;
			
 
				+			}
			
 
				+			
			
 
				+			.my-table-order .yf {
			
 
				+				padding-bottom: 15px;
			
 
				+			}
			
 
				+			
			
 
				+			.time-out {
			
 
				+				color: #ec6276;
			
 
				+			}
			
 
				+			
			
 
				+			.qixi {
			
 
				+				border: 1px solid #5ecddf;
			
 
				+				border-radius: 30px;
			
 
				+				color: #5ecddf;
			
 
				+				background: transparent;
			
 
				+				display: block;
			
 
				+				width: 70px;
			
 
				+				padding: 0;
			
 
				+				line-height: 1.5;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-col-xs-4 img {
			
 
				+				width: 100%;
			
 
				+				padding: 0 3%;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-col-xs-4:first-child img {
			
 
				+				padding-right: 6%;
			
 
				+				padding-left: 0;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-col-xs-4:last-child img {
			
 
				+				padding-left: 6%;
			
 
				+				padding-right: 0;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-col-xs-4 a s {
			
 
				+				color: #999;
			
 
				+				margin-left: 10px;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-col-xs-4 .content {
			
 
				+				padding-right: 5%;text-align:center;
			
 
				+			}
			
 
				+			
			
 
				+			.mui-table-view>.mui-table-view-cell {
			
 
				+				padding: 11px 13px;
			
 
				+			}
			
 
				+			.mui-table-view>.mui-table-view-cell>a.mui-active{background: #fff;}
			
 
				+			.mui-table-view-striped>.mui-table-view-cell {
			
 
				+				padding: 5px 12px;
			
 
				+			}
			
 
				+			.btn-qiang{background: #ec6276;color: #fff;border-radius: 25px;border: 0;min-width: 60px;text-align: center;position: absolute;right: 3%;bottom: 14%;display: none;}
			
 
				+		</style>
			
 
				+	</head>
			
 
				+
			
 
				+	<body style="background: #fff;">
			
 
				+		<div class="loading covers">
			
 
				+			<div class="loading-bj"></div>
			
 
				+			<p>正在加载...</p>
			
 
				+		</div>
			
 
				+		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+			<a class="mui-tab-item mui-active">
			
 
				+				<div class="iconfont icon-shouye"></div>
			
 
				+				<span class="mui-tab-label">首页</span>
			
 
				+			</a>
			
 
				+			<a class="mui-tab-item go_gwc">
			
 
				+				<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">
			
 
				+				<div class="iconfont icon-wode"></div>
			
 
				+				<span class="mui-tab-label">我的</span>
			
 
				+			</a>
			
 
				+		</nav>
			
 
				+		<div class="mui-content" style="background: #fff;">
			
 
				+			<!--banner 开始-->
			
 
				+			<div class="swiper-container">
			
 
				+				<div class="swiper-wrapper">
			
 
				+					<div class="swiper-slide"><img width="100%" src="images/2019072901.jpg" /></div>
			
 
				+				</div>
			
 
				+				<!-- 如果需要分页器 -->
			
 
				+				<div class="swiper-pagination mui-text-center"></div>
			
 
				+			</div>
			
 
				+			<!--banner 结束-->
			
 
				+
			
 
				+			<div style="background: #faf5f5;clear: both;position: relative;padding:16px 14px 12px 14px;">
			
 
				+				<div style="background: #fff;margin:0;padding: 10px 0;">
			
 
				+					<div class="index-title">
			
 
				+						<strong>2人成团</strong>
			
 
				+					</div>
			
 
				+					<table>
			
 
				+						<tr>
			
 
				+							<td proid="66" colorid="49" class="go_chanpin_details">
			
 
				+								<img width="100%" src="images/2019080601.jpg" />
			
 
				+							</td>
			
 
				+							<td proid="71" colorid="55" class="go_chanpin_details">
			
 
				+								<img width="100%" src="images/2019080602.jpg" />
			
 
				+							</td>
			
 
				+							<td proid="60" colorid="42" class="go_chanpin_details">
			
 
				+								<img width="100%" src="images/2019080603.jpg" />
			
 
				+							</td>
			
 
				+						</tr>
			
 
				+					</table>
			
 
				+				</div>
			
 
				+			</div>
			
 
				+			
			
 
				+			<div style="background: #faf5f5;padding:5px 14px;">
			
 
				+				<div style="background: #fff;padding: 10px 0;position: relative;">
			
 
				+					<div class="index-title">
			
 
				+				<strong>限时抢购</strong>
			
 
				+			</div>
			
 
				+			<img proid="61" colorid="43" class="go_chanpin_details" width="100%" src="images/2019080607.png" />
			
 
				+			<div style="position: absolute;bottom: 16%;left: 42%;">
			
 
				+					<span class="iconfont icon-naozhong cl-red"></span><span class="time-out" id="showtime">00:00:00</span>
			
 
				+				</div>
			
 
				+				<button type="button" class="mui-btn btn-qiang">抢购</button>
			
 
				+				</div>
			
 
				+			</div>
			
 
				+			
			
 
				+			<div style="background: #faf5f5;padding:12px 14px 16px 14px;">
			
 
				+				<div style="background: #fff;padding-top: 10px;">
			
 
				+					<div class="index-title">
			
 
				+				<strong>买净水机送好礼</strong>
			
 
				+			</div>
			
 
				+			<img width="100%" src="images/2019080102.png" />
			
 
				+				</div>
			
 
				+			</div>
			
 
				+			
			
 
				+			<div style="padding: 10px 0;">
			
 
				+				<div class="index-title">
			
 
				+				<strong>价格直降</strong><div style="position: absolute;right: 10px;top: 5px;" class="go_web_shop"><span>更多</span><font class="mui-icon mui-icon-arrowright" style="font-size: 18px;font-weight: bold;"></font></div>
			
 
				+				</div>
			
 
				+				<table>
			
 
				+					<tr>
			
 
				+						<td proid="34" colorid="2" class="go_chanpin_details">
			
 
				+							<img width="100%" src="images/2019080604.jpg" />
			
 
				+						</td>
			
 
				+						<td proid="58" colorid="40" class="go_chanpin_details">
			
 
				+							<img width="100%" src="images/2019080605.jpg" />
			
 
				+						</td>
			
 
				+						<td proid="38" colorid="5" class="go_chanpin_details">
			
 
				+							<img width="100%" src="images/2019080606.jpg" />
			
 
				+						</td>
			
 
				+					</tr>
			
 
				+				</table>
			
 
				+			</div>
			
 
				+			<br />
			
 
				+		</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>
			
 
				+	</body>
			
 
				+	<script>
			
 
				+		//ajax loading
			
 
				+		$(window).ajaxStart(function() {
			
 
				+			$(".covers").show();
			
 
				+		});
			
 
				+		$(window).ajaxStop(function() {
			
 
				+			$(".covers").hide();
			
 
				+		});
			
 
				+		$(document).on('tap', '.go', function() {
			
 
				+			location.href = '';
			
 
				+		});
			
 
				+		mui.ready(function() {
			
 
				+			getCartNum();
			
 
				+			fenxiang();
			
 
				+			//活动倒计时
			
 
				+			var date = new Date('2019/08/12 00:00:00');//活动截止如期 2019-08-13 0:00:00
			
 
				+			let countdown = () => {
			
 
				+				let showtime = dc('showtime')
			
 
				+				let now = new Date().getTime();
			
 
				+				
			
 
				+				let end = date.getTime();
			
 
				+				let last_time = end - now;
			
 
				+				if(now - end > 0) {
			
 
				+					//抢购活动结束
			
 
				+					$("#showtime").text("抢购已结束").css("font-size", "10px");
			
 
				+					//location.href='index.html';
			
 
				+				} else {
			
 
				+					const px_d = 1000 * 60 * 60 * 24;
			
 
				+					const px_h = 1000 * 60 * 60;
			
 
				+					const px_m = 1000 * 60;
			
 
				+					const px_s = 1000;
			
 
				+					let d = Math.floor(last_time / px_d);
			
 
				+					let h = Math.floor((last_time - d * px_d) / px_h);
			
 
				+					let m = Math.floor((last_time - d * px_d - h * px_h) / px_m);
			
 
				+					let s = Math.floor((last_time - d * px_d - h * px_h - m * px_m) / px_s);
			
 
				+					let html = ``
			
 
				+					if(now>1565539200000 && now<1565625600000){	
			
 
				+						date = new Date('2019/08/13 00:00:00');
			
 
				+						html = `${h}时${m}分${s}秒`
			
 
				+						$('.btn-qiang').show();
			
 
				+					}else if(now>1565625600000){
			
 
				+						html = `已结束，请下次尽早参与活动.`
			
 
				+						$('.btn-qiang').hide();
			
 
				+					}else{
			
 
				+						html = `待开始${d}天${h}时${m}分${s}秒`
			
 
				+					}
			
 
				+					showtime.innerHTML = html;
			
 
				+					clearTimeout();
			
 
				+				}
			
 
				+			}
			
 
				+			setInterval(function() {
			
 
				+				countdown();
			
 
				+			}, 1000)
			
 
				+			
			
 
				+			$(".loading").hide().css("opacity", "0"); //隐藏（正在加载...）
			
 
				+		});
			
 
				+		
			
 
				+		//分享		
			
 
				+		function fenxiang() {
			
 
				+			var src = location.href;
			
 
				+			window.wxFriend = {
			
 
				+				"appId": "",
			
 
				+				"imgUrl": 'https://s.iamberry.com/watero/wechat/images/2019080701.jpg',
			
 
				+				"link": src,
			
 
				+				"desc": '二人成团，惊喜折扣。更多好礼等你来',
			
 
				+				"title": '情定七夕，钜惠好礼',
			
 
				+				"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+				"shareTimeSuccess": "分享成功",
			
 
				+				"shareTimeCancel": "已取消分享",
			
 
				+				"shareAppSuccess": "分享成功!",
			
 
				+				"shareAppCancel": "已取消分享"
			
 
				+			};
			
 
				+			getConfig();
			
 
				+		}
			
 
				+	</script>
			
 
				+
			
 
				+</html>
			
--- a/watero/after_service_watero.html
+++ b/watero/after_service_watero.html
@@ -1,4 +1,4 @@
 
				-!DOCTYPE html>
			
 
				+<!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
 
				 	<meta charset="UTF-8">
			
--- a/watero/cash_log.html
+++ b/watero/cash_log.html
@@ -25,7 +25,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -37,7 +37,7 @@
 
				 		<span class="mui-tab-label">我的订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">会员中心</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/chanpin_details.html
+++ b/watero/chanpin_details.html
@@ -40,18 +40,41 @@
 
				 		</div>
			
 
				 
			
 
				 		<div class="food-tt">
			
 
				-			<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
			
 
				+			<div><font id="product-name-font">加载中...</font>
			
 
				 			</div>
			
 
				 			<div class="share_wechat">
			
 
				-				<span class="iconfont icon-fenxiang ft-18"></span>
			
 
				-				<div class="ft-12">分享</div>
			
 
				+				<span class="iconfont icon-lease8 ft-18"></span>
			
 
				 			</div>
			
 
				 		</div>
			
 
				 		<div class="price-box">
			
 
				-			<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="del-s" id="product-access-span">1W人已购买</span></div>
			
 
				+			<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="yishou" id="product-access-span">已售13233件</span></div>
			
 
				+		</div>
			
 
				+		<div class="mui-content-padded">
			
 
				+		<div class="mui-table">
			
 
				+			<div class="mui-table-cell mui-col-xs-4 table-middle mui-text-left"><h6>全场包邮</h6></div>
			
 
				+			<div class="mui-table-cell mui-col-xs-4 table-middle mui-text-center"><h6>7天退换</h6></div>
			
 
				+			<div class="mui-table-cell mui-col-xs-4 table-middle mui-text-right"><h6>极速发货</h6></div>
			
 
				+		</div>	
			
 
				+		
			
 
				 		</div>
			
 
				-
			
 
				 		<div class="chanpin-ditails-dic">
			
 
				+			<!--<div class="friend-ping">
			
 
				+				<div style="padding-bottom: 10px;">好友正在拼单</div>
			
 
				+				<div class="mui-table">
			
 
				+					<div class="mui-table-cell mui-col-xs-2 table-middle">
			
 
				+						<img class="userHeader" src="images/image-12.jpg" />
			
 
				+					</div>
			
 
				+					<div class="mui-table-cell mui-col-xs-3 table-middle mui-text-center">
			
 
				+						<span id="userNickname">WechatName</span>
			
 
				+					</div>
			
 
				+					<div class="mui-table-cell mui-col-xs-4 table-middle mui-text-right">
			
 
				+						还差<span class="cl-red">1</span>人拼成
			
 
				+					</div>
			
 
				+					<div class="mui-table-cell mui-col-xs-3 table-middle mui-text-right">
			
 
				+						<button type="button" class="mui-btn btn-ping" id="btn-ping-1">去拼单</button>
			
 
				+					</div>
			
 
				+				</div>
			
 
				+			</div>-->
			
 
				 			<ul>
			
 
				 				<!-- 产品参数图 -->
			
 
				 				<li id="product-param-img"></li>
			
@@ -71,10 +94,13 @@
 
				 <ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no">
			
 
				 <li class="mui-table-view-cell">
			
 
				 <div class="mui-table">
			
 
				-<div class="mui-table-cell mui-col-xs-4 table-middle cart">
			
 
				+<!--<div class="mui-table-cell mui-col-xs-4 table-middle cart">
			
 
				 <span class="iconfont icon-gouwuche"></span>
			
 
				 <div>购物车</div>
			
 
				 <span class="mui-badge my-badge-danger" style="display: inline;">0</span>
			
 
				+</div>-->	
			
 
				+<div class="mui-table-cell mui-col-xs-4 table-middle go-home">
			
 
				+	<img src="images/logo.png" />
			
 
				 </div>
			
 
				 <div class="mui-table-cell mui-col-xs-4 table-middle div-btn-buy-cart" id="add-cart-div">加入购物车</div>
			
 
				 <div class="mui-table-cell mui-col-xs-4 table-middle div-btn-buy-know" id="shopp-div">立即购买</div>
			
@@ -90,9 +116,9 @@
 
				 		<div id="shopp-div" >立即购买</div>
			
 
				 	</div>-->
			
 
				 </div>
			
 
				-<!--<div class="cart_fixed go_gwc">
			
 
				+<div class="cart_fixed go_gwc">
			
 
				 	<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
			
 
				-</div>-->
			
 
				+</div>
			
 
				 <div class="return">
			
 
				 	<span onClick="gotoTop();return false;" class="mui-icon-extra mui-icon-extra-top"></span>
			
 
				 </div>
			
--- a/watero/chanpin_list.html
+++ b/watero/chanpin_list.html
@@ -35,6 +35,12 @@
 
				         window.hiddenAllWechatMenu = true;
			
 
				 	</script>
			
 
				 </head>
			
 
				+<script>
			
 
				+	var d = new Date().getTime(); //当前时间戳
			
 
				+	if (d > 1558627200000 && d <= 1560873599000) {
			
 
				+		location.href = "chanpin_list_20190618.html";
			
 
				+	}
			
 
				+</script>
			
 
				 <body>
			
 
				 <div class="loading-bg">
			
 
				 	<div class="mui-loading">
			
@@ -45,7 +51,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -57,7 +63,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
@@ -75,10 +81,10 @@
 
				 </header>-->
			
 
				 <div class="mui-segmented-control tab-with-chanpin-list">
			
 
				 	<a class="mui-control-item mui-active">
			
 
				-		<span class="mui-tab-label">经典款净水机</span>
			
 
				+		<span class="mui-tab-label">Aiberle</span>
			
 
				 	</a>
			
 
				 	<a class="mui-control-item">
			
 
				-		<span class="mui-tab-label">制氢款净水机</span>
			
 
				+		<span class="mui-tab-label">WaterO</span>
			
 
				 	</a>
			
 
				 </div>
			
 
				 <!--下拉刷新容器-->
			
--- a/watero/chanpin_list_20190618.html
+++ b/watero/chanpin_list_20190618.html
@@ -51,7 +51,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -63,7 +63,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/clearing.html
+++ b/watero/clearing.html
@@ -191,8 +191,17 @@
 
				     var exchangeColorId='';
			
 
				     var t1=0,t2=0,all_t=0;
			
 
				     var user38Interests=2;
			
 
				-
			
 
				+    var isSpell=getParam('isSpell');
			
 
				+    var orderId=getParam('orderId');
			
 
				+    var isSpellstr='';
			
 
				+    var productId='';
			
 
				+    var colorId='';
			
 
				+    
			
 
				+								
			
 
				     mui.ready(function() {
			
 
				+    	if(isSpell==1){
			
 
				+			isSpellstr='&isSpell=1';								
			
 
				+		}
			
 
				         var name,value;
			
 
				         var str=location.href; //取得整个地址栏
			
 
				         var num=str.indexOf("?")
			
@@ -222,8 +231,9 @@
 
				                     }
			
 
				                     var yhq_str = "";
			
 
				                     if(dt.data.couponItems.length == 0 || !dt.data.disable) {
			
 
				-                        $(".forward").hide();
			
 
				+                        $(".forward").hide();$("#vipSub").hide();
			
 
				                     } else {
			
 
				+                    	if(isSpell!=1){
			
 
				                         //如果购买商品只有饮水机滤芯，则不能使用优惠券
			
 
				 						var c=0,flag=false;
			
 
				                         var btnArray = ['否', '是'];
			
@@ -309,7 +319,6 @@
 
				                                             $("#yhq_name").html(yhq_check.prev().html());
			
 
				                                             $("#yhq_price").html("免费兑换1支T1或T2滤芯");
			
 
				                                             $("#accSub,#accSub>div:first-child").show();
			
 
				-                                            console.log(yhq_val)
			
 
				                                             if($(".dhq-last-add").length>0){
			
 
				                                                 yhq_val = 0;
			
 
				                                             }
			
@@ -363,18 +372,32 @@
 
				 								$("#forward input[couponid=10001]").removeAttr('checked').prop("disabled","disabled");
			
 
				 							}
			
 
				                         }
			
 
				+                    }else{
			
 
				+                    	$(".forward").hide();$("#vipSub").hide();
			
 
				+                    	productId=dt.data.cartItems[0].cartProductId;
			
 
				+                    	colorId=dt.data.cartItems[0].cartColorId;
			
 
				                     }
			
 
				-                    for(var i = 0; i < dt.data.cartItems.length; i++) {
			
 
				+                    }
			
 
				+              
			
 
				+                    for(let i = 0; i < dt.data.cartItems.length; i++) {
			
 
				                     	pro_all_count+=dt.data.cartItems[i].cartNum;
			
 
				                     	// 购物车小计,分--元
			
 
				-                        var total = dt.data.cartItems[i].cartNum * dt.data.cartItems[i].productPrice / 100; 
			
 
				-                        var pro_color = switchcolor(dt.data.cartItems[i].cartColorId);
			
 
				-                        var colorImg = switchColorImg(dt.data.cartItems[i].cartColorId);
			
 
				-                        total = total.toFixed(2); // 保留两位小数
			
 
				-                        var productId = dt.data.cartItems[i].cartProductId;
			
 
				-                        var colorId=dt.data.cartItems[i].cartColorId;
			
 
				-                        var price = dt.data.cartItems[i].productPrice;
			
 
				-                        var num = dt.data.cartItems[i].cartNum;
			
 
				+                        let total = dt.data.cartItems[i].cartNum * dt.data.cartItems[i].productPrice / 100; 
			
 
				+                        let pro_color = switchcolor(dt.data.cartItems[i].cartColorId);
			
 
				+                        let colorImg = switchColorImg(dt.data.cartItems[i].cartColorId);
			
 
				+                        let cartProductId = dt.data.cartItems[i].cartProductId;
			
 
				+                        let colorId=dt.data.cartItems[i].cartColorId;
			
 
				+                        let productPrice = dt.data.cartItems[i].productPrice;
			
 
				+                            if(isSpell==1){
			
 
				+                            	total = dt.data.cartItems[i].cartNum * dt.data.cartItems[i].colorSpellAmount / 100; 
			
 
				+                            	if(this.productIsSpell==2){
			
 
				+                            		 productPrice=dt.data.cartItems[i].colorSpellAmount;
			
 
				+                            	}else{
			
 
				+                            		 productPrice=dt.data.cartItems[i].productPrice;
			
 
				+                            	}
			
 
				+                            }
			
 
				+                        total = total.toFixed(2); // 保留两位小数    
			
 
				+                        let num = dt.data.cartItems[i].cartNum;
			
 
				                         if (dt.data.cartItems[i].productPrice / 100 == 3280) {
			
 
				                             liNote = liNote +
			
 
				                                 "<li class='mui-table-view-cell mui-media'>" +
			
@@ -384,7 +407,7 @@
 
				                                 "<div class='wt-space gwc_tit'>" + dt.data.cartItems[i].productName + "</div>" +
			
 
				                                 "<div><small class='mui-h6'>" + dt.data.cartItems[i].productColor + " x "+dt.data.cartItems[i].cartNum+"</small></div>"+
			
 
				                                 "</div>" +
			
 
				-                                "<div class='price_sp cl-gwc' id='product-" + productId + "' price='" + price + "'>¥" + total + "</div>"+
			
 
				+                                "<div class='price_sp cl-gwc' id='product-" + cartProductId + "' price='" + productPrice + "'>¥" + total + "</div>"+
			
 
				                                 "</a>" +
			
 
				                                 "</li>";
			
 
				                             cNum = cNum + num ;
			
@@ -398,7 +421,7 @@
 
				                                 "<div class='wt-space gwc_tit'>" + dt.data.cartItems[i].productName + "</div>" +
			
 
				                                 "<div><small class='mui-h6'>" + dt.data.cartItems[i].productColor + " x "+dt.data.cartItems[i].cartNum+"</small></div>"+
			
 
				                                 "</div>" +
			
 
				-                                "<div class='price_sp cl-gwc' id='product-" + productId + "' price='" + price + "'>¥" + total + "</div>"+
			
 
				+                                "<div class='price_sp cl-gwc' id='product-" + cartProductId + "' price='" + productPrice + "'>¥" + total + "</div>"+
			
 
				                                 "</a>" +
			
 
				                                 "</li>";
			
 
				                         }
			
@@ -436,7 +459,7 @@
 
				                     usePayMoney = accDiv(dt.data.payTotal, 100);
			
 
				                     $("#total").val(usePayMoney.toFixed(2) + " 元");
			
 
				                     $("#user-integral-span").html(dt.data.userIntegral);
			
 
				-                    if(dt.data.userIsVip==2){
			
 
				+                    if(dt.data.userIsVip==2 && isSpell!=1){
			
 
				                         $("#vip_price").text("- ¥"+(accVipSub).toFixed(2));
			
 
				                         $("#vipSub").show();
			
 
				                         usePayMoney-=accVipSub;
			
@@ -540,7 +563,7 @@
 
				                 }
			
 
				             },
			
 
				             error: function(xhr, type, errorThrown) {
			
 
				-                errorfn(xhr);
			
 
				+                console.log(xhr);
			
 
				             }
			
 
				         });
			
 
				         // 获取微信共享地址
			
@@ -569,38 +592,6 @@
 
				                 }
			
 
				             );
			
 
				         });
			
 
				-        // mui('body').on('tap', '#open-wechat-addres-a,#user-address-div', function() {
			
 
				-        //     editAddrV1(
			
 
				-        //         function(res) {
			
 
				-        //             // 用户成功拉出地址
			
 
				-        //             var address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
			
 
				-        //             wechatAddr.status = true;
			
 
				-        //             wechatAddr.detailInfo = address;
			
 
				-        //             wechatAddr.postalCode = res.postalCode;
			
 
				-        //             wechatAddr.userName = res.userName;
			
 
				-        //             wechatAddr.userTel = res.telNumber;
			
 
				-        //             wechatAddr.nationalCode = res.nationalCode;
			
 
				-        //
			
 
				-        //             $("#user-address-div").empty().append(
			
 
				-        //                 "收货人：" + wechatAddr.userName + "<span class='ml-5'>" + wechatAddr.userTel + "</span>" +
			
 
				-        //                 "<a>" +
			
 
				-        //                 "<p class='shipping_address wt-space'>" + wechatAddr.detailInfo + "<span class='mui-icon mui-icon-arrowright icon-r-c'></span></p>" +
			
 
				-        //                 "</a>");
			
 
				-        //             $("#user-address-div").show();
			
 
				-        //             $("#open-wechat-addres-a").hide();
			
 
				-        //         },
			
 
				-        //         function() {
			
 
				-        //             if($('#user-address-div').html() != null && $('#user-address-div').html() != '') {
			
 
				-        //                 wechatAddr.status = true;
			
 
				-        //             } else {
			
 
				-        //                 wechatAddr.status = false;
			
 
				-        //                 // 用户取消拉出地址
			
 
				-        //                 mui.alert("您没有选择收货地址!");
			
 
				-        //             }
			
 
				-        //         }
			
 
				-        //     );
			
 
				-        //
			
 
				-        // });
			
 
				 
			
 
				         // 积分数量改变时
			
 
				         mui('body').on('change', '#input-user-integral', function() {
			
@@ -627,7 +618,7 @@
 
				             temp = ((payTotal - (userInputIntegral * meonyProportion)) / 100).toFixed(2);
			
 
				             $("#user-pay-money-span").html(temp);
			
 
				         });
			
 
				-        // 去支付
			
 
				+        //去支付
			
 
				         mui('body').on('tap', '.btn-weixin-pay', function() {
			
 
				             //if($("#forward input[yhq_type=3]").prop("checked") && (((t1+all_t)==0 && t2<=2) || ((t2+all_t)==0 && t1<=2) || ((t1<=1 && t2==0) || (t1==0 && t2<=1)))){
			
 
				              //   if($(".dhq-last-add").is(":visible")){
			
@@ -676,9 +667,14 @@
 
				 //                  if($("#forward input[yhq_type=3]").prop("checked") && (((t1+all_t)==0 && t2<=2) || ((t2+all_t)==0 && t1<=2) || ((t1<=1 && t2==0) || (t1==0 && t2<=1)))){
			
 
				                         if($(".dhq-last-add").is(":visible")){
			
 
				                         	exchangeColorId=$(".dhq-dalog input[type=radio]:checked").val();
			
 
				-                        	console.log(exchangeColorId)
			
 
				                             dataArgs["exchangeColorId"] = exchangeColorId;
			
 
				                         }
			
 
				+                        if(isSpell==1){
			
 
				+                        	dataArgs['isSpell']=isSpell;
			
 
				+                        }
			
 
				+                        if(orderId!='' && orderId!=null){
			
 
				+                        	dataArgs['spellOrderId']=orderId;
			
 
				+                        }
			
 
				 //                  }
			
 
				                     $.ajax(base_path+'/order/pay', { // 提交订单,准备支付
			
 
				                         data: dataArgs,
			
@@ -700,8 +696,9 @@
 
				                                 isPay = true;
			
 
				                                 return;
			
 
				                             };
			
 
				+                           
			
 
				                             if(dt.data.info == "isOK") {
			
 
				-                            	location.href = 'pay_win.html?orderId=' + dt.data.orderId + "&dates=" + new Date().getTime();
			
 
				+                            	location.href = 'pay_win.html?orderId=' + dt.data.orderId + isSpellstr;
			
 
				                                 return;
			
 
				                             };
			
 
				 
			
@@ -734,7 +731,11 @@
 
				 														location.href = dataobj.redirectURL;
			
 
				 													} else {
			
 
				 														if(dataobj.status == true) { // 支付成功
			
 
				-															location.href = "pay_win.html?orderId=" + orderIds.orderId + "&dates=" + new Date().getTime();
			
 
				+															if(isSpell==1 && orderId==null){
			
 
				+																location.href='pay_add_group.html?productId='+productId+'&colorId='+colorId+'&orderid='+orderIds.orderId+'&isSpell=1'
			
 
				+															}else{
			
 
				+																location.href = "pay_win.html?orderId=" + orderIds.orderId
			
 
				+															}
			
 
				 														} else {
			
 
				 															setTimeout("checkOrderStatus('" + dt.data.orderId + "')", 1000); // 前往订单详情
			
 
				 														}
			
@@ -747,13 +748,13 @@
 
				                                     } else {
			
 
				                                         isPay = true;
			
 
				                                         // mui.alert("对不起，支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
			
 
				-                                        location.href = "order_details.html?orderId=" + dt.data.orderId + "&dates=" + new Date().getTime(); // 前往订单详情
			
 
				+                                        location.href = "order_details.html?orderId=" + dt.data.orderId + isSpellstr; // 前往订单详情
			
 
				                                     }
			
 
				                                 });
			
 
				                             } else {
			
 
				                                 isPay = true;
			
 
				                                 mui.alert(dt.message);
			
 
				-                                location.href = "order_details.html?orderId=" + dt.data.orderId + "&dates=" + new Date().getTime(); // 前往订单详情
			
 
				+                                location.href = "order_details.html?orderId=" + dt.data.orderId + isSpellstr; // 前往订单详情
			
 
				                             }
			
 
				                             }
			
 
				                         },
			
@@ -879,10 +880,15 @@
 
				 					location.href = dataobj.redirectURL;
			
 
				 				} else {
			
 
				 					if(dataobj.status == true) { // 支付成功
			
 
				-						location.href = "pay-win.html?orderId=" + dataobj.data + "&dates=" + new Date().getTime();
			
 
				+						if(isSpell==1 && orderId==null){
			
 
				+							location.href='pay_add_group.html?productId='+productId+'&colorId='+colorId+'&orderid='+dataobj.data+'&isSpell=1'
			
 
				+						}else{
			
 
				+							location.href = "pay_win.html?orderId=" + dataobj.data
			
 
				+						}
			
 
				 					} else {
			
 
				-						location.href = 'order_details.html?orderId=' + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
			
 
				+						location.href = 'order_details.html?orderId=' + orderId + isSpellstr; // 前往订单详情
			
 
				 					}
			
 
				+					
			
 
				 				}
			
 
				 			},
			
 
				 			error: function(xhr, type, errorThrown) {
			
--- a/watero/coupon.html
+++ b/watero/coupon.html
@@ -25,7 +25,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -37,7 +37,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/coupon_bag.html
+++ b/watero/coupon_bag.html
@@ -65,7 +65,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -77,7 +77,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item mui-active">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/coupon_dec.html
+++ b/watero/coupon_dec.html
@@ -45,7 +45,7 @@
 
				         document.querySelector('.loading-bg').style.display = 'none';
			
 
				     });
			
 
				     $(document).on('tap', '.go_coupon_bag', function() {
			
 
				-        location.href ='coupon_bag.html';
			
 
				+        location.href ='coupon_bag.html?tabindex=11';
			
 
				     });
			
 
				 </script>
			
 
				 </body>
			
--- a/watero/coupon_list.html
+++ b/watero/coupon_list.html
@@ -25,7 +25,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -37,7 +37,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/css/chanpin_details.css
+++ b/watero/css/chanpin_details.css
@@ -3,9 +3,9 @@
 
				 #item2{margin-bottom:65px;}
			
 
				 #tabbar-chanpin-details{position: fixed;top: 0;left: 0;z-index: 99;}
			
 
				 .cart_fixed{position: fixed;right: 30px;bottom:135px;background: rgba(0,0,0,.2);padding: 12px;border-radius: 50%;text-align: center;opacity: .5;}
			
 
				-.cart_fixed .mui-badge{position: absolute;right:-7px;top:-5px;font-size: 12px;}
			
 
				+.cart_fixed .mui-badge{position: absolute;right:0;top:0;font-size: 12px;}
			
 
				 .price-box{padding: 0 10px;background: #fff;}
			
 
				-.chanpin-ditails-dic img{width:100%;height:100%;}.return{position: fixed;right: 30px;bottom: 80px;background: rgba(0,0,0,.2);padding: 12px;border-radius: 50%;text-align: center;opacity: .9;color: #333;display: none;width: 48px;height: 48px;}
			
 
				+.chanpin-ditails-dic img{width:100%;}.return{position: fixed;right: 30px;bottom: 80px;background: rgba(0,0,0,.2);padding: 12px;border-radius: 50%;text-align: center;opacity: .9;color: #333;display: none;width: 48px;height: 48px;}
			
 
				 .cart_fixed {position: fixed;right: 30px;bottom: 135px;background: rgba(0,0,0,.2);padding: 12px;border-radius: 50%;text-align: center;opacity: .5;width: 48px;height: 48px;}
			
 
				 .buy-footer>div:first-child img {width: 55%;padding-top: 3px;}
			
 
				 .mui-bar-tab .my-grid-view-no {height: 100%;}
			
@@ -15,17 +15,34 @@
 
				 .cart {line-height: 1.1;}
			
 
				 .cart div {font-size: 12px;}
			
 
				 .cart .my-badge-danger {position: absolute;top: 3px;display: none;background: #63ccde;color: #fff;-webkit-transform: scale(.7);transform: scale(.7);}
			
 
				+.go-home{border-top: 1px solid rgba(0,0,0,.1)}
			
 
				+.go-home img{width: 65%;display: block;margin: 0 auto;}
			
 
				+.yishou{font-size: 12px;color: #5ecddf;position: absolute;right: 10px;}
			
 
				+.chanpin-ditails-dic{position: relative;}
			
 
				+.chanpin-ditails-dic:after{content: '';position: absolute;left: 10px;top: 0; right: 10px;height: 1px;background: #ccc;-webkit-transform: scaleY(.5);}
			
 
				 .div-btn-buy-cart {background-color: #bfe2e8;color: #fff;font-size: 16px;}
			
 
				 .div-btn-buy-know {background-color: #63ccde;color: #fff;font-size: 16px;}
			
 
				+.div-btn-buy{background-color: #eca75d;color: #fff;font-size: 16px;}
			
 
				+.div-btn-ping{background-color: #ec6276;color: #fff;font-size: 16px;}
			
 
				 .table-middle {vertical-align: middle;}
			
 
				 .my-picker{position: fixed;bottom: 0;padding-top: 0;max-height: 500px; left: 0;width: 100%;z-index: 999; background-color: #fff; -webkit-transform: translateY(100%);transform: translateY(100%); -webkit-transition: .5s;transition: .5s;}
			
 
				 .my-picker.active{-webkit-transform: translateY(0%);transform: translateY(0%);}
			
 
				 .my-picker .icon-guanbi{position: absolute;right:0;top:0;color: #999;font-size: 16px;padding: 10px;}
			
 
				 .my-picker .mui-numbox{border-radius: 25px;}
			
 
				+.my-picker .mui-table-view-cell.mui-active{background: #fff;}
			
 
				 .pro-select-color{padding: 3px 0;background: #f8f8f8;color: #999;border-radius: 15px;margin-right: 8px;margin-bottom: 15px; display: inline-block;width: 22.4%;text-align: center;}
			
 
				-.pro-select-color.active{background: #63ccde;color: #fff;}
			
 
				-.my-btn-block{font-size: 16px;display: block;width: 100%;margin-bottom:0;padding: 15px 0;border-radius: 0;}
			
 
				-.my-btn-buy-know{border: 0;background-color: #63ccde;color: #fff;}
			
 
				+.pro-select-color.active{background: #ec6276;color: #fff;}
			
 
				+.my-btn-add-cart{background: #eca75d;border: 0;border-radius: 0;color: #fff;}
			
 
				+.my-btn-add-cart:active{background-color: #eca75d !important;}
			
 
				+.my-btn-block{font-size: 16px;display: block;width: 100%;margin-bottom:0;padding: 15px 0;border-radius: 0 !important;}
			
 
				+.my-btn-buy-know{border: 0;background-color: #ec6276;color: #fff;}
			
 
				+.dalog-proPrice{color: #ec6276;}
			
 
				 .my-btn-buy-know:active{background-color: #f16071 !important;color: #fff;}
			
 
				+.my-btn-ping-know {background-color: #ec6276;color: #fff;font-size: 16px;border: 0;}
			
 
				+.my-btn-ping-know:active{background-color: #ec6276 !important;color: #fff;}
			
 
				 .share-dalog{background: rgba(0,0,0,.7);position: fixed;left: 0;top: 0;right: 0;bottom: 0;width: 100%;height: 100%;z-index: 99;display: none;}
			
 
				-.share-dalog img{width: 100%;}
			
 
				+.share-dalog img{width: 100%;}
			
 
				+.my-picker .mui-numbox input:disabled{-webkit-text-fill-color: #333;-webkit-opacity: 1;color: #333;}
			
 
				+.btn-ping{border-radius: 25px;background: #ec6276;border: 0;color: #fff;}
			
 
				+.friend-ping{display: none;}
			
 
				+.userHeader{width: 100%;border-radius: 50%;}
			
--- a/watero/css/iconfont.css
+++ b/watero/css/iconfont.css
@@ -1,14 +1,13 @@
 
				 @font-face {font-family: "iconfont";
			
 
				-  src: url('../fonts/iconfont.ttf?t=1551692351334') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
			
 
				+  src: url('../fonts/iconfont.ttf?t=1564364262479') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
			
 
				 }
			
 
				 
			
 
				 .iconfont {
			
 
				-	position: relative;
			
 
				-  font-family:"iconfont" !important;
			
 
				-  font-size:25px;
			
 
				-  font-style:normal;
			
 
				+  font-family: "iconfont" !important;
			
 
				+  font-size: 16px;
			
 
				+  font-style: normal;
			
 
				   -webkit-font-smoothing: antialiased;
			
 
				-  padding:0;
			
 
				+  -moz-osx-font-smoothing: grayscale;
			
 
				 }
			
 
				 
			
 
				 .icon-duigoukuang:before {
			
@@ -135,42 +134,14 @@
 
				   content: "\e71d";
			
 
				 }
			
 
				 
			
 
				-.icon-dingdan:before {
			
 
				-  content: "\e663";
			
 
				-}
			
 
				-
			
 
				-.icon-dingdan1:before {
			
 
				-  content: "\e664";
			
 
				-}
			
 
				-
			
 
				-.icon-gouwuche:before {
			
 
				-  content: "\e665";
			
 
				-}
			
 
				-
			
 
				-.icon-home:before {
			
 
				-  content: "\e666";
			
 
				-}
			
 
				-
			
 
				 .icon-share:before {
			
 
				   content: "\e667";
			
 
				 }
			
 
				 
			
 
				-.icon-home1:before {
			
 
				-  content: "\e668";
			
 
				-}
			
 
				-
			
 
				 .icon-vip1:before {
			
 
				   content: "\e669";
			
 
				 }
			
 
				 
			
 
				-.icon-gouwuche1:before {
			
 
				-  content: "\e66a";
			
 
				-}
			
 
				-
			
 
				-.icon-vip:before {
			
 
				-  content: "\e66b";
			
 
				-}
			
 
				-
			
 
				 .icon-wheel:before {
			
 
				   content: "\e66c";
			
 
				 }
			
@@ -367,10 +338,6 @@
 
				   content: "\e69a";
			
 
				 }
			
 
				 
			
 
				-.icon-shouye:before {
			
 
				-  content: "\e69c";
			
 
				-}
			
 
				-
			
 
				 .icon-tianjiadingdan:before {
			
 
				   content: "\e69d";
			
 
				 }
			
@@ -566,3 +533,35 @@
 
				 .icon-gehu:before {
			
 
				   content: "\e70e";
			
 
				 }
			
 
				+
			
 
				+.icon-shouqi:before {
			
 
				+  content: "\e70f";
			
 
				+}
			
 
				+
			
 
				+.icon-zhankai:before {
			
 
				+  content: "\e710";
			
 
				+}
			
 
				+
			
 
				+.icon-wode:before {
			
 
				+  content: "\e711";
			
 
				+}
			
 
				+
			
 
				+.icon-gouwuche:before {
			
 
				+  content: "\e713";
			
 
				+}
			
 
				+
			
 
				+.icon-shouye:before {
			
 
				+  content: "\e714";
			
 
				+}
			
 
				+
			
 
				+.icon-dingdan:before {
			
 
				+  content: "\e715";
			
 
				+}
			
 
				+
			
 
				+.icon-pindan:before {
			
 
				+  content: "\e716";
			
 
				+}
			
 
				+
			
 
				+.icon-naozhong:before {
			
 
				+  content: "\e712";
			
 
				+}
			
--- a/watero/css/mui.min.css
+++ b/watero/css/mui.min.css
--- a/watero/css/order_list.css
+++ b/watero/css/order_list.css
@@ -1,8 +1,8 @@
 
				 .mui-table-view-chevron .mui-table-view-cell {padding-right: 15px;}
			
 
				 .tab-with-orderlist{margin-top:0;z-index: 10;padding-top: 5px;}
			
 
				 .mui-bar-nav~.mui-content {padding-top: 107px;background: #fff;}
			
 
				-.mui-segmented-control .mui-control-item.mui-active {background-color: transparent !important;border-bottom: 2px solid #55c0dc !important;}
			
 
				-.mui-segmented-control .mui-control-item {line-height: 1;height: 50px;vertical-align: bottom;border: 0;border-bottom: 2px solid transparent;color:#333;background-color: transparent !important;padding-bottom: 3px;}
			
 
				+.mui-segmented-control .mui-control-item {line-height: 1;height: 50px;vertical-align: middle;border: 0;border-bottom: 2px solid transparent;color:#333;background-color: transparent !important;padding-bottom: 3px;}
			
 
				+.mui-segmented-control .mui-control-item.mui-active {background-color: transparent !important;border-bottom: 2px solid #55c0dc !important;color: #55c0dc;}
			
 
				 .tab-with-orderlist {background: #fff;border: 0;}
			
 
				 .my-scroll-order .mui-table-view:after{display:none;}
			
 
				 .go-index{float: inherit;}
			
--- a/watero/css/style.css
+++ b/watero/css/style.css
@@ -34,18 +34,13 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 .my-table-view:after{height: 0;}
			
 
				 .my-content-padded{overflow: hidden;}
			
 
				 .my-content-padded img{width: 100%;border-radius: 5px;}
			
 
				-.iconfont .mui-badge {font-size: 10px;line-height: 1.3;position: absolute;top:-3px;right: 28%;padding: 1px 5px;color: #fff;background:#55c0dc;}
			
 
				+.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 .mui-tab-label{font-size: 12px;}
			
 
				-/*#footer-bar .mui-tab-item{vertical-align: bottom;color:#a6c8ce;}*/
			
 
				-#footer-bar .mui-tab-item{vertical-align: bottom;color:#d5d5d5;}
			
 
				+#footer-bar .mui-tab-item{vertical-align: bottom;color:#d5d5d5;position: relative;}
			
 
				 #footer-bar .mui-tab-item.mui-active{color: #55c0dc;}
			
 
				-/*#footer-bar .mui-tab-item.mui-active{color: #24cae9;}*/
			
 
				-#footer-bar .mui-tab-item.mui-active .icon-home:before{content: "\e668";}
			
 
				-#footer-bar .mui-tab-item.mui-active .icon-gouwuche:before{content: "\e66a";}
			
 
				-#footer-bar .mui-tab-item.mui-active .icon-dingdan:before{content: "\e664";}
			
 
				-#footer-bar .mui-tab-item.mui-active .icon-vip:before{content: "\e669";}
			
 
				+#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;}
			
 
				 .loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}
			
 
				 .go-index{float: left;width: 32%;margin-right:1%;}
			
@@ -80,9 +75,10 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 .gwc-pp {color: #999;}
			
 
				 .ft-12 {font-size: 12px;}
			
 
				 .ft-13 {font-size: 12px;}
			
 
				-.price-sp {color: #e06974;font-size:16px;margin-right: 15px;}
			
 
				+.price-sp {color: #e06974;font-size:16px;margin-right: 12px;}
			
 
				 .shop-price{padding:0;text-align: left;}
			
 
				-.shop-price s{font-size: 12px;color: #d0d0d0;}
			
 
				+.shop-price s{font-size: 12px;color: #999;}
			
 
				+.mui-h6, h6{color: #999;}
			
 
				 .tab-with-chanpin-list {background: #fff;border: 0;margin-top: 55px;z-index: 10;}
			
 
				 .tab-with-chanpin-list .mui-control-item {
			
 
				     line-height: 1;
			
@@ -112,23 +108,23 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 
			
 
				 .btn-box{display: inline-block;position: absolute;right:0;bottom:12px;width:100%;text-align: left;padding-left:120px;}
			
 
				 #pullrefresh_chanpin_list .mui-grid-view .btn-box{position: relative;bottom: auto;right: auto; padding-left: 0;}
			
 
				-.my-btn-orange{background: #fff;border: 1px solid #55c0dc;border-radius:4px;color: #55c0dc;}
			
 
				+.my-btn-orange{background: #fffborder-radius:4px;color: #666;}
			
 
				 .my-btn-orange:active{background:#ffa13d !important;}
			
 
				 #pullrefresh_chanpin_list .my-btn-danger{width: 55%;}
			
 
				 .my-btn-danger{background: #55c0dc;border: 1px solid transparent;border-radius: 4px;color: #fff;padding: 6px 18px;margin-right: 8px;}
			
 
				+.my-btn-redP{background: #e06974;border: 1px solid transparent;border-radius: 25px;color: #fff;padding: 6px 12px;margin-right: 8px;}
			
 
				 #pullrefresh_chanpin_list .mui-grid-view .my-btn-danger{margin-right: 0;width: 70%;margin-bottom: 15px;}
			
 
				 .my-btn-danger:active{background: #236d89 !important;}
			
 
				 .my-btn-joincart{border:1px solid #55c0dc;color: #55c0dc;padding-left: 5px;padding-right:4px;font-size: 22px;}
			
 
				 #pullrefresh_chanpin_list .mui-grid-view .my-btn-joincart{float: right;margin-right: 4%;}
			
 
				 .mui-table-view-cell:after{left: 0;}
			
 
				 .mui-content>.mui-table-view:first-child{margin-top: 0;}
			
 
				-.food-tt {color: #333;padding: .5em 0;background: #fff;}
			
 
				+.food-tt {color: #333;padding:.8em 0 .5em 0;background: #fff;}
			
 
				 .food-tt>div:first-child {float:left;width: 78%;padding: 0 .8em;}
			
 
				-.food-tt>div:last-child {display: inline-block;width: 20%;text-align: center;position: relative;padding-top: 5px;max-width: 80px;font-size: 16px;}
			
 
				+.food-tt>div:last-child {display: inline-block;width: 20%;text-align: right;position: relative;max-width: 80px;font-size: 16px;}
			
 
				 .del-s {font-size: 12px;color: #ccc;position: absolute;right: 5px;}
			
 
				 .bg-f{background: #fff;}
			
 
				 .cl-baoyou{color: #55c0dc; margin-left: 10px;font-size:24px;}
			
 
				-.food-tt>div:last-child:after {content: '';position: absolute;left: 0;top: 10%;width: 1px;height: 80%;background-color: rgba(0,0,0,.15);}
			
 
				 #tabbar-chanpin-details{background: #fff;border: 0;height: 50px;}
			
 
				 #tabbar-chanpin-details .mui-control-item{color:#444;font-weight: 500;border-left: 0;border-bottom: 2px solid transparent;line-height: 50px;font-size: 18px;}
			
 
				 #tabbar-chanpin-details .mui-control-item.mui-active{color: #55c0dc;border-bottom: 2px solid #55c0dc;background-color: #fff;}
			
@@ -139,7 +135,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 .see-2wm .icon-guanbi{color:#55c0dc;}
			
 
				 .video-right{position: absolute;right:0;top:0;width: 52px;padding: 13px 10px 10px 30px;}
			
 
				 .video-right img{width: 100%;}
			
 
				-.chanpin-ditails-dic{padding: 10px;background: #fff;margin: 10px 0 65px 0;color: #444;}
			
 
				+.chanpin-ditails-dic{padding:15px 10px;background: #fff;margin: 10px 0 65px 0;color: #444;}
			
 
				 .chanpin-ditails-dic ul li{padding: 3px 0;}
			
 
				 .buy-footer {position: fixed;bottom: 0;left: 0;height: 55px;background-color: #fff;width: 100%;padding: 0;display: table;text-align: center;}
			
 
				 .buy-footer>div:first-child {display: table-cell;width: 40%;border-top: 1px solid #55c0dc;vertical-align: middle;}
			
@@ -234,23 +230,8 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				     margin: 14px;
			
 
				 }
			
 
				 .status-list li{color: #666;padding: 5px 15px;}
			
 
				-.icon-allorder{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
			
 
				-.icon-allorder.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
			
 
				-.icon-allorder>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 15%;}
			
 
				-
			
 
				-
			
 
				-.icon-topay.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
			
 
				-.icon-topay>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
			
 
				-.icon-topay{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
			
 
				 .my-scroll-order:after,.my-scroll-order:before{display:none;}
			
 
				 
			
 
				-.icon-todelivery.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
			
 
				-.icon-todelivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
			
 
				-.icon-todelivery{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
			
 
				-
			
 
				-.icon-delivery.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
			
 
				-.icon-delivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
			
 
				-.icon-delivery{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
			
 
				 .mr-5{margin-right: 5px;}
			
 
				 .btn-zu .mui-btn{margin-right:0;}
			
 
				 .btn-zu .mui-btn:last-child{margin-right: 8px;}
			
@@ -271,7 +252,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 .my-btn-link2 {padding-top: 10px;padding-bottom:10px;color: #444;border: 0;background-color: transparent;position: absolute;left: 25px;}
			
 
				 .my-btn-link:active{background-color: #fff !important;color: #444 !important;}
			
 
				 .my-input{margin-bottom: 0 !important;background-color: #fff !important;font-size:15px;text-indent: 2.5em;}
			
 
				-.ft-18{font-size: 18px;}
			
 
				+.ft-18{font-size: 20px;}
			
 
				 .daili-2wm-box{position: absolute;width: 100%;left: 0;top:0;}
			
 
				 .user-2wm{width: 50%;margin:30px auto;}
			
 
				 .user-2wm img{width: 100%;}
			
@@ -325,8 +306,8 @@ ul{list-style: none;padding: 0;margin: 0;}
 
				 
			
 
				 .pro-list .mui-media-object{background: #f2f2f2;border-radius: 5px;display: block;}
			
 
				 .pro-list:before,.pro-list:after{display: none;}
			
 
				-.pro-list.mui-table-view.mui-grid-view>li:nth-child(odd) {padding: 10px 8px 0 14px;}
			
 
				-.pro-list.mui-table-view.mui-grid-view>li:nth-child(even) {padding: 10px 0 0 22px;}
			
 
				+.pro-list.mui-table-view.mui-grid-view>li:nth-child(odd) {padding: 10px 2px 0 14px;}
			
 
				+.pro-list.mui-table-view.mui-grid-view>li:nth-child(even) {padding: 10px 0 0 16px;}
			
 
				 .pro-list h6{margin: 7px 0;color: #bbb;}
			
 
				 .pro-list .pro-price{font-size: 14px;margin-top: 8px;}
			
 
				 .pro-list .pro-price span{color: #db3f53;}
			
--- a/watero/css/vip_center.css
+++ b/watero/css/vip_center.css
@@ -1,8 +1,8 @@
 
				-.vip-tt {position: relative;width:100%;height:120px;background:url(http://static.iamberry.com/watero/images/shop/member_photo-bg_3.jpg) center center /100% 100% no-repeat;}
			
 
				+.vip-tt {position: relative;width:100%;height:120px;background:url(http://static.iamberry.com/watero/images/shop/member_photo-bg_3.jpg) center center /100% 100% no-repeat #fff;}
			
 
				 .vip-tt>img {width: 100%;}
			
 
				-.tx {position: absolute;left:1em;top: 50%;width: 4.5em;height: 4.5em;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color: #73b7d8;padding: 4px;}
			
 
				+.tx {position: absolute;padding: 0;left:2em;top: 50%;width: 4.5em;height: 4.5em;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color: #73b7d8;}
			
 
				 .tx>img {width: 100%;border-radius: 50%;}
			
 
				-.nikname {position: absolute;left:6.5em;width:68%;top: 50%;color: #fff;-webkit-transform: translateY(-52%);transform: translateY(-52%);line-height: 1.5;}
			
 
				+.nikname {position: absolute;left:7.5em;width:68%;top: 50%;color: #333;-webkit-transform: translateY(-52%);transform: translateY(-52%);line-height: 1.5;}
			
 
				 .nikname>div{padding:3px 0;}
			
 
				 .nikname>div:first-child{position: relative;width: 100%;overflow: hidden;text-overflow: ellipsis;}
			
 
				 .mui-table-view-chevron .mui-badge{display:none;}
			
@@ -21,45 +21,38 @@
 
				 #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);}
			
 
				 .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;}
			
 
				+.icon-orderyue{font-size: 35px;}
			
 
				 #menu-nav .mui-control-item {line-height: 1;color: #333;border-color: #fff;border:0;padding: 10px 0 15px 0;font-size: 12px;}
			
 
				 #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: 0 0 8px 0;}
			
 
				+#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 {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);}
			
 
				-#menu-order .iconfont{color: #55c0dc;padding: 0 0 6px 0;}
			
 
				 .my-view-order{color: #333;}
			
 
				-.my-view-order:before{display: none;}
			
 
				+.my-view-order:before,.my-view-order:after{display: none;}
			
 
				+.my-view-order .mui-badge{background: transparent;color: #999;}
			
 
				+.my-view-order .mui-navigate-right.mui-active{background: #fff !important;}
			
 
				 .mui-grid-view.mui-grid-9 .mui-media{background-color: #fff;padding: 11px 5px;}
			
 
				 .mui-grid-view.mui-grid-9:after{height: 0;display: none;}
			
 
				 .icon-xiaxian,.icon-kefu{color: #55c0dc;}
			
 
				 .icon-liwu,.icon-wheel{color: #f7624e;}
			
 
				-.icon-renwu,.icon-share{color: #f88c43;}
			
 
				+.icon-renwu,.icon-naifen{color: #f88c43;}
			
 
				 .icon-shouhou,.icon-order{color: #31c27c;}
			
 
				 .mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body{font-size: 12px;}
			
 
				+#menu-lease-order,#menu-lease-other{border: 0;border-radius: 3px;}
			
 
				+#menu-lease-order .mui-control-item,#menu-lease-other .mui-control-item{line-height: 1;color: #333;border-color: #fff;border:0;padding: 6px 0 10px 0;font-size: 12px;}
			
 
				+#menu-lease-order .mui-control-item.mui-active,#menu-lease-other .mui-control-item.mui-active{color: #333;background-color:rgba(0,0,0,.1);}
			
 
				+#menu-lease-order .iconfont,#menu-lease-other .iconfont{padding: 5px 0;}
			
 
				+.icon-daifahuo1,.icon-shebeiliebiao{color: #1bcba8;}
			
 
				+.icon-yifahuo,.icon-zulinxieyi{color: #55c0dc;}
			
 
				 .try-btn-pay{    background: #55c0dc;border: 1px solid transparent;border-radius: 4px;color: #fff;padding: 3px 8px;}
			
 
				-.try-btn-pay:active{color:#fff;}
			
 
				- .center-middle{font-size: 12px;    position: absolute;
			
 
				-    left: 90px;
			
 
				-    top: 50%;
			
 
				-    -webkit-transform: translateY(-50%);}
			
 
				-.wh-80 {
			
 
				-    width: 60px !important;
			
 
				-    max-width: 60px !important;
			
 
				-    height: 80px !important;
			
 
				-    margin: 0 5px 0 0 !important;
			
 
				-    overflow: hidden;
			
 
				-    display: inline-block;
			
 
				-    text-align: center;
			
 
				-}
			
 
				-.iconfont .mui-badge {
			
 
				-    font-size: 10px;
			
 
				-    line-height: 1.3;
			
 
				-    position: absolute;
			
 
				-    top: -3px;
			
 
				-    right: 28%;
			
 
				-    padding: 1px 5px;
			
 
				-    color: #fff;
			
 
				-}
			
 
				+.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.mui-active{background: #fff;}
			
 
				+#center-menu .mui-table-view-cell .mui-icon-arrowright:before{color: #999;font-size: 22px;}
			
--- a/watero/daili_order_list.html
+++ b/watero/daili_order_list.html
@@ -25,7 +25,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -37,7 +37,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/daili_rebackOrder_list.html
+++ b/watero/daili_rebackOrder_list.html
@@ -25,7 +25,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -37,7 +37,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/faq.html
+++ b/watero/faq.html
@@ -493,7 +493,7 @@
 
				 	</div>
			
 
				 </div>
			
 
				 <div style=" color:#24CAE9;">
			
 
				-	<div style="margin:20px 20px 10px 20px;text-align:center">如果您还有其他问题，可以直接通过微信号咨询客服，或拨打热线电话：4008006692。</div>
			
 
				+	<div style="margin:20px 20px 10px 20px;text-align:center">如果您还有其他问题，可以直接通过微信号咨询客服，或拨打热线电话：<a class="tel" href="tel:4008006692">4008006692</a></div>
			
 
				 
			
 
				 </div>
			
 
				 <div onclick="gotoTop();return false;" class="back_top"><span class="mui-icon-extra mui-icon-extra-top"></span></div>
			
@@ -518,6 +518,9 @@
 
				             $(".back_top").hide();
			
 
				         }
			
 
				     };
			
 
				+    $(document).on('tap', '.tel', function() {
			
 
				+		location.href = $(this).attr("href");
			
 
				+	});
			
 
				     //回到顶部
			
 
				     function gotoTop(acceleration, stime) {
			
 
				         acceleration = acceleration || 0.1;
			
--- a/watero/fenxiao_apply_submitSuccess.html
+++ b/watero/fenxiao_apply_submitSuccess.html
@@ -24,7 +24,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -36,7 +36,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_mendian_next_user_list.html
+++ b/watero/fenxiao_mendian_next_user_list.html
@@ -28,7 +28,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -40,7 +40,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_next_user_list2.html
+++ b/watero/fenxiao_next_user_list2.html
@@ -28,7 +28,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -40,7 +40,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_order_list.html
+++ b/watero/fenxiao_order_list.html
@@ -31,7 +31,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -43,7 +43,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_tixian_apply.html
+++ b/watero/fenxiao_tixian_apply.html
@@ -32,7 +32,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -44,7 +44,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_tixian_log.html
+++ b/watero/fenxiao_tixian_log.html
@@ -31,7 +31,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar" style="visibility: hidden;">
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -43,7 +43,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_to_accounts_list.html
+++ b/watero/fenxiao_to_accounts_list.html
@@ -29,7 +29,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -41,7 +41,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_to_accounts_list2.html
+++ b/watero/fenxiao_to_accounts_list2.html
@@ -28,7 +28,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -40,7 +40,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fenxiao_to_transfer_accounts_list.html
+++ b/watero/fenxiao_to_transfer_accounts_list.html
@@ -28,7 +28,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -40,7 +40,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/fonts/iconfont.ttf
+++ b/watero/fonts/iconfont.ttf
--- a/watero/iamberry_video.html
+++ b/watero/iamberry_video.html
@@ -23,7 +23,7 @@
 
				 </div>
			
 
				 <nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 	<a class="mui-tab-item" >
			
 
				-		<div class="iconfont icon-home"></div>
			
 
				+		<div class="iconfont icon-shouye"></div>
			
 
				 		<span class="mui-tab-label">首页</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
@@ -35,7 +35,7 @@
 
				 		<span class="mui-tab-label">订单</span>
			
 
				 	</a>
			
 
				 	<a class="mui-tab-item">
			
 
				-		<div class="iconfont icon-vip"></div>
			
 
				+		<div class="iconfont icon-wode"></div>
			
 
				 		<span class="mui-tab-label">我的</span>
			
 
				 	</a>
			
 
				 </nav>
			
--- a/watero/images/2019042501.jpg
+++ b/watero/images/2019042501.jpg
--- a/watero/images/2019042502.jpg
+++ b/watero/images/2019042502.jpg
--- a/watero/images/2019042503.jpg
+++ b/watero/images/2019042503.jpg
--- a/watero/images/2019042504.jpg
+++ b/watero/images/2019042504.jpg
--- a/watero/images/2019042505.jpg
+++ b/watero/images/2019042505.jpg
--- a/watero/images/2019042506.jpg
+++ b/watero/images/2019042506.jpg
--- a/watero/images/2019050701.jpg
+++ b/watero/images/2019050701.jpg
--- a/watero/images/2019050702.JPG
+++ b/watero/images/2019050702.JPG
--- a/watero/images/2019050703.JPG
+++ b/watero/images/2019050703.JPG
--- a/watero/images/2019050704.JPG
+++ b/watero/images/2019050704.JPG
--- a/watero/images/2019050705.JPG
+++ b/watero/images/2019050705.JPG
--- a/watero/images/2019052401.png
+++ b/watero/images/2019052401.png
--- a/watero/images/2019052402.png
+++ b/watero/images/2019052402.png
--- a/watero/images/2019052403.png
+++ b/watero/images/2019052403.png
--- a/watero/images/2019052404.png
+++ b/watero/images/2019052404.png
--- a/watero/images/2019052405.png
+++ b/watero/images/2019052405.png
--- a/watero/images/2019052406.png
+++ b/watero/images/2019052406.png
--- a/watero/images/2019052407.png
+++ b/watero/images/2019052407.png
--- a/watero/images/2019052408.png
+++ b/watero/images/2019052408.png
--- a/watero/images/2019052409.png
+++ b/watero/images/2019052409.png
--- a/watero/images/2019052410.png
+++ b/watero/images/2019052410.png
--- a/watero/images/2019052411.png
+++ b/watero/images/2019052411.png
--- a/watero/images/2019052412.png
+++ b/watero/images/2019052412.png
--- a/watero/images/2019052413.png
+++ b/watero/images/2019052413.png
--- a/watero/images/2019052414.png
+++ b/watero/images/2019052414.png
--- a/watero/images/2019072901.jpg
+++ b/watero/images/2019072901.jpg
--- a/watero/images/2019072902.png
+++ b/watero/images/2019072902.png
--- a/watero/images/2019072903.png
+++ b/watero/images/2019072903.png
--- a/watero/images/2019072904.png
+++ b/watero/images/2019072904.png
--- a/watero/images/2019072905.png
+++ b/watero/images/2019072905.png
--- a/watero/images/2019072906.png
+++ b/watero/images/2019072906.png
--- a/watero/images/2019072907.png
+++ b/watero/images/2019072907.png
--- a/watero/images/2019072908.png
+++ b/watero/images/2019072908.png
--- a/watero/images/2019072909.png
+++ b/watero/images/2019072909.png
--- a/watero/images/2019072910.png
+++ b/watero/images/2019072910.png
--- a/watero/images/2019072911.png
+++ b/watero/images/2019072911.png
--- a/watero/images/2019072912.png
+++ b/watero/images/2019072912.png
--- a/watero/images/2019072913.png
+++ b/watero/images/2019072913.png
--- a/watero/images/2019072914.png
+++ b/watero/images/2019072914.png
--- a/watero/images/2019072915.png
+++ b/watero/images/2019072915.png
--- a/watero/images/2019072916.png
+++ b/watero/images/2019072916.png
--- a/watero/images/2019072917.png
+++ b/watero/images/2019072917.png
--- a/watero/images/2019072918.jpg
+++ b/watero/images/2019072918.jpg
--- a/watero/images/2019072919.png
+++ b/watero/images/2019072919.png
--- a/watero/images/2019072920.png
+++ b/watero/images/2019072920.png
--- a/watero/images/2019080101.png
+++ b/watero/images/2019080101.png
--- a/watero/images/2019080102.png
+++ b/watero/images/2019080102.png
--- a/watero/images/2019080601.jpg
+++ b/watero/images/2019080601.jpg
--- a/watero/images/2019080602.jpg
+++ b/watero/images/2019080602.jpg
--- a/watero/images/2019080603.jpg
+++ b/watero/images/2019080603.jpg
--- a/watero/images/2019080604.jpg
+++ b/watero/images/2019080604.jpg
--- a/watero/images/2019080605.jpg
+++ b/watero/images/2019080605.jpg
--- a/watero/images/2019080606.jpg
+++ b/watero/images/2019080606.jpg
--- a/watero/images/2019080607.png
+++ b/watero/images/2019080607.png
--- a/watero/images/2019080701.jpg
+++ b/watero/images/2019080701.jpg
--- a/watero/images/618banner.png
+++ b/watero/images/618banner.png
--- a/watero/images/618share.jpg
+++ b/watero/images/618share.jpg
--- a/watero/images/fgb.png
+++ b/watero/images/fgb.png
--- a/watero/images/fgh.png
+++ b/watero/images/fgh.png
--- a/watero/images/fuqing-1.png
+++ b/watero/images/fuqing-1.png
--- a/watero/images/fyl.png
+++ b/watero/images/fyl.png
--- a/watero/images/gs_jh_01.png
+++ b/watero/images/gs_jh_01.png
--- a/watero/images/jcb.png
+++ b/watero/images/jcb.png
--- a/watero/images/jdh.png
+++ b/watero/images/jdh.png
--- a/watero/images/jdhh.png
+++ b/watero/images/jdhh.png
--- a/watero/images/jdl.png
+++ b/watero/images/jdl.png
--- a/watero/images/loading.png
+++ b/watero/images/loading.png