7 年之前 · c740bd62a4
--- a/watero-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/event/WeChatHandler.java
+++ b/watero-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/event/WeChatHandler.java
@@ -32,8 +32,16 @@ public class WeChatHandler {
 
				 
			
 
				 	@RequestMapping(method=RequestMethod.GET)
			
 
				 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
			
 
				+		String echostr = request.getParameter("echostr");
			
 
				+		if (echostr == null) {
			
 
				+			response.getWriter().print("connect Server! echostr Error!");
			
 
				+			return;
			
 
				+		}
			
 
				+		PrintWriter out = response.getWriter();
			
 
				+		out.print(echostr);
			
 
				+		out.close();
			
 
				 		// 微信加密签名,必须非空
			
 
				-		String signature = request.getParameter("signature");
			
 
				+		/*String signature = request.getParameter("signature");
			
 
				 		if (signature == null) {
			
 
				 			response.getWriter().print("connect Server! signature Error!您的输入格式有误!<a>请重新输入!</a>");
			
 
				 			return;
			
@@ -65,7 +73,7 @@ public class WeChatHandler {
 
				 			response.getWriter().print("connect Server! check signature Error!");
			
 
				 			return;
			
 
				 		}
			
 
				-		out.close();
			
 
				+		out.close();*/
			
 
				 	}
			
 
				 	
			
 
				 	@RequestMapping(method=RequestMethod.POST)
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_details.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_details.html
@@ -1,105 +1,105 @@
 
				 <!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">
			
 
				-		<meta name="format-detection" content="telphone=no, email=no" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				-	<body>
			
 
				-	<div class="loading-bg">
			
 
				-		<div class="mui-loading">
			
 
				-			<div class="mui-spinner">
			
 
				-			</div>
			
 
				-			&nbsp;&nbsp;加载中...
			
 
				+<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">
			
 
				+	<meta name="format-detection" content="telphone=no, email=no" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				 	</div>
			
 
				-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-		<a class="mui-tab-item" >
			
 
				-			<div class="iconfont icon-home"></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">
			
 
				-			<div class="iconfont icon-vip"></div>
			
 
				-			<span class="mui-tab-label">会员中心</span>
			
 
				-		</a>
			
 
				-	</nav>
			
 
				-	<div class="mui-content" >
			
 
				-		<ul class="mui-table-view my-order-list more">
			
 
				-			<!--<li class="mui-table-view-cell" style="color:red"><div>若在万圣节活动中抽中奖品，将与此订单一起发出</div></li>-->
			
 
				-			<li class="mui-table-view-cell">订单状态：<span  style="color:#007aff;" id="salesStatus" class="ft-14"></span></li>
			
 
				-			<li class="mui-table-view-cell">订单编号：<span id="salesOrderid" class="ft-14"></span></li>
			
 
				-			<li class="mui-table-view-cell">下单时间：<span id="salesCreateDate" class="ft-14"></span></li>
			
 
				-			<!-- <li class="mui-table-view-cell" id="choujiang" style="display:none"><div><button class="mui-btn mui-btn-red go_luck_draw" id="check-luck-draw" value="">立即前往抽奖</button></div></li> -->
			
 
				-			<li style="text-align: center;padding: 10px 0;"><button type="button" id="orderPay" onclick="goOrderPay();" class="mui-btn mui-btn-green" style="width: 40%; display: none;">微信支付</button></li>
			
 
				-		</ul>
			
 
				-		<ul class="mui-table-view more">
			
 
				-			<li class="mui-table-view-cell">商品金额：<span class="cl-red ft-14" id="salesAmount"></span> <span class="mui-pull-right">支付金额：<span class="cl-red ft-14" id="salesYetAmount"></span></span> </li>
			
 
				-			<li id="couponMoney" class="mui-table-view-cell"><span class="mui-pull-left">优惠券抵扣金额：</span><span class="cl-red ft-14" id="couponReduce"></span></li>
			
 
				-			<li class="mui-table-view-cell"><span class="mui-pull-left">收货地址：</span><span class="line-clamp-3 ft-14" id="salesAddressInfo"></span></li>
			
 
				-			<li class="mui-table-view-cell">收货人：<span id="salesAddressName" class="ft-14"></span>      <span id="salesAddressTel" class="ft-14"></span></li>
			
 
				-			<li class="mui-table-view-cell"><span class="mui-pull-left">备&nbsp;&nbsp;&nbsp;&nbsp;注：</span><span class="line-clamp-3 ft-14" id="salesUserRemark"></span></li>
			
 
				-			<li class="mui-table-view-cell" id="showLogistics">
			
 
				-				<span class="mui-pull-left">物流信息：</span>
			
 
				-				<span class="mui-pull-left ft-14 show_post_info" id="logistics" postfirm="" postnum="" gourl="">
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<div class="mui-content" >
			
 
				+	<ul class="mui-table-view my-order-list more">
			
 
				+		<!--<li class="mui-table-view-cell" style="color:red"><div>若在万圣节活动中抽中奖品，将与此订单一起发出</div></li>-->
			
 
				+		<li class="mui-table-view-cell">订单状态：<span  style="color:#007aff;" id="salesStatus" class="ft-14"></span></li>
			
 
				+		<li class="mui-table-view-cell">订单编号：<span id="salesOrderid" class="ft-14"></span></li>
			
 
				+		<li class="mui-table-view-cell">下单时间：<span id="salesCreateDate" class="ft-14"></span></li>
			
 
				+		<!-- <li class="mui-table-view-cell" id="choujiang" style="display:none"><div><button class="mui-btn mui-btn-red go_luck_draw" id="check-luck-draw" value="">立即前往抽奖</button></div></li> -->
			
 
				+		<li style="text-align: center;padding: 10px 0;"><button type="button" id="orderPay" onclick="goOrderPay();" class="mui-btn mui-btn-green" style="width: 40%; display: none;">微信支付</button></li>
			
 
				+	</ul>
			
 
				+	<ul class="mui-table-view more">
			
 
				+		<li class="mui-table-view-cell">商品金额：<span class="cl-red ft-14" id="salesAmount"></span> <span class="mui-pull-right">支付金额：<span class="cl-red ft-14" id="salesYetAmount"></span></span> </li>
			
 
				+		<li id="couponMoney" class="mui-table-view-cell"><span class="mui-pull-left">优惠券抵扣金额：</span><span class="cl-red ft-14" id="couponReduce"></span></li>
			
 
				+		<li class="mui-table-view-cell"><span class="mui-pull-left">收货地址：</span><span class="line-clamp-3 ft-14" id="salesAddressInfo"></span></li>
			
 
				+		<li class="mui-table-view-cell">收货人：<span id="salesAddressName" class="ft-14"></span>      <span id="salesAddressTel" class="ft-14"></span></li>
			
 
				+		<li class="mui-table-view-cell"><span class="mui-pull-left">备&nbsp;&nbsp;&nbsp;&nbsp;注：</span><span class="line-clamp-3 ft-14" id="salesUserRemark"></span></li>
			
 
				+		<li class="mui-table-view-cell" id="showLogistics">
			
 
				+			<span class="mui-pull-left">物流信息：</span>
			
 
				+			<span class="mui-pull-left ft-14 show_post_info" id="logistics" postfirm="" postnum="" gourl="">
			
 
				 					<span id="salesPostFirm"></span>  
			
 
				 					<span id="salesPostNum"></span><br>
			
 
				-					<!-- <span ><a>查看物流>></a></span> -->
			
 
				+				<!-- <span ><a>查看物流>></a></span> -->
			
 
				 				</span>
			
 
				-			</li>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div id="orderDiv">
			
 
				+		<ul class="mui-table-view my-order-list shopping-cart-list">
			
 
				 		</ul>
			
 
				-		<div id="orderDiv">
			
 
				-			<ul class="mui-table-view my-order-list shopping-cart-list">
			
 
				-			</ul>
			
 
				+	</div>
			
 
				+	<div style="background: #fff;padding: 0 10px;">
			
 
				+		<div><input type="hidden" id="salesLockType" value=""></div>
			
 
				+		<div><input type="hidden" id="oldStatus" value=""></div>
			
 
				+		<div style="text-align: center;padding: 10px 0; display: none" id="cancelOrder"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">取消订单</button></div>
			
 
				+		<!-- <input name="" id="changeOrderId"/>-->
			
 
				+		<div style="text-align: center;padding: 10px 0; display: none" id="exchangeOrder">
			
 
				+			<button type="button" class="mui-btn mui-btn-grey" onclick="operation('1');">申请换货</button>
			
 
				 		</div>
			
 
				-		<div style="background: #fff;padding: 0 10px;">
			
 
				-			<div><input type="hidden" id="salesLockType" value=""></div>
			
 
				-			<div><input type="hidden" id="oldStatus" value=""></div>
			
 
				-			<div style="text-align: center;padding: 10px 0; display: none" id="cancelOrder"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">取消订单</button></div>
			
 
				-			<!-- <input name="" id="changeOrderId"/>-->
			
 
				-			<div style="text-align: center;padding: 10px 0; display: none" id="exchangeOrder">
			
 
				-				<button type="button" class="mui-btn mui-btn-grey" onclick="operation('1');">申请换货</button>
			
 
				-			</div>
			
 
				-			<div id="refund" style="display: none">
			
 
				+		<div id="refund" style="display: none">
			
 
				 			<br>
			
 
				-				<textarea placeholder="退款备注，必填" id="return-money-id"></textarea>
			
 
				-				<div>
			
 
				-					<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">申请退款</button></div>
			
 
				-				</div>
			
 
				+			<textarea placeholder="退款备注，必填" id="return-money-id"></textarea>
			
 
				+			<div>
			
 
				+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">申请退款</button></div>
			
 
				 			</div>
			
 
				-			<div id="salesReturn" style="display: none">
			
 
				+		</div>
			
 
				+		<div id="salesReturn" style="display: none">
			
 
				 			<br>
			
 
				-				<textarea placeholder="退货备注，必填" id="return-pay-id"></textarea>
			
 
				-				<div>
			
 
				-					<!-- <input name="" id="returnOrderId"/>-->
			
 
				-					<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation('2');">申请退货</button></div>
			
 
				-				</div>
			
 
				+			<textarea placeholder="退货备注，必填" id="return-pay-id"></textarea>
			
 
				+			<div>
			
 
				+				<!-- <input name="" id="returnOrderId"/>-->
			
 
				+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation('2');">申请退货</button></div>
			
 
				 			</div>
			
 
				 		</div>
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wap-alert/layer.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/validate.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/order_details.js"></script>
			
 
				-	</body>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017062201"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wap-alert/layer.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_list.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_list.html
@@ -1,101 +1,101 @@
 
				-	<!DOCTYPE html>
			
 
				+<!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="format-detection" content="telephone=no" />
			
 
				-		<meta name="apple-mobile-web-app-capable" content="yes" />
			
 
				-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
			
 
				-		<meta name="format-detection" content="telphone=no, email=no" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.picker.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/order_list.css" />
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+<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="format-detection" content="telephone=no" />
			
 
				+	<meta name="apple-mobile-web-app-capable" content="yes" />
			
 
				+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
			
 
				+	<meta name="format-detection" content="telphone=no, email=no" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.picker.min.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/order_list.css?v=2017030802" />
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item">
			
 
				-				<div class="iconfont icon-home"></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 mui-active">
			
 
				-				<div class="iconfont icon-dingdan"></div>
			
 
				-				<span class="mui-tab-label">我的订单</span>
			
 
				-			</a>
			
 
				-			<a class="mui-tab-item">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<header class="mui-bar mui-bar-nav header">
			
 
				-			<div class="go-index go_index">
			
 
				-				<img src="/watero/wateroimages/shop/logo.png" />
			
 
				-			</div>
			
 
				-			<button type="button" class="mui-btn mui-icon mui-icon-search my-right"></button>
			
 
				-			<div class="search-box">
			
 
				-				<div class="mui-input-row mui-search my-search">
			
 
				-				<input id="order-list-search" type="search" class="mui-input-clear" placeholder="搜索产品名、订单号">
			
 
				-				</div>
			
 
				-				<div class="mui-input-row">
			
 
				-				<input id='mydate' type="text" class="mui-text-center" placeholder="选择日期">
			
 
				-				</div>
			
 
				-			</div>
			
 
				-		</header>
			
 
				-		<div class="mui-segmented-control tab-with-orderlist">
			
 
				-			<a class="mui-control-item icon-topay mui-active" tabindex="0">
			
 
				-				<span class="iconfont icon-daifukuan"></span>
			
 
				-				<span class="mui-tab-label">待支付</span>
			
 
				-			</a>
			
 
				-			<a class="mui-control-item icon-todelivery" tabindex="1">
			
 
				-				<span class="iconfont icon-daifahuo"></span>
			
 
				-				<span class="mui-tab-label">待发货</span>
			
 
				-			</a>
			
 
				-			<a class="mui-control-item icon-delivery" tabindex="2">
			
 
				-				<span class="iconfont icon-yifahuo"></span>
			
 
				-				<span class="mui-tab-label">已发货</span>
			
 
				-			</a>
			
 
				-			<a class="mui-control-item icon-allorder" tabindex="3">
			
 
				-				<span class="iconfont icon-alldingdan"></span>
			
 
				-				<span class="mui-tab-label">全部订单</span>
			
 
				-			</a>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item">
			
 
				+		<div class="iconfont icon-home"></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 mui-active">
			
 
				+		<div class="iconfont icon-dingdan"></div>
			
 
				+		<span class="mui-tab-label">我的订单</span>
			
 
				+	</a>
			
 
				+	<a class="mui-tab-item">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<header class="mui-bar mui-bar-nav header">
			
 
				+	<div class="go-index go_index">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
			
 
				+	</div>
			
 
				+	<button type="button" class="mui-btn mui-icon mui-icon-search my-right"></button>
			
 
				+	<div class="search-box">
			
 
				+		<div class="mui-input-row mui-search my-search">
			
 
				+			<input id="order-list-search" type="search" class="mui-input-clear" placeholder="搜索产品名、订单号">
			
 
				 		</div>
			
 
				-		<!--下拉刷新容器-->
			
 
				-		<div id="pullrefresh_order_list" class="mui-content mui-scroll-wrapper">
			
 
				-			<div class="mui-scroll">
			
 
				-				<!--数据列表-->
			
 
				-				<ul class="mui-table-view mui-table-view-chevron my-scroll-order">
			
 
				-
			
 
				-				</ul>
			
 
				-			</div>
			
 
				+		<div class="mui-input-row">
			
 
				+			<input id='mydate' type="text" class="mui-text-center" placeholder="选择日期">
			
 
				 		</div>
			
 
				-		
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/mui.picker.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/layer.js"></script>
			
 
				-		<script src="/watero/waterojs/validate.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/order_list.js"></script>
			
 
				-	</body>
			
 
				+	</div>
			
 
				+</header>
			
 
				+<div class="mui-segmented-control tab-with-orderlist">
			
 
				+	<a class="mui-control-item icon-topay mui-active" tabindex="0">
			
 
				+		<span class="iconfont icon-daifukuan"></span>
			
 
				+		<span class="mui-tab-label">待支付</span>
			
 
				+	</a>
			
 
				+	<a class="mui-control-item icon-todelivery" tabindex="1">
			
 
				+		<span class="iconfont icon-daifahuo"></span>
			
 
				+		<span class="mui-tab-label">待发货</span>
			
 
				+	</a>
			
 
				+	<a class="mui-control-item icon-delivery" tabindex="2">
			
 
				+		<span class="iconfont icon-yifahuo"></span>
			
 
				+		<span class="mui-tab-label">已发货</span>
			
 
				+	</a>
			
 
				+	<a class="mui-control-item icon-allorder" tabindex="3">
			
 
				+		<span class="iconfont icon-alldingdan"></span>
			
 
				+		<span class="mui-tab-label">全部订单</span>
			
 
				+	</a>
			
 
				+</div>
			
 
				+<!--下拉刷新容器-->
			
 
				+<div id="pullrefresh_order_list" class="mui-content mui-scroll-wrapper">
			
 
				+	<div class="mui-scroll">
			
 
				+		<!--数据列表-->
			
 
				+		<ul class="mui-table-view mui-table-view-chevron my-scroll-order">
			
 
				+
			
 
				+		</ul>
			
 
				+	</div>
			
 
				+</div>
			
 
				+
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.picker.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017062201"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/validate.js?v=2016111701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html
@@ -1,74 +1,74 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item" >
			
 
				-				<div class="iconfont icon-home"></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">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<header class="mui-bar mui-bar-nav header">
			
 
				-				<div class="go-index go_index">
			
 
				-					<img src="/watero/wateroimages/shop/logo.png" />
			
 
				-				</div>
			
 
				-		</header>
			
 
				-		<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
			
 
				-			<div class="pl-win-tt">
			
 
				-			<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
			
 
				-			<div>已支付：<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
			
 
				-			</div>
			
 
				-			<ul class="pay_win_list">
			
 
				-				<li>订单编号：<span class="cl-0" id="orderid-span">加载中...</span></li>
			
 
				-				<li>支付时间：<span class="cl-0" id="pay-date-span">加载中...</span></li>
			
 
				-				<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
			
 
				-				<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
			
 
				-			</ul>
			
 
				-		</div>
			
 
				-		<!-- <div class="mui-content-padded">
			
 
				-				<a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
			
 
				-			</div> -->
			
 
				-		<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
			
 
				-			<ul class="pay_win_list">
			
 
				-				<li><span class="cl-0">正在加载数据...</span></li>
			
 
				-			</ul>
			
 
				-		</div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/pay_win.js"></script>
			
 
				-	</body>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<header class="mui-bar mui-bar-nav header">
			
 
				+	<div class="go-index go_index">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
			
 
				+	</div>
			
 
				+</header>
			
 
				+<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
			
 
				+	<div class="pl-win-tt">
			
 
				+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
			
 
				+		<div>已支付：<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
			
 
				+	</div>
			
 
				+	<ul class="pay_win_list">
			
 
				+		<li>订单编号：<span class="cl-0" id="orderid-span">加载中...</span></li>
			
 
				+		<li>支付时间：<span class="cl-0" id="pay-date-span">加载中...</span></li>
			
 
				+		<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
			
 
				+		<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<!-- <div class="mui-content-padded">
			
 
				+        <a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
			
 
				+    </div> -->
			
 
				+<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
			
 
				+	<ul class="pay_win_list">
			
 
				+		<li><span class="cl-0">正在加载数据...</span></li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/pay_win.js?v=2016101701"></script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/personal_information.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/personal_information.html
@@ -1,70 +1,70 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.picker.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.poppicker.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/personal_information.css" />
			
 
				-	</head>
			
 
				-	<body style="background: #fff;">
			
 
				-		<div class="loading-bg">
			
 
				-				<div class="mui-loading">
			
 
				-					<div class="mui-spinner">
			
 
				-					</div>
			
 
				-					&nbsp;&nbsp;加载中...
			
 
				-				</div>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.picker.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.poppicker.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/personal_information.css?v=2016101701" />
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content" style="background: #fff;">
			
 
				-			<ul class="mui-table-view more">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a id="head" >我的头像
			
 
				-					<span class="mui-pull-right head">
			
 
				-						<img class="head-img mui-action-preview" id="userhead" src="/watero/wateroimages/shop/image-12.jpg"/>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<ul class="mui-table-view more">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a id="head" >我的头像
			
 
				+				<span class="mui-pull-right head">
			
 
				+						<img class="head-img mui-action-preview" id="userhead" src="//s.iamberry.com/watero/images/shop/image-12.jpg"/>
			
 
				 					</span>
			
 
				-				</a>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a>我的昵称<span class="mui-pull-right" id="nickname">爱贝源</span></a>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a>我的身份<span class="mui-pull-right" id="userRoleName">商户</span></a>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<ul class="mui-table-view">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a>真实姓名<span class="mui-pull-right" id="ipt-name"></span></a>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a>手机号码<span class="mui-pull-right" id="ipt-phone"></span></a>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a>店铺名称<span class="mui-pull-right" id="ipt-shop-name"></span></a>
			
 
				-				</li>
			
 
				-				</li><li class="mui-table-view-cell">
			
 
				-					<a id='showCityPicker3'>店铺区域<span class="mui-pull-right" id="city"></span></a>
			
 
				-				</li>
			
 
				-				</li><li class="mui-table-view-cell">
			
 
				-					<a>详细地址<span class="mui-pull-right" id="ipt-address"></span></a>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<br />
			
 
				-			<div class="mui-content-padded" style="display:none" id="updateBtn">
			
 
				-				<button type="button" class="mui-btn mui-btn-block mui-btn-outlined mui-active" disabled="disabled" id="btn_submit">信息正在审核中</button>
			
 
				-			</div>
			
 
				-			<div class="mui-content-padded" onclick="toDrpCenter()">
			
 
				-				<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="to_drp_center">返回代理中心</button>
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/personal_information.js"></script>
			
 
				-	</body>
			
 
				+			</a>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>我的昵称<span class="mui-pull-right" id="nickname">爱贝源</span></a>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>我的身份<span class="mui-pull-right" id="userRoleName">商户</span></a>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<ul class="mui-table-view">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>真实姓名<span class="mui-pull-right" id="ipt-name"></span></a>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>手机号码<span class="mui-pull-right" id="ipt-phone"></span></a>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>店铺名称<span class="mui-pull-right" id="ipt-shop-name"></span></a>
			
 
				+		</li>
			
 
				+		</li><li class="mui-table-view-cell">
			
 
				+		<a id='showCityPicker3'>店铺区域<span class="mui-pull-right" id="city"></span></a>
			
 
				+	</li>
			
 
				+		</li><li class="mui-table-view-cell">
			
 
				+		<a>详细地址<span class="mui-pull-right" id="ipt-address"></span></a>
			
 
				+	</li>
			
 
				+	</ul>
			
 
				+	<br />
			
 
				+	<div class="mui-content-padded" style="display:none" id="updateBtn">
			
 
				+		<button type="button" class="mui-btn mui-btn-block mui-btn-outlined mui-active" disabled="disabled" id="btn_submit">信息正在审核中</button>
			
 
				+	</div>
			
 
				+	<div class="mui-content-padded" onclick="toDrpCenter()">
			
 
				+		<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="to_drp_center">返回代理中心</button>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/personal_information.js?v=2016101801"></script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/share_zhuanpan.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/share_zhuanpan.html
@@ -1,221 +1,218 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/shop/style.css" />
			
 
				-		<style>
			
 
				-			.clear{clear:both;}
			
 
				-			/* 大转盘样式 */
			
 
				-			.drawbanner{display:block;width:85%;margin:0 auto;}
			
 
				-			.drawbanner .turnplate{display:block;width:100%;position:relative;}
			
 
				-			.drawbanner .turnplate canvas.item{width:100%;}
			
 
				-			.drawbanner .turnplate img.pointer{ 
			
 
				-				position: absolute;
			
 
				-			    width: 25%;
			
 
				-			    height: 30%;
			
 
				-			    left: 37.5%;
			
 
				-			    top: 32%;
			
 
				-			}
			
 
				-			#img-box{display:none;}		
			
 
				-		</style>
			
 
				-	</head>
			
 
				-
			
 
				-	<body style="background: #fff3f4;">
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		
			
 
				-		<div class="mui-content" style="background: #fff3f4;">
			
 
				-			<div style="margin-bottom: 10px;">
			
 
				-				<img width="100%" src="/watero/common/shop/images/wheel-title1.png" />
			
 
				-			</div>
			
 
				-	<div style="position: relative;">
			
 
				-<div id="img-box">
			
 
				+<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.iamberry.com/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				+		.clear{clear:both;}
			
 
				+		/* 大转盘样式 */
			
 
				+		.drawbanner{display:block;width:85%;margin:0 auto;}
			
 
				+		.drawbanner .turnplate{display:block;width:100%;position:relative;}
			
 
				+		.drawbanner .turnplate canvas.item{width:100%;}
			
 
				+		.drawbanner .turnplate img.pointer{
			
 
				+			position: absolute;
			
 
				+			width: 25%;
			
 
				+			height: 30%;
			
 
				+			left: 37.5%;
			
 
				+			top: 32%;
			
 
				+		}
			
 
				+		#img-box{display:none;}
			
 
				+	</style>
			
 
				+</head>
			
 
				 
			
 
				-  </div>
			
 
				-	<div class="drawbanner">
			
 
				-		<div class="turnplate" style="background-image:url(/watero/common/shop/images/turnplate-bg.png);background-size:100% 98%;background-repeat: no-repeat;">
			
 
				-			<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
			
 
				-			<img class="pointer" src="/watero/common/shop/images/turnplate-pointer.png"/>
			
 
				+<body style="background: #fff3f4;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				 	</div>
			
 
				-	<div style="text-align: center;">
			
 
				-		<button class="pointer" type="button" style="background: #e9004c;color: #fff;border: 0;border-radius: 5px;display: block;width:70%;margin:20px 15%;padding:11px 0;">立即抽奖</button>
			
 
				-	</div>
			
 
				+</div>
			
 
				+
			
 
				+<div class="mui-content" style="background: #fff3f4;">
			
 
				+	<div style="margin-bottom: 10px;">
			
 
				+		<img width="100%" src="/iamberry/common/shop/images/wheel-title1.png" />
			
 
				 	</div>
			
 
				-				
			
 
				+	<div style="position: relative;">
			
 
				+		<div id="img-box">
			
 
				+
			
 
				+		</div>
			
 
				+		<div class="drawbanner">
			
 
				+			<div class="turnplate" style="background-image:url(/iamberry/common/shop/images/turnplate-bg.png);background-size:100% 98%;background-repeat: no-repeat;">
			
 
				+				<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
			
 
				+				<img class="pointer" src="/iamberry/common/shop/images/turnplate-pointer.png"/>
			
 
				+			</div>
			
 
				+		</div>
			
 
				+		<div style="text-align: center;">
			
 
				+			<button class="pointer" type="button" style="background: #e9004c;color: #fff;border: 0;border-radius: 5px;display: block;width:70%;margin:20px 15%;padding:11px 0;">立即抽奖</button>
			
 
				+		</div>
			
 
				 	</div>
			
 
				 
			
 
				-	</div>	
			
 
				-		<script src="/watero/common/shop/js/mui.min.js"></script>
			
 
				-		<script src="/watero/common/shop/js/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/common/shop/js/awardRotate.js"></script>
			
 
				-		<script src="/watero/common/shop/js/main.js"></script>
			
 
				-		<script type="text/javascript" src="/watero/common/js/utils/wechat-utils-1.0.js"></script>
			
 
				-		<script type="text/javascript">
			
 
				-		var turnplate={
			
 
				-				restaraunts:[],				//大转盘奖品名称
			
 
				-				colors:[],					//大转盘奖品区块对应背景颜色
			
 
				-				outsideRadius:166,			//大转盘外圆的半径
			
 
				-				textRadius:140,				//大转盘奖品位置距离圆心的距离
			
 
				-				insideRadius:40,			//大转盘内圆的半径
			
 
				-				startAngle:0,				//开始角度
			
 
				-				bRotate:false				//false:停止;ture:旋转
			
 
				-		};
			
 
				-		
			
 
				-		var prizeList = null;
			
 
				-		
			
 
				-		$(document).ready(function(){
			
 
				-			window.repleFlag = false;
			
 
				-			window.wxFriend = {
			
 
				-				    "appId": "",
			
 
				-				    "imgUrl":domanUrl + '/watero/common/shop/images/1.png',
			
 
				-				    "link":domanUrl+"/watero/wechat/activity/share_luck_draw",
			
 
				-				    "desc":"哎呀！我差一点就抽到iPhone7了！亮黑版，32G啊！小伙伴你也来试试吧！",//描述
			
 
				-				    "title":"我离iPhone7亮黑版 32G仅一步之遥，小伙伴你快来一起抽吧！",			//标题
			
 
				-				    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-				    "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
			
 
				-				    "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
			
 
				-				    "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
			
 
				-				    "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
			
 
				-			};
			
 
				-			getConfig();
			
 
				-			
			
 
				-			//动态添加大转盘的奖品与奖品区域背景颜色
			
 
				-			$.ajax('/watero/wechat/game/get_prize_info',{
			
 
				-				data: {
			
 
				-					prizeGameId:1
			
 
				-				},
			
 
				-                xhrFields: {
			
 
				-                    withCredentials: true
			
 
				-                },
			
 
				-				dataType:'json',
			
 
				-				async:true,
			
 
				-				type:'post',
			
 
				-				timeout:15000,
			
 
				-				success:function(dt){
			
 
				-					if (dt.status) {
			
 
				-						prizeList = dt.data;
			
 
				-						//console.log(prizeList);
			
 
				-						
			
 
				-						mui(prizeList).each(function(index){
			
 
				-							turnplate.restaraunts[index] = this.prizeName;
			
 
				-							if ((index + 1) % 2 == 0) {
			
 
				-								turnplate.colors[index] = "#ff9c9d";
			
 
				-							} else {
			
 
				-								if (index == (prizeList.length - 1)) {
			
 
				-									turnplate.colors[index] = "#f99eaa";
			
 
				-								} else {
			
 
				-									turnplate.colors[index] = "#f76f7d";
			
 
				-								}
			
 
				-							}
			
 
				-							//先把图片加载出来
			
 
				-							$("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
			
 
				-						});
			
 
				-						//防止图片没加载完设置1秒后再绘制canvas
			
 
				-						setTimeout(function(){
			
 
				-							drawRouletteWheel()
			
 
				-							document.querySelector('.loading-bg').style.display = 'none';
			
 
				-						},1000);
			
 
				-					} else {
			
 
				-						
			
 
				-					}
			
 
				-				},
			
 
				-				error:function(xhr,type,errorThrown){
			
 
				-					
			
 
				-				}
			
 
				-			});
			
 
				-		
			
 
				-			//旋转转盘 item:奖品位置; txt：提示语;
			
 
				-			var rotateFn = function (item, txt, to){
			
 
				-				var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
			
 
				-				if(angles<270){
			
 
				-					angles = 270 - angles; 
			
 
				-				}else{
			
 
				-					angles = 360 - angles + 270;
			
 
				-				}
			
 
				-				$('#wheelcanvas').stopRotate();
			
 
				-				$('#wheelcanvas').rotate({
			
 
				-					angle:0,
			
 
				-					animateTo:(to == null ? (angles+1800) : to),
			
 
				-					duration:3000,
			
 
				-					callback:function (){
			
 
				-						turnplate.bRotate = !turnplate.bRotate;
			
 
				-					}
			
 
				-				});
			
 
				-			};
			
 
				-		
			
 
				-		$(".pointer").on("click",function(){
			
 
				-			//去产品列表
			
 
				-			mui.openWindow({
			
 
				-				url: base_path + '/index' //index.html
			
 
				-			});
			
 
				-		});		
			
 
				-			
			
 
				-		});
			
 
				-
			
 
				-		
			
 
				-		function drawRouletteWheel() { 
			
 
				-		  var canvas = dc("wheelcanvas");    
			
 
				-		  if (canvas.getContext) {
			
 
				-			  //根据奖品个数计算圆周角度
			
 
				-			  var arc = Math.PI / (turnplate.restaraunts.length/2);
			
 
				-			  var ctx = canvas.getContext("2d");
			
 
				-			  //在给定矩形内清空一个矩形
			
 
				-			  ctx.clearRect(0,0,422,422);
			
 
				-			  //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式  
			
 
				-			  ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
			
 
				-			  //font 属性设置或返回画布上文本内容的当前字体属性
			
 
				-			  ctx.font = '17px Arial';      
			
 
				-			  for(var i = 0; i < turnplate.restaraunts.length; i++) {       
			
 
				-				  //添加对应图标
			
 
				-				  if (prizeList != null) {
			
 
				-					  var angle = turnplate.startAngle + i * arc;
			
 
				-					  ctx.fillStyle = turnplate.colors[i];
			
 
				-					  ctx.beginPath();
			
 
				-					  //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）    
			
 
				-					  ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);    
			
 
				-					  ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
			
 
				-					  ctx.stroke();  
			
 
				-					  ctx.fill();
			
 
				-					  //锁画布(为了保存之前的画布状态)
			
 
				-					  ctx.save();   
			
 
				-					  
			
 
				-					  //----绘制奖品开始----
			
 
				-					  ctx.fillStyle = "#fff";
			
 
				-					  var text = turnplate.restaraunts[i];
			
 
				-					  var line_height = 17;
			
 
				-					  //translate方法重新映射画布上的 (0,0) 位置
			
 
				-					  ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
			
 
				-					  
			
 
				-					  //rotate方法旋转当前的绘图
			
 
				-					  ctx.rotate(angle + arc / 2 + Math.PI / 2);
			
 
				-					  
			
 
				-					  /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
			
 
				-						 //在画布上绘制填色的文本。文本的默认颜色是黑色
			
 
				-						  //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
			
 
				-					  ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
			
 
				-					  var img= dc(prizeList[i].prizeId);
			
 
				-					  ctx.drawImage(img,-25,10);
			
 
				-					 
			
 
				-					  //把当前画布返回（调整）到上一个save()状态之前 
			
 
				-				  }
			
 
				-				  //----绘制奖品结束----
			
 
				-				  ctx.restore();
			
 
				-			  }     
			
 
				-		  } 
			
 
				-		}
			
 
				+</div>
			
 
				+
			
 
				+</div>
			
 
				+<script src="/iamberry/common/shop/js/mui.min.js"></script>
			
 
				+<script src="/iamberry/common/shop/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="/iamberry/common/shop/js/awardRotate.js"></script>
			
 
				+<script src="/iamberry/common/shop/js/main.js"></script>
			
 
				+<script type="text/javascript" src="/iamberry/common/js/utils/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    var turnplate={
			
 
				+        restaraunts:[],				//大转盘奖品名称
			
 
				+        colors:[],					//大转盘奖品区块对应背景颜色
			
 
				+        outsideRadius:166,			//大转盘外圆的半径
			
 
				+        textRadius:140,				//大转盘奖品位置距离圆心的距离
			
 
				+        insideRadius:40,			//大转盘内圆的半径
			
 
				+        startAngle:0,				//开始角度
			
 
				+        bRotate:false				//false:停止;ture:旋转
			
 
				+    };
			
 
				+
			
 
				+    var prizeList = null;
			
 
				+
			
 
				+    $(document).ready(function(){
			
 
				+        window.repleFlag = false;
			
 
				+        window.wxFriend = {
			
 
				+            "appId": "",
			
 
				+            "imgUrl":domanUrl + '/iamberry/common/shop/images/1.png',
			
 
				+            "link":domanUrl+"/iamberry/wechat/activity/share_luck_draw",
			
 
				+            "desc":"哎呀！我差一点就抽到iPhone7了！亮黑版，32G啊！小伙伴你也来试试吧！",//描述
			
 
				+            "title":"我离iPhone7亮黑版 32G仅一步之遥，小伙伴你快来一起抽吧！",			//标题
			
 
				+            "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+            "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
			
 
				+            "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
			
 
				+            "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
			
 
				+            "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
			
 
				+        };
			
 
				+        getConfig();
			
 
				+
			
 
				+        //动态添加大转盘的奖品与奖品区域背景颜色
			
 
				+        mui.ajax('/iamberry/wechat/game/get_prize_info',{
			
 
				+            data: {
			
 
				+                prizeGameId:1
			
 
				+            },
			
 
				+            dataType:'json',
			
 
				+            async:true,
			
 
				+            type:'post',
			
 
				+            timeout:15000,
			
 
				+            success:function(dt){
			
 
				+                if (dt.status) {
			
 
				+                    prizeList = dt.data;
			
 
				+                    //console.log(prizeList);
			
 
				+
			
 
				+                    mui(prizeList).each(function(index){
			
 
				+                        turnplate.restaraunts[index] = this.prizeName;
			
 
				+                        if ((index + 1) % 2 == 0) {
			
 
				+                            turnplate.colors[index] = "#ff9c9d";
			
 
				+                        } else {
			
 
				+                            if (index == (prizeList.length - 1)) {
			
 
				+                                turnplate.colors[index] = "#f99eaa";
			
 
				+                            } else {
			
 
				+                                turnplate.colors[index] = "#f76f7d";
			
 
				+                            }
			
 
				+                        }
			
 
				+                        //先把图片加载出来
			
 
				+                        $("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
			
 
				+                    });
			
 
				+                    //防止图片没加载完设置1秒后再绘制canvas
			
 
				+                    setTimeout(function(){
			
 
				+                        drawRouletteWheel()
			
 
				+                        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+                    },1000);
			
 
				+                } else {
			
 
				+
			
 
				+                }
			
 
				+            },
			
 
				+            error:function(xhr,type,errorThrown){
			
 
				+
			
 
				+            }
			
 
				+        });
			
 
				+
			
 
				+        //旋转转盘 item:奖品位置; txt：提示语;
			
 
				+        var rotateFn = function (item, txt, to){
			
 
				+            var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
			
 
				+            if(angles<270){
			
 
				+                angles = 270 - angles;
			
 
				+            }else{
			
 
				+                angles = 360 - angles + 270;
			
 
				+            }
			
 
				+            $('#wheelcanvas').stopRotate();
			
 
				+            $('#wheelcanvas').rotate({
			
 
				+                angle:0,
			
 
				+                animateTo:(to == null ? (angles+1800) : to),
			
 
				+                duration:3000,
			
 
				+                callback:function (){
			
 
				+                    turnplate.bRotate = !turnplate.bRotate;
			
 
				+                }
			
 
				+            });
			
 
				+        };
			
 
				+
			
 
				+        $(".pointer").on("click",function(){
			
 
				+            //去产品列表
			
 
				+            mui.openWindow({
			
 
				+                url: base_path + '/index' //index.html
			
 
				+            });
			
 
				+        });
			
 
				+
			
 
				+    });
			
 
				+
			
 
				+
			
 
				+    function drawRouletteWheel() {
			
 
				+        var canvas = dc("wheelcanvas");
			
 
				+        if (canvas.getContext) {
			
 
				+            //根据奖品个数计算圆周角度
			
 
				+            var arc = Math.PI / (turnplate.restaraunts.length/2);
			
 
				+            var ctx = canvas.getContext("2d");
			
 
				+            //在给定矩形内清空一个矩形
			
 
				+            ctx.clearRect(0,0,422,422);
			
 
				+            //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式
			
 
				+            ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
			
 
				+            //font 属性设置或返回画布上文本内容的当前字体属性
			
 
				+            ctx.font = '17px Arial';
			
 
				+            for(var i = 0; i < turnplate.restaraunts.length; i++) {
			
 
				+                //添加对应图标
			
 
				+                if (prizeList != null) {
			
 
				+                    var angle = turnplate.startAngle + i * arc;
			
 
				+                    ctx.fillStyle = turnplate.colors[i];
			
 
				+                    ctx.beginPath();
			
 
				+                    //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）
			
 
				+                    ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);
			
 
				+                    ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
			
 
				+                    ctx.stroke();
			
 
				+                    ctx.fill();
			
 
				+                    //锁画布(为了保存之前的画布状态)
			
 
				+                    ctx.save();
			
 
				+
			
 
				+                    //----绘制奖品开始----
			
 
				+                    ctx.fillStyle = "#fff";
			
 
				+                    var text = turnplate.restaraunts[i];
			
 
				+                    var line_height = 17;
			
 
				+                    //translate方法重新映射画布上的 (0,0) 位置
			
 
				+                    ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
			
 
				+
			
 
				+                    //rotate方法旋转当前的绘图
			
 
				+                    ctx.rotate(angle + arc / 2 + Math.PI / 2);
			
 
				+
			
 
				+                    /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
			
 
				+                    //在画布上绘制填色的文本。文本的默认颜色是黑色
			
 
				+                    //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
			
 
				+                    ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
			
 
				+                    var img= dc(prizeList[i].prizeId);
			
 
				+                    ctx.drawImage(img,-25,10);
			
 
				+
			
 
				+                    //把当前画布返回（调整）到上一个save()状态之前
			
 
				+                }
			
 
				+                //----绘制奖品结束----
			
 
				+                ctx.restore();
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				 </script>
			
 
				-	</body>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html
@@ -1,52 +1,52 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 
			
 
				-	<head>
			
 
				-		<meta charset="utf-8">
			
 
				-		<title></title>
			
 
				-		<meta name="Expires" content="0">
			
 
				-		<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
			
 
				-		<meta name="Cache-Control" content="post-check=0, pre-check=0">
			
 
				-		<meta name="Pragma" content="no-cache">
			
 
				-		<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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			input[name=checkbox] { width: 18px;height: 18px;-webkit-appearance: none;appearance: none;cursor: pointer;vertical-align: top;background: url(/watero/images/shop/c_checkbox_off.png) center center no-repeat;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;position: relative;border: 0;background-size: 100%;}
			
 
				-			input[name=checkbox]:checked {background: url(/watero/images/shop/c_checkbox_on.png) center center no-repeat;background-size: 100%;}
			
 
				-			.delete-cart-style{font-size: 20px;margin-top: 30px;color: red;margin-left: 20px;}
			
 
				-			.btn-box {padding-left: 100px;}
			
 
				-			#pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 20px;}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<head>
			
 
				+	<meta charset="utf-8">
			
 
				+	<title></title>
			
 
				+	<meta name="Expires" content="0">
			
 
				+	<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
			
 
				+	<meta name="Cache-Control" content="post-check=0, pre-check=0">
			
 
				+	<meta name="Pragma" content="no-cache">
			
 
				+	<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.iamberry.com/watero/css/mui.min.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
			
 
				+	<style>
			
 
				+		input[name=checkbox] { width: 18px;height: 18px;-webkit-appearance: none;appearance: none;cursor: pointer;vertical-align: top;background: url(//s.iamberry.com/watero/images/shop/c_checkbox_off.png) center center no-repeat;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;position: relative;border: 0;background-size: 100%;}
			
 
				+		input[name=checkbox]:checked {background: url(//s.iamberry.com/watero/images/shop/c_checkbox_on.png) center center no-repeat;background-size: 100%;}
			
 
				+		.delete-cart-style{font-size: 20px;margin-top: 30px;color: red;margin-left: 20px;}
			
 
				+		.btn-box {padding-left: 100px;}
			
 
				+		#pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 20px;}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content">
			
 
				-			<div class="gwc_null">
			
 
				-				<img src="/watero/wateroimages/shop/empty_cart.png">
			
 
				-				<h3>购物车还是空的</h3>
			
 
				-				<a href="/iamberry/wechat/wxCart/goProductList" class="mui-btn my-btn-danger go_web_shop" style="width: 65%;padding: 10px 10px;">马上逛逛</a>
			
 
				-				<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<div class="gwc_null">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/empty_cart.png">
			
 
				+		<h3>购物车还是空的</h3>
			
 
				+		<a href="/iamberry/wechat/wxCart/goProductList" class="mui-btn my-btn-danger go_web_shop" style="width: 65%;padding: 10px 10px;">马上逛逛</a>
			
 
				+		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				 			<a class="mui-tab-item" >
			
 
				 				<div class="iconfont icon-home"></div>
			
 
				 				<span class="mui-tab-label">首页</span>
			
 
				 			</a>
			
 
				 			<a class="mui-tab-item mui-active">
			
 
				 				<div class="iconfont icon-gouwuche">
			
 
				-				<!-- <span class="mui-badge">0</span> -->
			
 
				+					<!-- <span class="mui-badge">0</span> -->
			
 
				 				</div>
			
 
				 				<span class="mui-tab-label">购物车</span>
			
 
				 			</a>
			
@@ -58,46 +58,46 @@
 
				 				<div class="iconfont icon-vip"></div>
			
 
				 				<span class="mui-tab-label">会员中心</span>
			
 
				 			</a>
			
 
				-	</nav>
			
 
				-			</div>
			
 
				-			<div class="shopping-box">
			
 
				-			<div class="tt-yf">
			
 
				-					<label class="click-all-btn"><input name="checkbox" checked="checked" type="checkbox" class="all_check" />全选</label>
			
 
				-					<a href="#" class="mui-btn my-btn-danger go_web_shop">再挑一下</a>
			
 
				-			</div>
			
 
				-						
			
 
				-			</div>
			
 
				-			<div class="shoping-tt">
			
 
				-				<span class="left"><img src="/watero/wateroimages/shop/jiao1.png" /></span>
			
 
				-				<span class="right"><img src="/watero/wateroimages/shop/jiao2.png" /></span>
			
 
				-				<!-- 购物车项 -->
			
 
				-				<ul class="mui-table-view shopping-cart-list" id="cart-list-ul"></ul>
			
 
				-			</div>
			
 
				-			<div class="buy-footer1">
			
 
				-				<table class="tb-clearing">
			
 
				-					<tr>
			
 
				-						<td rowspan="2" class="quanxuan">
			
 
				-							<label class="click-all-btn">
			
 
				-								<input type="checkbox" name="checkbox" checked="checked" class="all_check"/><br>全选
			
 
				-							</label>
			
 
				-						</td>
			
 
				-						<td rowspan="2" class="t-r">总计:</td>
			
 
				-						<td class="count_price_box">¥<span class="count_price" id="pay-total">0</span>元</td>
			
 
				-						<td rowspan="2">
			
 
				-							<a id="go-clearing" class="mui-btn mui-pull-right add_gwc">去结算(0)</a>
			
 
				-						</td>
			
 
				-					</tr>
			
 
				-					<tr>
			
 
				-					</tr>
			
 
				-				</table>
			
 
				-			</div>
			
 
				-		</div>
			
 
				+		</nav>
			
 
				+	</div>
			
 
				+	<div class="shopping-box">
			
 
				+		<div class="tt-yf">
			
 
				+			<label class="click-all-btn"><input name="checkbox" checked="checked" type="checkbox" class="all_check" />全选</label>
			
 
				+			<a href="#" class="mui-btn my-btn-danger go_web_shop">再挑一下</a>
			
 
				 		</div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/shopping_cart.js?v334=323"></script>
			
 
				-	</body>
			
 
				+
			
 
				+	</div>
			
 
				+	<div class="shoping-tt">
			
 
				+		<span class="left"><img src="//s.iamberry.com/watero/images/shop/jiao1.png" /></span>
			
 
				+		<span class="right"><img src="//s.iamberry.com/watero/images/shop/jiao2.png" /></span>
			
 
				+		<!-- 购物车项 -->
			
 
				+		<ul class="mui-table-view shopping-cart-list" id="cart-list-ul"></ul>
			
 
				+	</div>
			
 
				+	<div class="buy-footer1">
			
 
				+		<table class="tb-clearing">
			
 
				+			<tr>
			
 
				+				<td rowspan="2" class="quanxuan">
			
 
				+					<label class="click-all-btn">
			
 
				+						<input type="checkbox" name="checkbox" checked="checked" class="all_check"/><br>全选
			
 
				+					</label>
			
 
				+				</td>
			
 
				+				<td rowspan="2" class="t-r">总计:</td>
			
 
				+				<td class="count_price_box">¥<span class="count_price" id="pay-total">0</span>元</td>
			
 
				+				<td rowspan="2">
			
 
				+					<a id="go-clearing" class="mui-btn mui-pull-right add_gwc">去结算(0)</a>
			
 
				+				</td>
			
 
				+			</tr>
			
 
				+			<tr>
			
 
				+			</tr>
			
 
				+		</table>
			
 
				+	</div>
			
 
				+</div>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2017030101"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017030101"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/shopping_cart.js?v=2017030801"></script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_apply_cash.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_apply_cash.html
@@ -1,82 +1,82 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				 		.mui-table-view-cell:after,.mui-table-view:after{display:none;}
			
 
				 		.mui-segmented-control .mui-control-item{line-height: 50px;border:0;border-bottom: 2px solid transparent;background-color:#fff;color:#b5b5b5;}
			
 
				 		.mui-segmented-control{border:0;}
			
 
				 		.mui-segmented-control .mui-control-item.mui-active{color:#f64e78;background-color:#fff;border-bottom: 2px solid #f64e78;}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item" >
			
 
				-				<div class="iconfont icon-home"></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">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<div class="mui-content">
			
 
				-<!-- 			<div style="background: #fff;padding: 10px;">
			
 
				-				<button type="button" onclick="window.location.href='/iamberry/wechat/integralWechat/withdrawLog'" class="mui-btn my-btn-link ft-18 go_tixian_log">我的积分提现记录</button>
			
 
				-				<button type="button" class="mui-btn my-btn-link go_tixian_cash_log">我的现金提现记录</button>
			
 
				-			</div> -->
			
 
				-			<div id="sliderSegmentedControl" class="mui-segmented-control">
			
 
				-						<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
			
 
				-							<span class="mui-tab-label">提现申请</span>
			
 
				-						</a>
			
 
				-						<a class="mui-control-item go_tixian_cash_log" tabindex="1" >
			
 
				-							<span class="mui-tab-label">提现记录</span>
			
 
				-						</a>
			
 
				-				</div>
			
 
				-			<ul class="mui-table-view" style="background-color: transparent;">
			
 
				-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="show-title-span">加载中...</span></li>
			
 
				-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="username" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
			
 
				-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="user-tel" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
			
 
				-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="user-info-span">加载中...</span></li>
			
 
				-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" value="0" onchange="cashChange()" id="user-cash-num" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量" onkeyup="value=value.replace(/[^\d\.]/g,'')"><span id="apply-num-money"></span></li>
			
 
				-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="text" id="bank-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
			
 
				-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankch-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
			
 
				-				<li style="text-align: center;padding: 10px 0;"><button type="button" id="submit-apply-btn" class="mui-btn my-btn-green" style="width: 50%;">立即提现</button></li>
			
 
				-			</ul>
			
 
				-		</div>
			
 
				-		
			
 
				-	</body>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/tixian_apply_cash.js"></script>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<div class="mui-content">
			
 
				+	<!-- 			<div style="background: #fff;padding: 10px;">
			
 
				+                    <button type="button" onclick="window.location.href='/iamberry/wechat/integralWechat/withdrawLog'" class="mui-btn my-btn-link ft-18 go_tixian_log">我的积分提现记录</button>
			
 
				+                    <button type="button" class="mui-btn my-btn-link go_tixian_cash_log">我的现金提现记录</button>
			
 
				+                </div> -->
			
 
				+	<div id="sliderSegmentedControl" class="mui-segmented-control">
			
 
				+		<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
			
 
				+			<span class="mui-tab-label">提现申请</span>
			
 
				+		</a>
			
 
				+		<a class="mui-control-item go_tixian_cash_log" tabindex="1" >
			
 
				+			<span class="mui-tab-label">提现记录</span>
			
 
				+		</a>
			
 
				+	</div>
			
 
				+	<ul class="mui-table-view" style="background-color: transparent;">
			
 
				+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="show-title-span">加载中...</span></li>
			
 
				+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="username" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
			
 
				+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="user-tel" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
			
 
				+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="user-info-span">加载中...</span></li>
			
 
				+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" value="0" onchange="cashChange()" id="user-cash-num" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量" onkeyup="value=value.replace(/[^\d\.]/g,'')"><span id="apply-num-money"></span></li>
			
 
				+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="text" id="bank-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
			
 
				+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankch-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
			
 
				+		<li style="text-align: center;padding: 10px 0;"><button type="button" id="submit-apply-btn" class="mui-btn my-btn-green" style="width: 50%;">立即提现</button></li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+
			
 
				+</body>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/tixian_apply_cash.js?v=2016101701"></script>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_cash_success.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_cash_success.html
@@ -1,75 +1,75 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-		<a class="mui-tab-item" >
			
 
				-			<div class="iconfont icon-home"></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">
			
 
				-			<div class="iconfont icon-vip"></div>
			
 
				-			<span class="mui-tab-label">会员中心</span>
			
 
				-		</a>
			
 
				-	</nav>
			
 
				-			<header class="mui-bar mui-bar-nav header">
			
 
				-					<div class="go-index go_index">
			
 
				-						<img src="/images/shop/logo.png" />
			
 
				-					</div>
			
 
				-			</header>
			
 
				-			<div class="mui-content" style="background: #fff;">
			
 
				-				<div class="pl-win-tt">
			
 
				-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，您的提现申请已提交，<br/> &nbsp; &nbsp;请等待审核！</span>
			
 
				-				<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
			
 
				-				</div>
			
 
				-				<ul class="pay_win_list">
			
 
				-					<li>订单编号：<span class="cl-0">4564654654654654</span></li>
			
 
				-					<li>收货人：王大鹏</li>
			
 
				-					<li>手机号码：13800138000</li>
			
 
				-					<li>订单金额：<span class="cl-0">￥521</span></li>
			
 
				-					<li>支付方式：在线支付</li>
			
 
				-					<li>订单时间:2015-12-12 15:000</li>
			
 
				-					<li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
			
 
				-				</ul>-->
			
 
				-			</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<header class="mui-bar mui-bar-nav header">
			
 
				+	<div class="go-index go_index">
			
 
				+		<img src="//s.iamberry.com/images/shop/logo.png" />
			
 
				+	</div>
			
 
				+</header>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="pl-win-tt">
			
 
				+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，您的提现申请已提交，<br/> &nbsp; &nbsp;请等待审核！</span>
			
 
				+		<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
			
 
				+        </div>
			
 
				+        <ul class="pay_win_list">
			
 
				+            <li>订单编号：<span class="cl-0">4564654654654654</span></li>
			
 
				+            <li>收货人：王大鹏</li>
			
 
				+            <li>手机号码：13800138000</li>
			
 
				+            <li>订单金额：<span class="cl-0">￥521</span></li>
			
 
				+            <li>支付方式：在线支付</li>
			
 
				+            <li>订单时间:2015-12-12 15:000</li>
			
 
				+            <li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
			
 
				+        </ul>-->
			
 
				+	</div>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 	<script>
			
 
				-	mui.ready(function(){
			
 
				-		//console.log("页面加载完毕")
			
 
				-		getCartNum();
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+        mui.ready(function(){
			
 
				+            //console.log("页面加载完毕")
			
 
				+            getCartNum();
			
 
				+            document.querySelector('.loading-bg').style.display='none';
			
 
				+        });
			
 
				 	</script>
			
 
				-	</body>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log.html
@@ -1,70 +1,70 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.mui-table-view {font-size: 12px;}
			
 
				-			.mui-table-view li>span {margin-right: 10px;}
			
 
				-			.mui-bar-tab~.mui-content {margin-top: 50px;}
			
 
				-		</style>
			
 
				-		<script >
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				+		.mui-table-view {font-size: 12px;}
			
 
				+		.mui-table-view li>span {margin-right: 10px;}
			
 
				+		.mui-bar-tab~.mui-content {margin-top: 50px;}
			
 
				+	</style>
			
 
				+	<script >
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item" >
			
 
				-				<div class="iconfont icon-home"></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">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<ul class="mui-table-view more">
			
 
				-			<li class="mui-table-view-cell ft-14"><a class="mui-navigate-right">提现记录<span class="mui-badge mui-badge-inverted ft-14 go_tixian_apply">继续兑换</span></a></li>
			
 
				-		</ul>
			
 
				-		<!--下拉刷新容器开始-->
			
 
				-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				-			<div class="mui-scroll">
			
 
				-				<!--数据列表开始-->
			
 
				-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<ul class="mui-table-view more">
			
 
				+	<li class="mui-table-view-cell ft-14"><a class="mui-navigate-right">提现记录<span class="mui-badge mui-badge-inverted ft-14 go_tixian_apply">继续兑换</span></a></li>
			
 
				+</ul>
			
 
				+<!--下拉刷新容器开始-->
			
 
				+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				+	<div class="mui-scroll">
			
 
				+		<!--数据列表开始-->
			
 
				+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				 
			
 
				-				</ul>
			
 
				-				<!--数据列表结束-->
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<!--下拉刷新容器结束-->
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/tixian_log.js"></script>
			
 
				-	</body>
			
 
				+		</ul>
			
 
				+		<!--数据列表结束-->
			
 
				+	</div>
			
 
				+</div>
			
 
				+<!--下拉刷新容器结束-->
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/tixian_log.js?v=2016101701"></script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log_cash.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log_cash.html
@@ -1,75 +1,75 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.mui-table-view {font-size: 12px;}
			
 
				-			.mui-table-view li>span {margin-right: 10px;}
			
 
				-			.mui-bar-tab~.mui-content {margin-top: 50px;}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				+		.mui-table-view {font-size: 12px;}
			
 
				+		.mui-table-view li>span {margin-right: 10px;}
			
 
				+		.mui-bar-tab~.mui-content {margin-top: 50px;}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item" >
			
 
				-				<div class="iconfont icon-home"></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">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<ul class="mui-table-view more">
			
 
				-			<li class="mui-table-view-cell ft-14">
			
 
				-				<a class="mui-navigate-right">提现记录
			
 
				-						<span class="mui-badge mui-badge-inverted ft-14 go_tixian_cash">继续提现</span>
			
 
				-					</a>
			
 
				-			</li>
			
 
				-		</ul>
			
 
				-		<!--下拉刷新容器开始-->
			
 
				-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				-			<div class="mui-scroll">
			
 
				-				<!--数据列表开始-->
			
 
				-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<ul class="mui-table-view more">
			
 
				+	<li class="mui-table-view-cell ft-14">
			
 
				+		<a class="mui-navigate-right">提现记录
			
 
				+			<span class="mui-badge mui-badge-inverted ft-14 go_tixian_cash">继续提现</span>
			
 
				+		</a>
			
 
				+	</li>
			
 
				+</ul>
			
 
				+<!--下拉刷新容器开始-->
			
 
				+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				+	<div class="mui-scroll">
			
 
				+		<!--数据列表开始-->
			
 
				+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				 
			
 
				-				</ul>
			
 
				-				<!--数据列表结束-->
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<!--下拉刷新容器结束-->
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/tixian_log_cash.js"></script>
			
 
				-	</body>
			
 
				+		</ul>
			
 
				+		<!--数据列表结束-->
			
 
				+	</div>
			
 
				+</div>
			
 
				+<!--下拉刷新容器结束-->
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/tixian_log_cash.js?v=2016101701"></script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_agreement.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_agreement.html
@@ -1,116 +1,116 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				-			.try_price{color: #f1436c;}
			
 
				-			.my-table{width: 100%;text-align: center;border-collapse:collapse;}
			
 
				-			.my-table td,.my-table th{border:1px solid #999; /* 设置边框属性；样式(solid=实线)、颜色(#999=灰) */}
			
 
				-		</style>
			
 
				-		<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>
			
 
				-				<div class="mui-content-padded">
			
 
				-					<ul class="mui-table-view mui-text-left ft-12">
			
 
				-					<li>
			
 
				-						<h4>Watero水时代净饮水一体机试用协议</h4>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						根据中华人民共和国合同法和有关法规，甲乙双方就试用爱贝源科技有限公司产品，经友好协商达成共识，并签订本协议。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						一、试用产品清单及价格
			
 
				-					</li>
			
 
				-					<li>
			
 
				-						<table class="my-table">
			
 
				-							<tr>
			
 
				-								<th>产品名称</th><th>型号</th><th>数量</th><th>单位</th><th>单价</th><th>总价</th>
			
 
				-							</tr>
			
 
				-							<tr>
			
 
				-								<td>Watero水时代净饮一体机</td><td>WA-1X</td><td>1</td><td>台</td><td>3680</td><td>3680</td>
			
 
				-							</tr>
			
 
				-							<tr>
			
 
				-								<td>4级RO滤芯</td><td></td><td>4</td><td>个</td><td>275</td><td>1098</td>
			
 
				-							</tr>
			
 
				-							<tr>
			
 
				-								<td>水桶</td><td></td><td>1</td><td>个</td><td>169</td><td>169</td>
			
 
				-							</tr>
			
 
				-							<tr>
			
 
				-								<td>接水台</td><td></td><td>1</td><td>个</td><td>69</td><td>69</td>
			
 
				-							</tr>
			
 
				-							<tr>
			
 
				-								<td>总价</td><td></td><td></td><td></td><td></td><td>3680</td>
			
 
				-							</tr>
			
 
				-						</table>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						二、交货时间及方法<br/> 甲方于申请报名试用3日内将送货到乙方收货地址。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						三、试用期限<br/> 乙方收到产品之日起计算，试用时间为20天。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						四、安装<br/> 甲方负责送货，本产品无须安装。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						五、甲方的权利与义务<br/>1、甲方在指定期限内免费提供一台价值3680元watero水时代净饮水机一台试用，甲方保证所提供试用产品为合格产品，并负责免费送货安装。
			
 
				-						<br/>2、试用期间甲方有权向乙方询问产品试用相关问题。
			
 
				-						<br/>3、试用期间，甲方负责对试用产品修理，如因乙方人为因素损坏，维修费用由乙方承担，且根据损坏程度甲方有权依其合理的判断决定是否由乙方按本合同第一条约定之零售价款购买该被损坏的机器。如在乙方试用期内因第三方原因损坏，乙方可在向甲方承担损失后向第三方追偿。
			
 
				-						<br/>4、在乙方试用产品期间，甲方拥有该产品的合法所有权，试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
			
 
				-						<br/>5、试用结束后甲方可将乙方提供的试用报告及试用过程中拍摄的图片、录像用于甲方后期宣传，并可在相关宣传资料中使用乙方姓名、形象及图片、录像。乙方认可甲方在实施上述行为前需获得乙方授权及认可，甲方的上述行为并未侵犯乙方的著作权、表演者权、肖像权、姓名权及其他正当权利。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						六、乙方的权利与义务<br/>1、乙方自愿申请试用甲方产品，试用过程中不得损坏样品、配件、原包装箱遗失或将产品打开拆卸；
			
 
				-						<br/>2、若乙方在试用过程中人为原因造成产品的破损，配件不全等，以及因外界不可抗因素所造成的产品或其零部件损坏，乙方按第一条中的价格全额购买该样品。若产品本身出现质量问题则与乙方无关。
			
 
				-						<br/>3、试用期间，乙方承担妥善保管、合理使用产品职责，保证产品外表无划痕、标签完整无破损、零配件和说明书完整等责任和义务。未经甲方书面同意，不得将试用产品转移、拆卸、转借、出租或赠予他人，更不可用做其他商业用途。
			
 
				-						<br/>4、本样品在乙方确认购买前的所有权属于甲方，乙方无处置权。
			
 
				-						<br/>5、试用期后，若乙方不接受该产品，甲方在确认样品无损坏后，自行收回该样品，合同亦终止。试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
			
 
				-						<br/>6、在以下情况下认为乙方自动购买该设备：
			
 
				-						<br/>（1）将设备转移、拆卸，转借、出租或赠予任何第三方使用，用做其他商业用途。
			
 
				-						<br/>（2）损坏设备外观。
			
 
				-						<br/>（3）撕毁设备相关资料和保修标签、保修服务卡。
			
 
				-						<br/>（4）超过试用期未将设备归还给甲方。
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"></li>
			
 
				-					<li>
			
 
				-						七、备注
			
 
				-						<br/>1、本协议为电子协议，勾选同意后即时生效，甲乙双方需履行协议。
			
 
				-						<br/><span class="try_price">如乙方不按照协议规定在试用结束后未按时归还产品，甲方将追究其法律责任。</span>
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				+		.try_price{color: #f1436c;}
			
 
				+		.my-table{width: 100%;text-align: center;border-collapse:collapse;}
			
 
				+		.my-table td,.my-table th{border:1px solid #999; /* 设置边框属性；样式(solid=实线)、颜色(#999=灰) */}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				 	</script>
			
 
				-	</body>
			
 
				+</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-padded">
			
 
				+	<ul class="mui-table-view mui-text-left ft-12">
			
 
				+		<li>
			
 
				+			<h4>Watero水时代净饮水一体机试用协议</h4>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			根据中华人民共和国合同法和有关法规，甲乙双方就试用爱贝源科技有限公司产品，经友好协商达成共识，并签订本协议。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			一、试用产品清单及价格
			
 
				+		</li>
			
 
				+		<li>
			
 
				+			<table class="my-table">
			
 
				+				<tr>
			
 
				+					<th>产品名称</th><th>型号</th><th>数量</th><th>单位</th><th>单价</th><th>总价</th>
			
 
				+				</tr>
			
 
				+				<tr>
			
 
				+					<td>Watero水时代净饮一体机</td><td>WA-1X</td><td>1</td><td>台</td><td>3680</td><td>3680</td>
			
 
				+				</tr>
			
 
				+				<tr>
			
 
				+					<td>4级RO滤芯</td><td></td><td>4</td><td>个</td><td>275</td><td>1098</td>
			
 
				+				</tr>
			
 
				+				<tr>
			
 
				+					<td>水桶</td><td></td><td>1</td><td>个</td><td>169</td><td>169</td>
			
 
				+				</tr>
			
 
				+				<tr>
			
 
				+					<td>接水台</td><td></td><td>1</td><td>个</td><td>69</td><td>69</td>
			
 
				+				</tr>
			
 
				+				<tr>
			
 
				+					<td>总价</td><td></td><td></td><td></td><td></td><td>3680</td>
			
 
				+				</tr>
			
 
				+			</table>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			二、交货时间及方法<br/> 甲方于申请报名试用3日内将送货到乙方收货地址。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			三、试用期限<br/> 乙方收到产品之日起计算，试用时间为20天。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			四、安装<br/> 甲方负责送货，本产品无须安装。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			五、甲方的权利与义务<br/>1、甲方在指定期限内免费提供一台价值3680元watero水时代净饮水机一台试用，甲方保证所提供试用产品为合格产品，并负责免费送货安装。
			
 
				+			<br/>2、试用期间甲方有权向乙方询问产品试用相关问题。
			
 
				+			<br/>3、试用期间，甲方负责对试用产品修理，如因乙方人为因素损坏，维修费用由乙方承担，且根据损坏程度甲方有权依其合理的判断决定是否由乙方按本合同第一条约定之零售价款购买该被损坏的机器。如在乙方试用期内因第三方原因损坏，乙方可在向甲方承担损失后向第三方追偿。
			
 
				+			<br/>4、在乙方试用产品期间，甲方拥有该产品的合法所有权，试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
			
 
				+			<br/>5、试用结束后甲方可将乙方提供的试用报告及试用过程中拍摄的图片、录像用于甲方后期宣传，并可在相关宣传资料中使用乙方姓名、形象及图片、录像。乙方认可甲方在实施上述行为前需获得乙方授权及认可，甲方的上述行为并未侵犯乙方的著作权、表演者权、肖像权、姓名权及其他正当权利。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			六、乙方的权利与义务<br/>1、乙方自愿申请试用甲方产品，试用过程中不得损坏样品、配件、原包装箱遗失或将产品打开拆卸；
			
 
				+			<br/>2、若乙方在试用过程中人为原因造成产品的破损，配件不全等，以及因外界不可抗因素所造成的产品或其零部件损坏，乙方按第一条中的价格全额购买该样品。若产品本身出现质量问题则与乙方无关。
			
 
				+			<br/>3、试用期间，乙方承担妥善保管、合理使用产品职责，保证产品外表无划痕、标签完整无破损、零配件和说明书完整等责任和义务。未经甲方书面同意，不得将试用产品转移、拆卸、转借、出租或赠予他人，更不可用做其他商业用途。
			
 
				+			<br/>4、本样品在乙方确认购买前的所有权属于甲方，乙方无处置权。
			
 
				+			<br/>5、试用期后，若乙方不接受该产品，甲方在确认样品无损坏后，自行收回该样品，合同亦终止。试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
			
 
				+			<br/>6、在以下情况下认为乙方自动购买该设备：
			
 
				+			<br/>（1）将设备转移、拆卸，转借、出租或赠予任何第三方使用，用做其他商业用途。
			
 
				+			<br/>（2）损坏设备外观。
			
 
				+			<br/>（3）撕毁设备相关资料和保修标签、保修服务卡。
			
 
				+			<br/>（4）超过试用期未将设备归还给甲方。
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell"></li>
			
 
				+		<li>
			
 
				+			七、备注
			
 
				+			<br/>1、本协议为电子协议，勾选同意后即时生效，甲乙双方需履行协议。
			
 
				+			<br/><span class="try_price">如乙方不按照协议规定在试用结束后未按时归还产品，甲方将追究其法律责任。</span>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_apply.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_apply.html
@@ -1,463 +1,463 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.head {height: 60px;}
			
 
				-			#head {line-height: 60px;}
			
 
				-			h3{margin-top:5px;margin-bottom: 0;}
			
 
				-			.btn-pull-code{position: absolute;right: 10px;top:7px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
			
 
				-			.btn-pull-code .active{background: #c8c8c8;}
			
 
				-			.icon-fuxuankuang a{color: #24cae9;}
			
 
				-			.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				-			.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				-			.try_price{color: #f1436c;}
			
 
				-			.ul_radio{width: 100%;}
			
 
				-			.ul_radio li{width:21%;height: 55px;margin: 0 1%;border: 1px solid rgba(0,0,0,.1);border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				-			.ul_radio .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				-			.radio1{background: url(/watero/images/cp-1.jpg) center center /auto 85% no-repeat;}
			
 
				-			.radio2{background: url(/watero/images/cp-2.jpg) center center /auto 85% no-repeat;}
			
 
				-			.radio3{background: url(/watero/images/cp-3.jpg) center center /auto 85% no-repeat;}
			
 
				-			.radio4{background: url(/watero/images/cp-4.jpg) center center /auto 85% no-repeat;}
			
 
				-			.head-img {position: absolute;bottom: 15px;right: 13px;width: 60px;height: 60px;border-radius: 30px;border: 3px solid #E5E5E5;}
			
 
				-			.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
			
 
				-			.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
			
 
				-			.my-table-view-try{border-top:1px solid rgba(0,0,0,.1);padding-bottom: 10px;}
			
 
				-			.my-table-view-try .mui-table-view-cell{padding:10px 13px 10px 30px !important;font-size: 12px;}
			
 
				-			.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				-			.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
			
 
				-			#btn_submit{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;border:0;}
			
 
				-			.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
			
 
				-			.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
			
 
				-			.mui-content-padded{margin: 10px 13px;}
			
 
				-			.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
			
 
				-			.mui-input-group .mui-input-row {height: 50px;padding: 5px 0;border: 1px solid rgba(0,0,0,.1); margin:10px 0;}
			
 
				-			.mui-input-row label{color: #666;width:27%;font-size: 15px;}
			
 
				-			.mui-input-row label~input{width:73%;}
			
 
				-			.mui-input-row label~input::-webkit-input-placeholder{font-size: 15px;}
			
 
				-			.triangle-down {width:0;height:0;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;}
			
 
				-			.my-arrowright{position: absolute;right: 18px;top: 28px;color: #666;pointer-events:none;}
			
 
				-			.mui-btn-red{background-color: #e9004c;}
			
 
				-			.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
			
 
				-		</style>
			
 
				-		<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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016111701">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
			
 
				+	<style>
			
 
				+		.head {height: 60px;}
			
 
				+		#head {line-height: 60px;}
			
 
				+		h3{margin-top:5px;margin-bottom: 0;}
			
 
				+		.btn-pull-code{position: absolute;right: 10px;top:7px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
			
 
				+		.btn-pull-code .active{background: #c8c8c8;}
			
 
				+		.icon-fuxuankuang a{color: #24cae9;}
			
 
				+		.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				+		.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				+		.try_price{color: #f1436c;}
			
 
				+		.ul_radio{width: 100%;}
			
 
				+		.ul_radio li{width:21%;height: 55px;margin: 0 1%;border: 1px solid rgba(0,0,0,.1);border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				+		.ul_radio .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				+		.radio1{background: url(//s.iamberry.com/watero/images/cp-1.jpg) center center /auto 85% no-repeat;}
			
 
				+		.radio2{background: url(//s.iamberry.com/watero/images/cp-2.jpg) center center /auto 85% no-repeat;}
			
 
				+		.radio3{background: url(//s.iamberry.com/watero/images/cp-3.jpg) center center /auto 85% no-repeat;}
			
 
				+		.radio4{background: url(//s.iamberry.com/watero/images/cp-4.jpg) center center /auto 85% no-repeat;}
			
 
				+		.head-img {position: absolute;bottom: 15px;right: 13px;width: 60px;height: 60px;border-radius: 30px;border: 3px solid #E5E5E5;}
			
 
				+		.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
			
 
				+		.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
			
 
				+		.my-table-view-try{border-top:1px solid rgba(0,0,0,.1);padding-bottom: 10px;}
			
 
				+		.my-table-view-try .mui-table-view-cell{padding:10px 13px 10px 30px !important;font-size: 12px;}
			
 
				+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
			
 
				+		#btn_submit{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;border:0;}
			
 
				+		.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
			
 
				+		.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
			
 
				+		.mui-content-padded{margin: 10px 13px;}
			
 
				+		.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
			
 
				+		.mui-input-group .mui-input-row {height: 50px;padding: 5px 0;border: 1px solid rgba(0,0,0,.1); margin:10px 0;}
			
 
				+		.mui-input-row label{color: #666;width:27%;font-size: 15px;}
			
 
				+		.mui-input-row label~input{width:73%;}
			
 
				+		.mui-input-row label~input::-webkit-input-placeholder{font-size: 15px;}
			
 
				+		.triangle-down {width:0;height:0;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;}
			
 
				+		.my-arrowright{position: absolute;right: 18px;top: 28px;color: #666;pointer-events:none;}
			
 
				+		.mui-btn-red{background-color: #e9004c;}
			
 
				+		.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
			
 
				+	</style>
			
 
				+	<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>
			
 
				 
			
 
				-					<div class="mui-content" style="background: #fff;">
			
 
				-				<div class="tips more">
			
 
				-					<h3>申请试用</h3>
			
 
				-					<span>（仅限山西省）</span>
			
 
				-				</div>
			
 
				-				<div class="mui-content-padded">
			
 
				-				<form class="mui-input-group">
			
 
				-					<div class="mui-input-row">
			
 
				-						<label>姓　名</label>
			
 
				-						<input type="text" maxlength="12" class="mui-input-clear" placeholder="请输入姓名" id="ipt-name">
			
 
				-					</div>
			
 
				-					<div class="mui-input-row">
			
 
				-						<label>手机号</label>
			
 
				-						<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请输入手机号" id="ipt-phone">
			
 
				-					</div>
			
 
				-					<div class="mui-input-row">
			
 
				-						<label>验证码</label>
			
 
				-						<input type="text" maxlength="4" placeholder="请输入验证码" id="ipt-code">
			
 
				-						<span class="btn-pull-code" id="pull-code">获取验证码</span>
			
 
				-					</div>
			
 
				-					<div style="display: table;width: 100%;padding: 10px 0;">
			
 
				-						<div style="display: table-cell;width: 30%;vertical-align: top;"><span class="iconfont icon-yanse">选择颜色</span></div><div style="display:table-cell;width:70%;text-align: right;">
			
 
				-							<ul class="ul_radio">
			
 
				-<!-- 							<li class="radio1 active"></li>
			
 
				-								<li class="radio2"></li>
			
 
				-								<li class="radio3"></li>
			
 
				-								<li class="radio4"></li> -->
			
 
				-							</ul>
			
 
				-						</div>
			
 
				-					</div>
			
 
				-					<div>
			
 
				-						<span class="iconfont icon-jiage">商品价格</span><span class="mui-pull-right ft-12"><!-- <s class="mui-h6">原价：¥<span id="productPrice">0</span></s> --><span>试用期内体验价：<span class="try_price">0元</span></span>&nbsp;&nbsp;<span>，<span id="productDiscount" class="try_price">0</span></span></span>
			
 
				-					</div>
			
 
				-				</form>
			
 
				-				</div>
			
 
				-				<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);">
			
 
				-					<li class="mui-table-view-cell" style="padding:12px 15px;">
			
 
				-						<a class="mui-navigate-right" id="open-wechat-addres-a">
			
 
				-							<span class="iconfont icon-songhuo">收货信息</span>
			
 
				-						<ul class="ul-addres">
			
 
				-							<!-- <li>收  货  人：林林</li>
			
 
				-							<li>手 机 号：15999999999</li>
			
 
				-							<li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
			
 
				-						</ul>
			
 
				-						</a>	
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				<ul class="mui-table-view my-table-view-try">
			
 
				-					<li style="padding: 10px 0 0 10px;" style="display:none">
			
 
				-						<span class="iconfont icon-youhui" style="display:none">支付优惠</span>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell" style="display:none">
			
 
				-						<img width="100%" src="../../images/cp-zeng.jpg" />
			
 
				-					</li>
			
 
				-					<li style="padding: 20px 10px;text-align: center;">
			
 
				-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">已阅,并同意<a id="xieyi-dalog">《用户试用协议》</a></span>
			
 
				-						<br /><span>请务必阅读</span>
			
 
				-					</li>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="tips more">
			
 
				+		<h3>申请试用</h3>
			
 
				+		<span>（仅限山西省）</span>
			
 
				+	</div>
			
 
				+	<div class="mui-content-padded">
			
 
				+		<form class="mui-input-group">
			
 
				+			<div class="mui-input-row">
			
 
				+				<label>姓　名</label>
			
 
				+				<input type="text" maxlength="12" class="mui-input-clear" placeholder="请输入姓名" id="ipt-name">
			
 
				+			</div>
			
 
				+			<div class="mui-input-row">
			
 
				+				<label>手机号</label>
			
 
				+				<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请输入手机号" id="ipt-phone">
			
 
				+			</div>
			
 
				+			<div class="mui-input-row">
			
 
				+				<label>验证码</label>
			
 
				+				<input type="text" maxlength="4" placeholder="请输入验证码" id="ipt-code">
			
 
				+				<span class="btn-pull-code" id="pull-code">获取验证码</span>
			
 
				+			</div>
			
 
				+			<div style="display: table;width: 100%;padding: 10px 0;">
			
 
				+				<div style="display: table-cell;width: 30%;vertical-align: top;"><span class="iconfont icon-yanse">选择颜色</span></div><div style="display:table-cell;width:70%;text-align: right;">
			
 
				+				<ul class="ul_radio">
			
 
				+					<!-- 							<li class="radio1 active"></li>
			
 
				+                                                    <li class="radio2"></li>
			
 
				+                                                    <li class="radio3"></li>
			
 
				+                                                    <li class="radio4"></li> -->
			
 
				 				</ul>
			
 
				-				
			
 
				-				<div class="mui-content-padded">
			
 
				-					<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_submit" >申请试用</button>
			
 
				-				</div>
			
 
				 			</div>
			
 
				+			</div>
			
 
				+			<div>
			
 
				+				<span class="iconfont icon-jiage">商品价格</span><span class="mui-pull-right ft-12"><!-- <s class="mui-h6">原价：¥<span id="productPrice">0</span></s> --><span>试用期内体验价：<span class="try_price">0元</span></span>&nbsp;&nbsp;<span>，<span id="productDiscount" class="try_price">0</span></span></span>
			
 
				+			</div>
			
 
				+		</form>
			
 
				+	</div>
			
 
				+	<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);">
			
 
				+		<li class="mui-table-view-cell" style="padding:12px 15px;">
			
 
				+			<a class="mui-navigate-right" id="open-wechat-addres-a">
			
 
				+				<span class="iconfont icon-songhuo">收货信息</span>
			
 
				+				<ul class="ul-addres">
			
 
				+					<!-- <li>收  货  人：林林</li>
			
 
				+                    <li>手 机 号：15999999999</li>
			
 
				+                    <li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
			
 
				+				</ul>
			
 
				+			</a>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<ul class="mui-table-view my-table-view-try">
			
 
				+		<li style="padding: 10px 0 0 10px;" style="display:none">
			
 
				+			<span class="iconfont icon-youhui" style="display:none">支付优惠</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell" style="display:none">
			
 
				+			<img width="100%" src="//s.iamberry.com/watero/images/cp-zeng.jpg" />
			
 
				+		</li>
			
 
				+		<li style="padding: 20px 10px;text-align: center;">
			
 
				+			<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">已阅,并同意<a id="xieyi-dalog">《用户试用协议》</a></span>
			
 
				+			<br /><span>请务必阅读</span>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+
			
 
				+	<div class="mui-content-padded">
			
 
				+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_submit" >申请试用</button>
			
 
				+	</div>
			
 
				+</div>
			
 
				 
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017021501"></script>
			
 
				 <script type="text/javascript">
			
 
				-	var check = false,alert_msg='';
			
 
				-	var mobile=/^(13|14|15|18)[0-9]{9}$/; //手机号码
			
 
				-	var uname = /^[\u4e00-\u9fa5]{1,12}$/; //中文英文
			
 
				-	var code = /^[0-9]{4}$/; //数字
			
 
				-	mui.ready(function(){
			
 
				-		$.ajax({
			
 
				-			type: 'post',
			
 
				-			url: base_path+'/probation/getUserInfo',
			
 
				-			data: {},
			
 
				-			dataType: 'json',
			
 
				-			timeout: 15000,
			
 
				-			success: function(dt) {
			
 
				-				//console.log(dt);
			
 
				-					if(dt==2){
			
 
				-						$.ajax({
			
 
				-							type: 'post',
			
 
				-							url: base_path+'/probation/getProductList',
			
 
				-							data: {},
			
 
				-							dataType: 'json',
			
 
				-							timeout: 15000,
			
 
				-							success: function(dt) {
			
 
				-								if(dt.status) {
			
 
				-									//console.log(dt.data[0]);
			
 
				-									var str='';
			
 
				-									mui(dt.data[0].colorList).each(function(index) {
			
 
				-										if(index==0){
			
 
				-											//$("#productPrice").text(accDiv(this.productPrice, 100));
			
 
				-											//console.log(this.colorList[0].colorDiscount)
			
 
				-											$("#productDiscount").text("试用价¥"+accDiv(this.colorDiscount, 100));
			
 
				-											str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+' active" colorid="'+(index+1)+'"></li>'
			
 
				-										}else{
			
 
				-											str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+'" colorid="'+(index+1)+'"></li>'
			
 
				-										}
			
 
				-									});
			
 
				-									$(".ul_radio").html(str);
			
 
				-									$(".ul_radio li").each(function() {
			
 
				-										$(this).on("click", function() {
			
 
				-											$(this).addClass("active");
			
 
				-											//$("#productPrice").text($(this).attr("productPrice"));
			
 
				-											$("#productDiscount").text("试用价¥"+$(this).attr("productDiscount"));
			
 
				-											$(this).siblings().removeClass("active");
			
 
				-										});
			
 
				-									});
			
 
				-									//console.log("页面加载完毕")
			
 
				-									document.querySelector('.loading-bg').style.display='none';
			
 
				-								} else {
			
 
				-									mui.alert(dt.message);
			
 
				-								}
			
 
				-							},
			
 
				-							error: function(xhr, type, errorThrown) {
			
 
				-								//异常处理；
			
 
				-								console.log(xhr);
			
 
				-								mui.alert("请检查网络或刷新页面重试！");								
			
 
				-							}
			
 
				-						});	
			
 
				-					}else if(dt==0){
			
 
				-						mui.alert("请先关注\"watero\"水时代", '', function() {
			
 
				-							 mui.openWindow({url: base_path+'/index'});
			
 
				-						}); 
			
 
				-					}else{
			
 
				-						mui.alert("您暂时还不能参与本次活动，详情请咨询watero微信商城客服", '', function() {
			
 
				-							 mui.openWindow({url: base_path+'/index'});
			
 
				-						});
			
 
				-					}
			
 
				-			},
			
 
				-			error: function(xhr, type, errorThrown) {
			
 
				-				//异常处理；
			
 
				-				console.log(xhr);
			
 
				-				mui.alert("请检查网络或刷新页面重试！");
			
 
				-			}
			
 
				-		});	
			
 
				-	});
			
 
				-	mui('body').on('tap', '#btn_submit', function() {
			
 
				-		//console.log($(".ul_radio .active").attr("colorid"));
			
 
				-		var th=this;
			
 
				-		change_input();
			
 
				-		if(check){
			
 
				-			mui(th).button('loading');
			
 
				-			var param = {
			
 
				-					"puserName": $("#ipt-name").val(),
			
 
				-					"puserTel": $("#ipt-phone").val(),
			
 
				-					"puserProductid": $(".ul_radio .active").attr("id"),
			
 
				-					"puserNickName":nickname ,
			
 
				-					"puser": ads_tel,
			
 
				-					"puserAddress": address,
			
 
				-					"colorId":$(".ul_radio .active").attr("colorid"),
			
 
				-				};
			
 
				-			
			
 
				-			$.ajax({
			
 
				-				type: 'get',
			
 
				-				url: base_path+'/probationOrder/validation_code',
			
 
				-				data: {"phone":$("#ipt-phone").val().trim(),"code":$("#ipt-code").val().trim(),"colorId":$(".ul_radio .active").attr("colorid")},
			
 
				-				dataType: 'json',
			
 
				-				timeout: 15000,
			
 
				-				success: function(dt) {
			
 
				-					//console.log(dt);
			
 
				-					if(dt.returnCode==200) {						 
			
 
				-						$.ajax({
			
 
				-							type: 'post',
			
 
				-							url: base_path+'/probationOrder/addProbationOrder',
			
 
				-							data: param,
			
 
				-							dataType: 'json',
			
 
				-							timeout: 15000,
			
 
				-							success: function(dt) {
			
 
				-								//console.log(dt);
			
 
				-								if(dt.status) {						 
			
 
				-									 mui.alert("本批watero试用机为新机，请您在试用过程中足够爱惜，切勿刮划机身及损坏包装，感谢您的配合！", '', function() {
			
 
				-										 mui.openWindow({url: '/watero/html/wechat/vip_center.html'})
			
 
				-									}); 
			
 
				-								} else {
			
 
				-									mui(th).button('reset');
			
 
				-									mui.alert(dt.message);
			
 
				-								}
			
 
				-							},
			
 
				-							error: function(xhr, type, errorThrown) {
			
 
				-								//异常处理；
			
 
				-								console.log(xhr);
			
 
				-								mui.alert("请检查网络或刷新页面重试！");
			
 
				-								mui(th).button('reset');
			
 
				-							}
			
 
				-						});	
			
 
				-					}else{
			
 
				-						mui(th).button('reset');
			
 
				-						mui.alert(dt.returnMsg.returnMsg);
			
 
				-					}
			
 
				-				},
			
 
				-				error: function(xhr, type, errorThrown) {
			
 
				-					//异常处理；
			
 
				-					mui(th).button('reset');
			
 
				-					console.log(xhr);
			
 
				-					mui.alert("请检查网络或刷新页面重试！");
			
 
				-				}
			
 
				-			});				
			
 
				-		}else{
			
 
				-			//console.log("未通过");
			
 
				-			mui.alert(alert_msg);
			
 
				-		}
			
 
				-	});
			
 
				-	mui('body').on('tap', '#xieyi-dalog', function() {
			
 
				-		mui.openWindow({
			
 
				-			url:base_path+ '/probation/try_agreement'
			
 
				-		});
			
 
				-	});
			
 
				-$(document).on('tap', '#btn-tongyi', function() {
			
 
				-	var btn_submit=$("#btn_submit");
			
 
				-	//console.log($(this).hasClass("mui-active"));
			
 
				-	if($(this).hasClass("mui-active")){
			
 
				-		$(this).removeClass("mui-active");
			
 
				-		btn_submit.removeClass("mui-active");
			
 
				-	}else{
			
 
				-		$(this).addClass("mui-active");
			
 
				-		btn_submit.addClass("mui-active");
			
 
				-	}
			
 
				-});
			
 
				-$(document).on('tap', '#pull-code', function() {
			
 
				-	if($("#ipt-phone").val().trim()=="" &&(!$("#pull-code").hasClass("mui-active"))){
			
 
				-		mui.alert("请填写手机号码");
			
 
				-		return;
			
 
				-	}else{
			
 
				-		if(!mobile.test($("#ipt-phone").val().trim())){
			
 
				-			mui.alert("手机号码不正确，请重新填写");
			
 
				-			return;
			
 
				-		}else{
			
 
				-			if($(this).hasClass("mui-active")){
			
 
				-				return;
			
 
				-			}else{
			
 
				-				$(this).addClass("mui-active");
			
 
				-				settime("pull-code");
			
 
				-				getConfig();
			
 
				-				$.ajax({
			
 
				-					type: 'get',
			
 
				-					url: base_path+'/probationOrder/send_code',
			
 
				-					data: {"phone":$("#ipt-phone").val().trim()},
			
 
				-					dataType: 'json',
			
 
				-					timeout: 15000,
			
 
				-					success: function(dt) {
			
 
				-						//console.log(dt);
			
 
				-						if(dt.returnCode==1) {		
			
 
				-							countdown=1;
			
 
				-							 mui.alert("该手机号码已经申请过，请勿重复提交！");
			
 
				-						}else if(dt.returnCode==2){
			
 
				-							countdown=1;
			
 
				-							 mui.alert("您使用的手机号码是空号");
			
 
				-						}else if(dt.returnCode==500){
			
 
				-							mui.alert(dt.returnMsg.returnMsg);
			
 
				-						}
			
 
				-					},
			
 
				-					error: function(xhr, type, errorThrown) {
			
 
				-						//异常处理；
			
 
				-						console.log(xhr);
			
 
				-						mui.alert("请检查网络或刷新页面重试！");
			
 
				-					}
			
 
				-				});	
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-});
			
 
				-var countdown=60; 
			
 
				-function settime(val) { 
			
 
				-pullid=dc(val);
			
 
				-if (countdown == 0) { 
			
 
				-pullid.removeAttribute("disabled");
			
 
				-pullid.className='btn-pull-code';
			
 
				-pullid.innerText="获取验证码"; 
			
 
				-countdown = 60; 
			
 
				-return false;
			
 
				-} else { 
			
 
				-pullid.setAttribute("disabled", true); 
			
 
				-pullid.className='btn-pull-code mui-active';
			
 
				-pullid.innerText="重新发送(" + countdown + ")"; 
			
 
				-countdown--; 
			
 
				-} 
			
 
				-setTimeout(function() { 
			
 
				-settime(val) 
			
 
				-},1000) 
			
 
				-} 
			
 
				-function change_input() {
			
 
				-	$(".mui-input-group input").each(function(index) {
			
 
				-		switch ($(this).attr("id")){
			
 
				-			case "ipt-name":
			
 
				-			if($(this).val().trim()==""){
			
 
				-				alert_msg="请填写姓名";
			
 
				-				check=false;
			
 
				-				return false;
			
 
				-			}else{
			
 
				-				if(uname.test($(this).val())) {
			
 
				-					check=true;
			
 
				-				}else{
			
 
				-					alert_msg="姓名格式不正确，请重新填写";
			
 
				-					check=false;
			
 
				-					return false;
			
 
				-				}
			
 
				-			}
			
 
				-				break;
			
 
				-			case "ipt-phone":
			
 
				-			if($(this).val().trim()==""){
			
 
				-				alert_msg="请填写手机号";
			
 
				-				check=false;
			
 
				-				return false;
			
 
				-			}else{
			
 
				-				if(mobile.test($(this).val().trim())) {
			
 
				-					check=true;
			
 
				-				}else{
			
 
				-					alert_msg="手机号码不正确，请重新填写";
			
 
				-					check=false;
			
 
				-					return false;
			
 
				-				}
			
 
				-			}
			
 
				-				break;
			
 
				-			case "ipt-code":
			
 
				-			if($(this).val().trim()==""){
			
 
				-				alert_msg="请填写验证码";
			
 
				-				check=false;
			
 
				-				return false;
			
 
				-			}else{
			
 
				-				if(code.test($(this).val().trim())) {
			
 
				-					check=true;
			
 
				-				}else{
			
 
				-					alert_msg="验证码格式不正确，请重新填写";
			
 
				-					check=false;
			
 
				-					return false;
			
 
				-				}
			
 
				-			}
			
 
				-				break;
			
 
				-			default:
			
 
				-				break;
			
 
				-		}
			
 
				-	});
			
 
				-	if(check) {
			
 
				-	if(address==''){
			
 
				-		alert_msg="请选择送货信息";
			
 
				-		check=false;
			
 
				-		return false;
			
 
				-	}else{
			
 
				-		check=true;
			
 
				-	}
			
 
				-	if($("#btn-tongyi").hasClass("mui-active")){
			
 
				-		alert_msg="请勾选同意试用协议";
			
 
				-		check=false;
			
 
				-		return false;
			
 
				-	}else{
			
 
				-		check=true;
			
 
				-	}
			
 
				-	}
			
 
				-	
			
 
				-/* 	if(check) {
			
 
				-		console.log("通过")
			
 
				-	} else {
			
 
				-		console.log(alert_msg);
			
 
				-	} */
			
 
				-}
			
 
				+    var check = false,alert_msg='';
			
 
				+    var mobile=/^(13|14|15|18)[0-9]{9}$/; //手机号码
			
 
				+    var uname = /^[\u4e00-\u9fa5]{1,12}$/; //中文英文
			
 
				+    var code = /^[0-9]{4}$/; //数字
			
 
				+    mui.ready(function(){
			
 
				+        $.ajax({
			
 
				+            type: 'post',
			
 
				+            url: base_path+'/probation/getUserInfo',
			
 
				+            data: {},
			
 
				+            dataType: 'json',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt);
			
 
				+                if(dt==2){
			
 
				+                    $.ajax({
			
 
				+                        type: 'post',
			
 
				+                        url: base_path+'/probation/getProductList',
			
 
				+                        data: {},
			
 
				+                        dataType: 'json',
			
 
				+                        timeout: 15000,
			
 
				+                        success: function(dt) {
			
 
				+                            if(dt.status) {
			
 
				+                                //console.log(dt.data[0]);
			
 
				+                                var str='';
			
 
				+                                mui(dt.data[0].colorList).each(function(index) {
			
 
				+                                    if(index==0){
			
 
				+                                        //$("#productPrice").text(accDiv(this.productPrice, 100));
			
 
				+                                        //console.log(this.colorList[0].colorDiscount)
			
 
				+                                        $("#productDiscount").text("试用价¥"+accDiv(this.colorDiscount, 100));
			
 
				+                                        str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+' active" colorid="'+(index+1)+'"></li>'
			
 
				+                                    }else{
			
 
				+                                        str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+'" colorid="'+(index+1)+'"></li>'
			
 
				+                                    }
			
 
				+                                });
			
 
				+                                $(".ul_radio").html(str);
			
 
				+                                $(".ul_radio li").each(function() {
			
 
				+                                    $(this).on("click", function() {
			
 
				+                                        $(this).addClass("active");
			
 
				+                                        //$("#productPrice").text($(this).attr("productPrice"));
			
 
				+                                        $("#productDiscount").text("试用价¥"+$(this).attr("productDiscount"));
			
 
				+                                        $(this).siblings().removeClass("active");
			
 
				+                                    });
			
 
				+                                });
			
 
				+                                //console.log("页面加载完毕")
			
 
				+                                document.querySelector('.loading-bg').style.display='none';
			
 
				+                            } else {
			
 
				+                                mui.alert(dt.message);
			
 
				+                            }
			
 
				+                        },
			
 
				+                        error: function(xhr, type, errorThrown) {
			
 
				+                            //异常处理；
			
 
				+                            console.log(xhr);
			
 
				+                            mui.alert("请检查网络或刷新页面重试！");
			
 
				+                        }
			
 
				+                    });
			
 
				+                }else if(dt==0){
			
 
				+                    mui.alert("请先关注\"watero\"水时代", '', function() {
			
 
				+                        mui.openWindow({url: base_path+'/index'});
			
 
				+                    });
			
 
				+                }else{
			
 
				+                    mui.alert("您暂时还不能参与本次活动，详情请咨询watero微信商城客服", '', function() {
			
 
				+                        mui.openWindow({url: base_path+'/index'});
			
 
				+                    });
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                //异常处理；
			
 
				+                console.log(xhr);
			
 
				+                mui.alert("请检查网络或刷新页面重试！");
			
 
				+            }
			
 
				+        });
			
 
				+    });
			
 
				+    mui('body').on('tap', '#btn_submit', function() {
			
 
				+        //console.log($(".ul_radio .active").attr("colorid"));
			
 
				+        var th=this;
			
 
				+        change_input();
			
 
				+        if(check){
			
 
				+            mui(th).button('loading');
			
 
				+            var param = {
			
 
				+                "puserName": $("#ipt-name").val(),
			
 
				+                "puserTel": $("#ipt-phone").val(),
			
 
				+                "puserProductid": $(".ul_radio .active").attr("id"),
			
 
				+                "puserNickName":nickname ,
			
 
				+                "puser": ads_tel,
			
 
				+                "puserAddress": address,
			
 
				+                "colorId":$(".ul_radio .active").attr("colorid"),
			
 
				+            };
			
 
				 
			
 
				-var address='',nickname='',ads_tel='';
			
 
				-// 获取微信共享地址
			
 
				-mui('body').on('tap', '#open-wechat-addres-a', function() {
			
 
				-	editAddrV1(
			
 
				-		function(res) {
			
 
				-			if(res.provinceName!="山西省"){
			
 
				-				address='';
			
 
				-				$(".ul-addres").empty();
			
 
				-				mui.alert("本活动仅限山西省用户");
			
 
				-			}else{
			
 
				-				// 用户成功拉出地址 
			
 
				-				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;
			
 
				-				nickname=res.userName;
			
 
				-				ads_tel=res.telNumber;
			
 
				-				$(".ul-addres").empty().append("<li>收货人：" + wechatAddr.userName + "</li><li>手 机 号：" + wechatAddr.userTel + "</li>" +"<li>详细地址：" + address + "</li>");
			
 
				-			}
			
 
				-		},
			
 
				-		function() {
			
 
				-			if(address != '') {
			
 
				-				wechatAddr.status = true;
			
 
				-			} else {
			
 
				-				wechatAddr.status = false;
			
 
				-				// 用户取消拉出地址
			
 
				-				mui.alert("您没有选择收货地址!");
			
 
				-			}
			
 
				-		}
			
 
				-	);
			
 
				+            $.ajax({
			
 
				+                type: 'get',
			
 
				+                url: base_path+'/probationOrder/validation_code',
			
 
				+                data: {"phone":$("#ipt-phone").val().trim(),"code":$("#ipt-code").val().trim(),"colorId":$(".ul_radio .active").attr("colorid")},
			
 
				+                dataType: 'json',
			
 
				+                timeout: 15000,
			
 
				+                success: function(dt) {
			
 
				+                    //console.log(dt);
			
 
				+                    if(dt.returnCode==200) {
			
 
				+                        $.ajax({
			
 
				+                            type: 'post',
			
 
				+                            url: base_path+'/probationOrder/addProbationOrder',
			
 
				+                            data: param,
			
 
				+                            dataType: 'json',
			
 
				+                            timeout: 15000,
			
 
				+                            success: function(dt) {
			
 
				+                                //console.log(dt);
			
 
				+                                if(dt.status) {
			
 
				+                                    mui.alert("本批watero试用机为新机，请您在试用过程中足够爱惜，切勿刮划机身及损坏包装，感谢您的配合！", '', function() {
			
 
				+                                        mui.openWindow({url: base_path+'/agentWechat/member'})
			
 
				+                                    });
			
 
				+                                } else {
			
 
				+                                    mui(th).button('reset');
			
 
				+                                    mui.alert(dt.message);
			
 
				+                                }
			
 
				+                            },
			
 
				+                            error: function(xhr, type, errorThrown) {
			
 
				+                                //异常处理；
			
 
				+                                console.log(xhr);
			
 
				+                                mui.alert("请检查网络或刷新页面重试！");
			
 
				+                                mui(th).button('reset');
			
 
				+                            }
			
 
				+                        });
			
 
				+                    }else{
			
 
				+                        mui(th).button('reset');
			
 
				+                        mui.alert(dt.returnMsg.returnMsg);
			
 
				+                    }
			
 
				+                },
			
 
				+                error: function(xhr, type, errorThrown) {
			
 
				+                    //异常处理；
			
 
				+                    mui(th).button('reset');
			
 
				+                    console.log(xhr);
			
 
				+                    mui.alert("请检查网络或刷新页面重试！");
			
 
				+                }
			
 
				+            });
			
 
				+        }else{
			
 
				+            //console.log("未通过");
			
 
				+            mui.alert(alert_msg);
			
 
				+        }
			
 
				+    });
			
 
				+    mui('body').on('tap', '#xieyi-dalog', function() {
			
 
				+        mui.openWindow({
			
 
				+            url:base_path+ '/probation/try_agreement'
			
 
				+        });
			
 
				+    });
			
 
				+    $(document).on('tap', '#btn-tongyi', function() {
			
 
				+        var btn_submit=$("#btn_submit");
			
 
				+        //console.log($(this).hasClass("mui-active"));
			
 
				+        if($(this).hasClass("mui-active")){
			
 
				+            $(this).removeClass("mui-active");
			
 
				+            btn_submit.removeClass("mui-active");
			
 
				+        }else{
			
 
				+            $(this).addClass("mui-active");
			
 
				+            btn_submit.addClass("mui-active");
			
 
				+        }
			
 
				+    });
			
 
				+    $(document).on('tap', '#pull-code', function() {
			
 
				+        if($("#ipt-phone").val().trim()=="" &&(!$("#pull-code").hasClass("mui-active"))){
			
 
				+            mui.alert("请填写手机号码");
			
 
				+            return;
			
 
				+        }else{
			
 
				+            if(!mobile.test($("#ipt-phone").val().trim())){
			
 
				+                mui.alert("手机号码不正确，请重新填写");
			
 
				+                return;
			
 
				+            }else{
			
 
				+                if($(this).hasClass("mui-active")){
			
 
				+                    return;
			
 
				+                }else{
			
 
				+                    $(this).addClass("mui-active");
			
 
				+                    settime("pull-code");
			
 
				+                    getConfig();
			
 
				+                    $.ajax({
			
 
				+                        type: 'get',
			
 
				+                        url: base_path+'/probationOrder/send_code',
			
 
				+                        data: {"phone":$("#ipt-phone").val().trim()},
			
 
				+                        dataType: 'json',
			
 
				+                        timeout: 15000,
			
 
				+                        success: function(dt) {
			
 
				+                            //console.log(dt);
			
 
				+                            if(dt.returnCode==1) {
			
 
				+                                countdown=1;
			
 
				+                                mui.alert("该手机号码已经申请过，请勿重复提交！");
			
 
				+                            }else if(dt.returnCode==2){
			
 
				+                                countdown=1;
			
 
				+                                mui.alert("您使用的手机号码是空号");
			
 
				+                            }else if(dt.returnCode==500){
			
 
				+                                mui.alert(dt.returnMsg.returnMsg);
			
 
				+                            }
			
 
				+                        },
			
 
				+                        error: function(xhr, type, errorThrown) {
			
 
				+                            //异常处理；
			
 
				+                            console.log(xhr);
			
 
				+                            mui.alert("请检查网络或刷新页面重试！");
			
 
				+                        }
			
 
				+                    });
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+    });
			
 
				+    var countdown=60;
			
 
				+    function settime(val) {
			
 
				+        pullid=dc(val);
			
 
				+        if (countdown == 0) {
			
 
				+            pullid.removeAttribute("disabled");
			
 
				+            pullid.className='btn-pull-code';
			
 
				+            pullid.innerText="获取验证码";
			
 
				+            countdown = 60;
			
 
				+            return false;
			
 
				+        } else {
			
 
				+            pullid.setAttribute("disabled", true);
			
 
				+            pullid.className='btn-pull-code mui-active';
			
 
				+            pullid.innerText="重新发送(" + countdown + ")";
			
 
				+            countdown--;
			
 
				+        }
			
 
				+        setTimeout(function() {
			
 
				+            settime(val)
			
 
				+        },1000)
			
 
				+    }
			
 
				+    function change_input() {
			
 
				+        $(".mui-input-group input").each(function(index) {
			
 
				+            switch ($(this).attr("id")){
			
 
				+                case "ipt-name":
			
 
				+                    if($(this).val().trim()==""){
			
 
				+                        alert_msg="请填写姓名";
			
 
				+                        check=false;
			
 
				+                        return false;
			
 
				+                    }else{
			
 
				+                        if(uname.test($(this).val())) {
			
 
				+                            check=true;
			
 
				+                        }else{
			
 
				+                            alert_msg="姓名格式不正确，请重新填写";
			
 
				+                            check=false;
			
 
				+                            return false;
			
 
				+                        }
			
 
				+                    }
			
 
				+                    break;
			
 
				+                case "ipt-phone":
			
 
				+                    if($(this).val().trim()==""){
			
 
				+                        alert_msg="请填写手机号";
			
 
				+                        check=false;
			
 
				+                        return false;
			
 
				+                    }else{
			
 
				+                        if(mobile.test($(this).val().trim())) {
			
 
				+                            check=true;
			
 
				+                        }else{
			
 
				+                            alert_msg="手机号码不正确，请重新填写";
			
 
				+                            check=false;
			
 
				+                            return false;
			
 
				+                        }
			
 
				+                    }
			
 
				+                    break;
			
 
				+                case "ipt-code":
			
 
				+                    if($(this).val().trim()==""){
			
 
				+                        alert_msg="请填写验证码";
			
 
				+                        check=false;
			
 
				+                        return false;
			
 
				+                    }else{
			
 
				+                        if(code.test($(this).val().trim())) {
			
 
				+                            check=true;
			
 
				+                        }else{
			
 
				+                            alert_msg="验证码格式不正确，请重新填写";
			
 
				+                            check=false;
			
 
				+                            return false;
			
 
				+                        }
			
 
				+                    }
			
 
				+                    break;
			
 
				+                default:
			
 
				+                    break;
			
 
				+            }
			
 
				+        });
			
 
				+        if(check) {
			
 
				+            if(address==''){
			
 
				+                alert_msg="请选择送货信息";
			
 
				+                check=false;
			
 
				+                return false;
			
 
				+            }else{
			
 
				+                check=true;
			
 
				+            }
			
 
				+            if($("#btn-tongyi").hasClass("mui-active")){
			
 
				+                alert_msg="请勾选同意试用协议";
			
 
				+                check=false;
			
 
				+                return false;
			
 
				+            }else{
			
 
				+                check=true;
			
 
				+            }
			
 
				+        }
			
 
				 
			
 
				-});
			
 
				-	</script>
			
 
				-	</body>
			
 
				+		/* 	if(check) {
			
 
				+		 console.log("通过")
			
 
				+		 } else {
			
 
				+		 console.log(alert_msg);
			
 
				+		 } */
			
 
				+    }
			
 
				+
			
 
				+    var address='',nickname='',ads_tel='';
			
 
				+    // 获取微信共享地址
			
 
				+    mui('body').on('tap', '#open-wechat-addres-a', function() {
			
 
				+        editAddrV1(
			
 
				+            function(res) {
			
 
				+                if(res.provinceName!="山西省"){
			
 
				+                    address='';
			
 
				+                    $(".ul-addres").empty();
			
 
				+                    mui.alert("本活动仅限山西省用户");
			
 
				+                }else{
			
 
				+                    // 用户成功拉出地址
			
 
				+                    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;
			
 
				+                    nickname=res.userName;
			
 
				+                    ads_tel=res.telNumber;
			
 
				+                    $(".ul-addres").empty().append("<li>收货人：" + wechatAddr.userName + "</li><li>手 机 号：" + wechatAddr.userTel + "</li>" +"<li>详细地址：" + address + "</li>");
			
 
				+                }
			
 
				+            },
			
 
				+            function() {
			
 
				+                if(address != '') {
			
 
				+                    wechatAddr.status = true;
			
 
				+                } else {
			
 
				+                    wechatAddr.status = false;
			
 
				+                    // 用户取消拉出地址
			
 
				+                    mui.alert("您没有选择收货地址!");
			
 
				+                }
			
 
				+            }
			
 
				+        );
			
 
				+
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_order.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_order.html
@@ -1,368 +1,368 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-<style>
			
 
				-.head {height: 60px;}
			
 
				-#head {line-height: 60px;}
			
 
				-.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				-.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				-.try_price{color: #f1436c;}
			
 
				-.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
			
 
				-.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
			
 
				-.my-table-view-try{border-top: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;padding: 10px 0;}
			
 
				-.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				-.mui-table-view-cell>a:not(.mui-btn){margin: -15px -15px;}
			
 
				-.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
			
 
				-#btn_pay{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;}
			
 
				-.mui-content-padded{margin: 10px 13px;}
			
 
				-.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
			
 
				-.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				-.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				-			
			
 
				-.point-time {content: "";position: absolute;width: 12px;height: 12px;top: 3px;left: 22px;background: #ccc;margin-left: -4px;border-radius: 50%;}
			
 
				-.point-blue{color: #ccc;}
			
 
				-.my-active .point-time {background-color:#01c0b5;}
			
 
				-.my-active .point-blue{color:#fff;position: relative;background: #01c0b5;padding: 3px 10px;border-radius:25px;}
			
 
				-.my-active .point-blue:before {position: absolute;content: "\00a0";width: 0px;height: 0px;border-width: 3px 6px 3px 0;border-style: solid;border-color: transparent #01c0b5 transparent transparent;top: 6px;left:-5px;}
			
 
				-.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
			
 
				-.content {width: 100%;margin:0 auto;}
			
 
				-.content article {position: relative;}
			
 
				-.content article section {padding: 0 0 20px 0;position: relative;}
			
 
				-.content article section:before {content: "";width: 1px;top: 17px;bottom:0;left: 23px;background: #ccc;position: absolute;}
			
 
				-.content article section:last-child:before {bottom:0;}
			
 
				-.content article section time {display: block;}
			
 
				-.content article section time > span {display: block;margin-left: 45px;color:#ccc;font-size: 12px;}
			
 
				-.content article section aside {color: #3a3a38;margin-left:45px;margin-right: 5px;}
			
 
				-.content article section aside p{margin-bottom: 0;font-size:13px;}
			
 
				-.content article section aside .things{color:#222;margin-top: 5px;}
			
 
				-.content article section:last-child:before {display: none;}
			
 
				-.content article .my-active time > span{color: #333;}
			
 
				-.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
			
 
				-</style>
			
 
				-		<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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.head {height: 60px;}
			
 
				+		#head {line-height: 60px;}
			
 
				+		.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				+		.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				+		.try_price{color: #f1436c;}
			
 
				+		.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
			
 
				+		.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
			
 
				+		.my-table-view-try{border-top: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;padding: 10px 0;}
			
 
				+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
			
 
				+		.mui-table-view-cell>a:not(.mui-btn){margin: -15px -15px;}
			
 
				+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
			
 
				+		#btn_pay{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;}
			
 
				+		.mui-content-padded{margin: 10px 13px;}
			
 
				+		.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
			
 
				+		.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
			
 
				+		.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				+
			
 
				+		.point-time {content: "";position: absolute;width: 12px;height: 12px;top: 3px;left: 22px;background: #ccc;margin-left: -4px;border-radius: 50%;}
			
 
				+		.point-blue{color: #ccc;}
			
 
				+		.my-active .point-time {background-color:#01c0b5;}
			
 
				+		.my-active .point-blue{color:#fff;position: relative;background: #01c0b5;padding: 3px 10px;border-radius:25px;}
			
 
				+		.my-active .point-blue:before {position: absolute;content: "\00a0";width: 0px;height: 0px;border-width: 3px 6px 3px 0;border-style: solid;border-color: transparent #01c0b5 transparent transparent;top: 6px;left:-5px;}
			
 
				+		.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
			
 
				+		.content {width: 100%;margin:0 auto;}
			
 
				+		.content article {position: relative;}
			
 
				+		.content article section {padding: 0 0 20px 0;position: relative;}
			
 
				+		.content article section:before {content: "";width: 1px;top: 17px;bottom:0;left: 23px;background: #ccc;position: absolute;}
			
 
				+		.content article section:last-child:before {bottom:0;}
			
 
				+		.content article section time {display: block;}
			
 
				+		.content article section time > span {display: block;margin-left: 45px;color:#ccc;font-size: 12px;}
			
 
				+		.content article section aside {color: #3a3a38;margin-left:45px;margin-right: 5px;}
			
 
				+		.content article section aside p{margin-bottom: 0;font-size:13px;}
			
 
				+		.content article section aside .things{color:#222;margin-top: 5px;}
			
 
				+		.content article section:last-child:before {display: none;}
			
 
				+		.content article .my-active time > span{color: #333;}
			
 
				+		.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
			
 
				+	</style>
			
 
				+	<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>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="tips more">
			
 
				+		<h3>试用订单详情</h3>
			
 
				 	</div>
			
 
				-			<div class="mui-content" style="background: #fff;">
			
 
				-				<div class="tips more">
			
 
				-					<h3>试用订单详情</h3>
			
 
				-				</div>
			
 
				-					<ul class="mui-table-view">
			
 
				-						<li class="mui-table-view-cell">
			
 
				-							试用订单号<span class="mui-pull-right" id="postNum"></span>
			
 
				-						</li>
			
 
				-						<li class="mui-table-view-cell">
			
 
				-							试用商品<span class="mui-pull-right" id="proName"></span>
			
 
				-						</li>
			
 
				-						<li class="mui-table-view-cell">
			
 
				-							商品价格<span class="mui-pull-right ft-12">试用期内体验价<span class="try_price">0元</span>，<!-- <s class="mui-h6" id="cost_price"></s> -->&nbsp;&nbsp;<span class="try_price" id="try_price"></span></span>
			
 
				-						</li>
			
 
				-						<li style="padding: 10px 0 0 10px;">
			
 
				-						<span class="iconfont icon-youhui">支付优惠</span>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell" style="display:none">
			
 
				-					<span>试用价格：<span class="try_price">0元</span></span><br/>
			
 
				-						<img width="100%" src="/watero/wateroimages/cp-zeng.jpg" />
			
 
				-						<br/><span class="try_price">产品试用未购买，不给予开发票</span>
			
 
				-					</li>
			
 
				-					</ul>
			
 
				+	<ul class="mui-table-view">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			试用订单号<span class="mui-pull-right" id="postNum"></span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			试用商品<span class="mui-pull-right" id="proName"></span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			商品价格<span class="mui-pull-right ft-12">试用期内体验价<span class="try_price">0元</span>，<!-- <s class="mui-h6" id="cost_price"></s> -->&nbsp;&nbsp;<span class="try_price" id="try_price"></span></span>
			
 
				+		</li>
			
 
				+		<li style="padding: 10px 0 0 10px;">
			
 
				+			<span class="iconfont icon-youhui">支付优惠</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell" style="display:none">
			
 
				+			<span>试用价格：<span class="try_price">0元</span></span><br/>
			
 
				+			<img width="100%" src="//s.iamberry.com/watero/images/cp-zeng.jpg" />
			
 
				+			<br/><span class="try_price">产品试用未购买，不给予开发票</span>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				 
			
 
				-				<ul class="mui-table-view my-table-view-try">
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						<a>
			
 
				-							<span class="iconfont icon-songhuo">送货信息</span>
			
 
				-						<ul class="ul-addres">
			
 
				-							<!-- <li>收  货  人：林林</li>
			
 
				-							<li>手 机 号：15999999999</li>
			
 
				-							<li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
			
 
				-						</ul>
			
 
				-						</a>	
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				<ul class="mui-table-view" id="ul-status">
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						订单状态
			
 
				-					</li>
			
 
				-					<li style="padding: 0;">
			
 
				-					<div class="content">
			
 
				-					<article>
			
 
				-						<section id="statu1">
			
 
				-							<span class="point-time"></span>
			
 
				-							<time>
			
 
				-								<span><span class="point-blue">待派送</span></span>
			
 
				-							</time>
			
 
				-						</section>
			
 
				-						<section id="statu2">
			
 
				-							<span class="point-time"></span>
			
 
				-							<time>
			
 
				-								<span><span class="point-blue">派送中</span><span id="sendName"></span></span>
			
 
				-							</time>
			
 
				-						</section>
			
 
				-						<section id="statu3">
			
 
				-							<span class="point-time"></span>
			
 
				-							<time>
			
 
				-								<span><span class="point-blue">待支付</span></span>
			
 
				-							</time>
			
 
				-						</section>
			
 
				-						<section id="statu4">
			
 
				-							<span class="point-time"></span>
			
 
				-							<time>
			
 
				-								<span><span class="point-blue">试用暂停</span></span>
			
 
				-							</time>
			
 
				-						</section>
			
 
				-						<section id="statu5">
			
 
				-							<span class="point-time"></span>
			
 
				-							<time>
			
 
				-								<span><span class="point-blue">支付完成</span></span>
			
 
				-							</time>
			
 
				-						</section>
			
 
				-					</article>
			
 
				-					</div>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						试用时间：剩余<span class="try_price" id="time_out"></span> 
			
 
				-					</li>
			
 
				+	<ul class="mui-table-view my-table-view-try">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a>
			
 
				+				<span class="iconfont icon-songhuo">送货信息</span>
			
 
				+				<ul class="ul-addres">
			
 
				+					<!-- <li>收  货  人：林林</li>
			
 
				+                    <li>手 机 号：15999999999</li>
			
 
				+                    <li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
			
 
				 				</ul>
			
 
				-				<div class="mui-content-padded">
			
 
				-					<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在请求数据，请稍后" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_pay" disabled="disabled">立即支付</button>
			
 
				-				</div>
			
 
				-		</div>
			
 
				-	<script type="text/javascript" src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script type="text/javascript" src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script type="text/javascript" src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript" src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	var postNum='';
			
 
				-	var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
			
 
				-	var istry=true;
			
 
				-	mui.ready(function(){
			
 
				-		$.ajax({
			
 
				-			type: 'post',
			
 
				-			url: base_path+'/probation/getProbationOrderDetail',
			
 
				-			data: {"orderId":getParam("orderId")},
			
 
				-			dataType: 'json',
			
 
				-			timeout: 15000,
			
 
				-			success: function(dt) {
			
 
				-				//console.log(dt);
			
 
				-				if(dt.status) {
			
 
				-					postNum=dt.data.probationOrderid;
			
 
				-					 $("#postNum").text(dt.data.probationOrderid);
			
 
				-					 $("#try_price").text("试用价¥"+accDiv(dt.data.probationYetAmount, 100));
			
 
				-					 //$("#cost_price").text("原价¥"+accDiv(dt.data.probationAmount, 100));
			
 
				-					 if (dt.data.probationPostNum != "" && dt.data.probationPostFirm != "") {
			
 
				-						 $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li><li>快递单号：' + dt.data.probationPostNum + '</li><li>快递公司：上门送货</li>');
			
 
				-					 } else {
			
 
				-						 $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li>');
			
 
				-					 }
			
 
				-					 if(dt.data.probationSendName!=""){
			
 
				-						 $("#sendName").html('（派送员：'+dt.data.probationSendName+'  手机:<a href="tel:'+dt.data.probationSendTel+'">'+dt.data.probationSendTel+'</a>）');
			
 
				-					 }
			
 
				-					 var proColor='';
			
 
				-					 switch (dt.data.probationColorType){
			
 
				-						case 1:
			
 
				-							proColor="品蓝";
			
 
				-							break;
			
 
				-						case 2:
			
 
				-							proColor="品黑";
			
 
				-							break;
			
 
				-						case 3:
			
 
				-							proColor="苹果绿";
			
 
				-							break;
			
 
				-						case 4:
			
 
				-							proColor="西瓜红";
			
 
				-							break;
			
 
				-						default:
			
 
				-							break;
			
 
				-					}
			
 
				-					 $("#proName").html(dt.data.probationProductName+'('+proColor+')');
			
 
				-					 //console.log(new Date().getTime())
			
 
				-					 $(".content #statu"+dt.data.probationStatus).addClass("my-active");
			
 
				-					 if(dt.data.probationStatus==3){
			
 
				-						 addTimer('time_out', dt.data.probationRemainingTime/ 1000);
			
 
				-						 $("#btn_pay").removeAttr("disabled").removeClass("mui-active");
			
 
				-							mui('body').on('tap', '#btn_pay', function() {
			
 
				-								var th=this;
			
 
				-								//console.log("立即支付");
			
 
				-								mui(this).button('loading');
			
 
				-								if(isPay){
			
 
				-									isPay = false; //锁定请求	
			
 
				-								$.ajax({
			
 
				-									type: 'post',
			
 
				-									url: base_path+'/probation/pay',
			
 
				-									data: {"orderId":postNum},
			
 
				-									dataType: 'json',
			
 
				-									timeout: 15000,
			
 
				-									success: function(dt) {
			
 
				-										//console.log(dt);
			
 
				-										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":postNum},
			
 
				-														dataType: 'json',
			
 
				-														timeout: 15000,
			
 
				-														success: function(data) {
			
 
				-															//console.log(data);
			
 
				-															if(data.status) {
			
 
				-																if(data.data==5){
			
 
				-																	mui.alert("支付成功", '', function() {
			
 
				-																		 mui.openWindow({url: base_path+'/probation/try_order?orderId='+postNum});
			
 
				-																	});
			
 
				-																}else{
			
 
				-																	mui.alert(data.message, '', function() {
			
 
				-																		mui(th).button('reset');
			
 
				-																	});
			
 
				-																}
			
 
				-															} else {
			
 
				-																mui(th).button('reset');
			
 
				-																mui.alert(data.message);
			
 
				-															}
			
 
				-														},
			
 
				-														error: function(xhr, type, errorThrown) {
			
 
				-															//异常处理；
			
 
				-															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) {
			
 
				-										//异常处理；
			
 
				-										console.log(xhr);
			
 
				-										mui(th).button('reset');
			
 
				-										mui.alert("请检查网络或刷新页面重试！");
			
 
				-									}
			
 
				-								});	
			
 
				-								}else{
			
 
				-									mui.alert("正在请求支付中~~请稍后!");
			
 
				-									return;
			
 
				-								}
			
 
				-							});
			
 
				-					 }else if(dt.data.probationStatus==1){
			
 
				-						 $("#time_out").parent().hide();
			
 
				-						 $("#btn_pay").removeAttr("disabled").removeClass("mui-active").text("取消订单");
			
 
				-						 mui('body').on('tap', '#btn_pay', function() {
			
 
				-								var th=this;
			
 
				-								//console.log("取消订单");
			
 
				-								var btnArray = ['否', '是'];
			
 
				-								mui.confirm('确认取消试用订单？', '温馨提示', btnArray, function(e) {
			
 
				-									if (e.index == 1) {
			
 
				-										mui(th).button('loading');
			
 
				-										if(istry){
			
 
				-											istry = false; //锁定请求	
			
 
				-										$.ajax({
			
 
				-											type: 'post',
			
 
				-											url: base_path+'/probation/userCancelOrder',
			
 
				-											data: {"orderId":postNum},
			
 
				-											dataType: 'json',
			
 
				-											timeout: 15000,
			
 
				-											success: function(dt) {
			
 
				-												//console.log(dt);
			
 
				-												if(dt.resultCode=="200") {
			
 
				-													location.reload(true);
			
 
				-												} else {
			
 
				-													mui(th).button('reset');
			
 
				-													mui.alert(dt.returnMsg.returnMsg);
			
 
				-												}
			
 
				-											},
			
 
				-											error: function(xhr, type, errorThrown) {
			
 
				-												//异常处理；
			
 
				-												console.log(xhr);
			
 
				-												mui(th).button('reset');
			
 
				-												mui.alert("请检查网络或刷新页面重试！");
			
 
				-											}
			
 
				-										});	
			
 
				-										}else{
			
 
				-											mui.alert("正在请求取消订单中~~请稍后!");
			
 
				-											return;
			
 
				-										}
			
 
				-									} else {
			
 
				-										mui(th).button('reset');
			
 
				-									}
			
 
				-								});
			
 
				-							});
			
 
				-					 }else if(dt.data.probationStatus==0){
			
 
				-						 $("#time_out").parent().hide();
			
 
				-						 $("#ul-status").hide();
			
 
				-						 $("#btn_pay").text("订单已取消");
			
 
				-					 }else{
			
 
				-						 $("#time_out").parent().hide();
			
 
				-					 }
			
 
				-				} else {
			
 
				-					mui.alert(dt.message);
			
 
				-				}
			
 
				-			},
			
 
				-			error: function(xhr, type, errorThrown) {
			
 
				-				//异常处理；
			
 
				-				console.log(xhr);
			
 
				-				mui.alert("请检查网络或刷新页面重试！");
			
 
				-			}
			
 
				-		});	
			
 
				-		//console.log("页面加载完毕")
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				-	
			
 
				-	var addTimer = function() {
			
 
				-		var list = [],
			
 
				-			interval;
			
 
				+			</a>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<ul class="mui-table-view" id="ul-status">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			订单状态
			
 
				+		</li>
			
 
				+		<li style="padding: 0;">
			
 
				+			<div class="content">
			
 
				+				<article>
			
 
				+					<section id="statu1">
			
 
				+						<span class="point-time"></span>
			
 
				+						<time>
			
 
				+							<span><span class="point-blue">待派送</span></span>
			
 
				+						</time>
			
 
				+					</section>
			
 
				+					<section id="statu2">
			
 
				+						<span class="point-time"></span>
			
 
				+						<time>
			
 
				+							<span><span class="point-blue">派送中</span><span id="sendName"></span></span>
			
 
				+						</time>
			
 
				+					</section>
			
 
				+					<section id="statu3">
			
 
				+						<span class="point-time"></span>
			
 
				+						<time>
			
 
				+							<span><span class="point-blue">待支付</span></span>
			
 
				+						</time>
			
 
				+					</section>
			
 
				+					<section id="statu4">
			
 
				+						<span class="point-time"></span>
			
 
				+						<time>
			
 
				+							<span><span class="point-blue">试用暂停</span></span>
			
 
				+						</time>
			
 
				+					</section>
			
 
				+					<section id="statu5">
			
 
				+						<span class="point-time"></span>
			
 
				+						<time>
			
 
				+							<span><span class="point-blue">支付完成</span></span>
			
 
				+						</time>
			
 
				+					</section>
			
 
				+				</article>
			
 
				+			</div>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			试用时间：剩余<span class="try_price" id="time_out"></span>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div class="mui-content-padded">
			
 
				+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在请求数据，请稍后" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_pay" disabled="disabled">立即支付</button>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<script type="text/javascript" src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script type="text/javascript" src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script type="text/javascript" src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript" src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    var postNum='';
			
 
				+    var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
			
 
				+    var istry=true;
			
 
				+    mui.ready(function(){
			
 
				+        $.ajax({
			
 
				+            type: 'post',
			
 
				+            url: base_path+'/probation/getProbationOrderDetail',
			
 
				+            data: {"orderId":getParam("orderId")},
			
 
				+            dataType: 'json',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt);
			
 
				+                if(dt.status) {
			
 
				+                    postNum=dt.data.probationOrderid;
			
 
				+                    $("#postNum").text(dt.data.probationOrderid);
			
 
				+                    $("#try_price").text("试用价¥"+accDiv(dt.data.probationYetAmount, 100));
			
 
				+                    //$("#cost_price").text("原价¥"+accDiv(dt.data.probationAmount, 100));
			
 
				+                    if (dt.data.probationPostNum != "" && dt.data.probationPostFirm != "") {
			
 
				+                        $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li><li>快递单号：' + dt.data.probationPostNum + '</li><li>快递公司：上门送货</li>');
			
 
				+                    } else {
			
 
				+                        $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li>');
			
 
				+                    }
			
 
				+                    if(dt.data.probationSendName!=""){
			
 
				+                        $("#sendName").html('（派送员：'+dt.data.probationSendName+'  手机:<a href="tel:'+dt.data.probationSendTel+'">'+dt.data.probationSendTel+'</a>）');
			
 
				+                    }
			
 
				+                    var proColor='';
			
 
				+                    switch (dt.data.probationColorType){
			
 
				+                        case 1:
			
 
				+                            proColor="品蓝";
			
 
				+                            break;
			
 
				+                        case 2:
			
 
				+                            proColor="品黑";
			
 
				+                            break;
			
 
				+                        case 3:
			
 
				+                            proColor="苹果绿";
			
 
				+                            break;
			
 
				+                        case 4:
			
 
				+                            proColor="西瓜红";
			
 
				+                            break;
			
 
				+                        default:
			
 
				+                            break;
			
 
				+                    }
			
 
				+                    $("#proName").html(dt.data.probationProductName+'('+proColor+')');
			
 
				+                    //console.log(new Date().getTime())
			
 
				+                    $(".content #statu"+dt.data.probationStatus).addClass("my-active");
			
 
				+                    if(dt.data.probationStatus==3){
			
 
				+                        addTimer('time_out', dt.data.probationRemainingTime/ 1000);
			
 
				+                        $("#btn_pay").removeAttr("disabled").removeClass("mui-active");
			
 
				+                        mui('body').on('tap', '#btn_pay', function() {
			
 
				+                            var th=this;
			
 
				+                            //console.log("立即支付");
			
 
				+                            mui(this).button('loading');
			
 
				+                            if(isPay){
			
 
				+                                isPay = false; //锁定请求
			
 
				+                                $.ajax({
			
 
				+                                    type: 'post',
			
 
				+                                    url: base_path+'/probation/pay',
			
 
				+                                    data: {"orderId":postNum},
			
 
				+                                    dataType: 'json',
			
 
				+                                    timeout: 15000,
			
 
				+                                    success: function(dt) {
			
 
				+                                        //console.log(dt);
			
 
				+                                        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":postNum},
			
 
				+                                                        dataType: 'json',
			
 
				+                                                        timeout: 15000,
			
 
				+                                                        success: function(data) {
			
 
				+                                                            //console.log(data);
			
 
				+                                                            if(data.status) {
			
 
				+                                                                if(data.data==5){
			
 
				+                                                                    mui.alert("支付成功", '', function() {
			
 
				+                                                                        mui.openWindow({url: base_path+'/probation/try_order?orderId='+postNum});
			
 
				+                                                                    });
			
 
				+                                                                }else{
			
 
				+                                                                    mui.alert(data.message, '', function() {
			
 
				+                                                                        mui(th).button('reset');
			
 
				+                                                                    });
			
 
				+                                                                }
			
 
				+                                                            } else {
			
 
				+                                                                mui(th).button('reset');
			
 
				+                                                                mui.alert(data.message);
			
 
				+                                                            }
			
 
				+                                                        },
			
 
				+                                                        error: function(xhr, type, errorThrown) {
			
 
				+                                                            //异常处理；
			
 
				+                                                            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) {
			
 
				+                                        //异常处理；
			
 
				+                                        console.log(xhr);
			
 
				+                                        mui(th).button('reset');
			
 
				+                                        mui.alert("请检查网络或刷新页面重试！");
			
 
				+                                    }
			
 
				+                                });
			
 
				+                            }else{
			
 
				+                                mui.alert("正在请求支付中~~请稍后!");
			
 
				+                                return;
			
 
				+                            }
			
 
				+                        });
			
 
				+                    }else if(dt.data.probationStatus==1){
			
 
				+                        $("#time_out").parent().hide();
			
 
				+                        $("#btn_pay").removeAttr("disabled").removeClass("mui-active").text("取消订单");
			
 
				+                        mui('body').on('tap', '#btn_pay', function() {
			
 
				+                            var th=this;
			
 
				+                            //console.log("取消订单");
			
 
				+                            var btnArray = ['否', '是'];
			
 
				+                            mui.confirm('确认取消试用订单？', '温馨提示', btnArray, function(e) {
			
 
				+                                if (e.index == 1) {
			
 
				+                                    mui(th).button('loading');
			
 
				+                                    if(istry){
			
 
				+                                        istry = false; //锁定请求
			
 
				+                                        $.ajax({
			
 
				+                                            type: 'post',
			
 
				+                                            url: base_path+'/probation/userCancelOrder',
			
 
				+                                            data: {"orderId":postNum},
			
 
				+                                            dataType: 'json',
			
 
				+                                            timeout: 15000,
			
 
				+                                            success: function(dt) {
			
 
				+                                                //console.log(dt);
			
 
				+                                                if(dt.resultCode=="200") {
			
 
				+                                                    location.reload(true);
			
 
				+                                                } else {
			
 
				+                                                    mui(th).button('reset');
			
 
				+                                                    mui.alert(dt.returnMsg.returnMsg);
			
 
				+                                                }
			
 
				+                                            },
			
 
				+                                            error: function(xhr, type, errorThrown) {
			
 
				+                                                //异常处理；
			
 
				+                                                console.log(xhr);
			
 
				+                                                mui(th).button('reset');
			
 
				+                                                mui.alert("请检查网络或刷新页面重试！");
			
 
				+                                            }
			
 
				+                                        });
			
 
				+                                    }else{
			
 
				+                                        mui.alert("正在请求取消订单中~~请稍后!");
			
 
				+                                        return;
			
 
				+                                    }
			
 
				+                                } else {
			
 
				+                                    mui(th).button('reset');
			
 
				+                                }
			
 
				+                            });
			
 
				+                        });
			
 
				+                    }else if(dt.data.probationStatus==0){
			
 
				+                        $("#time_out").parent().hide();
			
 
				+                        $("#ul-status").hide();
			
 
				+                        $("#btn_pay").text("订单已取消");
			
 
				+                    }else{
			
 
				+                        $("#time_out").parent().hide();
			
 
				+                    }
			
 
				+                } else {
			
 
				+                    mui.alert(dt.message);
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                //异常处理；
			
 
				+                console.log(xhr);
			
 
				+                mui.alert("请检查网络或刷新页面重试！");
			
 
				+            }
			
 
				+        });
			
 
				+        //console.log("页面加载完毕")
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				 
			
 
				-		return function(id, time) {
			
 
				-			if(!interval)
			
 
				-				interval = setInterval(go, 1000);
			
 
				-			list.push({
			
 
				-				ele: document.getElementById(id),
			
 
				-				time: time
			
 
				-			});
			
 
				-		}
			
 
				+    var addTimer = function() {
			
 
				+        var list = [],
			
 
				+            interval;
			
 
				 
			
 
				-		function go() {
			
 
				-			for(var i = 0; i < list.length; i++) {
			
 
				-				list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
			
 
				-				if(!list[i].time)
			
 
				-					list.splice(i--, 1);
			
 
				-			}
			
 
				-		}
			
 
				+        return function(id, time) {
			
 
				+            if(!interval)
			
 
				+                interval = setInterval(go, 1000);
			
 
				+            list.push({
			
 
				+                ele: document.getElementById(id),
			
 
				+                time: time
			
 
				+            });
			
 
				+        }
			
 
				 
			
 
				-		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 "试用已结束";
			
 
				-		}
			
 
				-	}();
			
 
				-	</script>
			
 
				-	</body>
			
 
				+        function go() {
			
 
				+            for(var i = 0; i < list.length; i++) {
			
 
				+                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 "试用已结束";
			
 
				+        }
			
 
				+    }();
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html
@@ -1,36 +1,36 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/vip_center.css" />
			
 
				-		<style>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016111001" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111001" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111001" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/vip_center.css?v=2016111001" />
			
 
				+	<style>
			
 
				 		.my-view-order .mui-media-body {
			
 
				-     padding-top: 0;
			
 
				-}
			
 
				-		 .center-middle{font-size: 12px;    position: absolute;
			
 
				-    left: 90px;
			
 
				-    top: 50%;
			
 
				-    -webkit-transform: translateY(-50%);}
			
 
				-.wh-80 {
			
 
				-    width: 70px !important;
			
 
				-    max-width: 70px !important;
			
 
				-    height: 70px !important;
			
 
				-    margin: 0 5px 0 0 !important;
			
 
				-    overflow: hidden;
			
 
				-    display: inline-block;
			
 
				-    text-align: center;
			
 
				-}
			
 
				-.wh-80 img {
			
 
				-    height: 70px;
			
 
				-}
			
 
				-.btn-box{bottom:auto;top:12px;}
			
 
				+			padding-top: 0;
			
 
				+		}
			
 
				+		.center-middle{font-size: 12px;    position: absolute;
			
 
				+			left: 90px;
			
 
				+			top: 50%;
			
 
				+			-webkit-transform: translateY(-50%);}
			
 
				+		.wh-80 {
			
 
				+			width: 70px !important;
			
 
				+			max-width: 70px !important;
			
 
				+			height: 70px !important;
			
 
				+			margin: 0 5px 0 0 !important;
			
 
				+			overflow: hidden;
			
 
				+			display: inline-block;
			
 
				+			text-align: center;
			
 
				+		}
			
 
				+		.wh-80 img {
			
 
				+			height: 70px;
			
 
				+		}
			
 
				+		.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;}
			
@@ -49,229 +49,229 @@
 
				 		.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;}
			
 
				+		#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;}
			
 
				 
			
 
				-.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;
			
 
				-}
			
 
				-.try-btn-pay{    background: #55c0dc;
			
 
				-    border: 1px solid transparent;
			
 
				-    border-radius: 4px;
			
 
				-    color: #fff;
			
 
				-    padding: 3px 8px;}
			
 
				- .center-middle{font-size: 12px;    position: absolute;
			
 
				-    left: 90px;
			
 
				-    top: 50%;
			
 
				-    -webkit-transform: translateY(-50%);}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				-	<body>
			
 
				-	<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				+		.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;
			
 
				+		}
			
 
				+		.try-btn-pay{    background: #55c0dc;
			
 
				+			border: 1px solid transparent;
			
 
				+			border-radius: 4px;
			
 
				+			color: #fff;
			
 
				+			padding: 3px 8px;}
			
 
				+		.center-middle{font-size: 12px;    position: absolute;
			
 
				+			left: 90px;
			
 
				+			top: 50%;
			
 
				+			-webkit-transform: translateY(-50%);}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<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-home"></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-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<div class="mui-content">
			
 
				+	<div class="vip-tt">
			
 
				+		<!-- <img src="/iamberry/common/shop/images/member_photo-bg_2.png"> -->
			
 
				+		<div class="tx bg-orange" id="headDiv">
			
 
				+			<img src="//s.iamberry.com/watero/images/shop/logo_head.png" id="userHead">
			
 
				+		</div>
			
 
				+		<div class="nikname">
			
 
				+			<div>
			
 
				+				<span id="userNickname">水时代</span>
			
 
				+			</div>
			
 
				+			<div>
			
 
				+				<span class="go_daili_2wm"  id="2WM"  style="display:none">立即分享二维码 ></span>
			
 
				+				<!-- <span class="btn_share to-up-img" id="toShare"  style="display:none">我要分享</span> -->
			
 
				 			</div>
			
 
				 		</div>
			
 
				-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-			<a class="mui-tab-item" >
			
 
				-				<div class="iconfont icon-home"></div>
			
 
				-				<span class="mui-tab-label">首页</span>
			
 
				+	</div>
			
 
				+	<!-- 			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				+                    <div id="menu-nav" class="mui-segmented-control">
			
 
				+                        <a class="mui-control-item go_cash_log">
			
 
				+                            <div class="iconfont icon-orderyue"></div>
			
 
				+                            余额
			
 
				+                        </a>
			
 
				+                        <a class="mui-control-item go_daili_order_list">
			
 
				+                            <div class="iconfont icon-orderjiangli"></div>
			
 
				+                            待奖励
			
 
				+                        </a>
			
 
				+                        <a class="mui-control-item go_couponList">
			
 
				+                            <div class="iconfont icon-orderyouhui"></div>
			
 
				+                            优惠券
			
 
				+                        </a>
			
 
				+                        <a class="mui-control-item go_gwc">
			
 
				+                            <div class="iconfont icon-ordercart"></div>
			
 
				+                            购物车
			
 
				+                        </a>
			
 
				+                    </div>
			
 
				+                </div> -->
			
 
				+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				+		<div id="menu-nav" class="mui-segmented-control">
			
 
				+			<a class="mui-control-item go_cash_log">
			
 
				+				<div class="iconfont icon-orderjiangli"></div>
			
 
				+				奖励记录
			
 
				 			</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 class="mui-control-item">
			
 
				+				<div class="iconfont icon-orderyue"></div>
			
 
				+				余额  <span class="cl-red">0.00</span>
			
 
				 			</a>
			
 
				-			<a class="mui-tab-item">
			
 
				-				<div class="iconfont icon-dingdan"></div>
			
 
				-				<span class="mui-tab-label">我的订单</span>
			
 
				+			<a class="mui-control-item" href="/watero/view/coupon_bag.html">
			
 
				+				<div class="iconfont icon-wodequanbao"></div>
			
 
				+				我的券包
			
 
				 			</a>
			
 
				-			<a class="mui-tab-item mui-active">
			
 
				-				<div class="iconfont icon-vip"></div>
			
 
				-				<span class="mui-tab-label">会员中心</span>
			
 
				+		</div>
			
 
				+	</div>
			
 
				+	<ul class="mui-table-view my-view-order">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a class="mui-navigate-right go_pay_count">
			
 
				+				我的订单
			
 
				 			</a>
			
 
				-	</nav>
			
 
				-	<div class="mui-content">
			
 
				-				<div class="vip-tt">
			
 
				-				<!-- <img src="/iamberry/common/shop/images/member_photo-bg_2.png"> -->
			
 
				-				<div class="tx bg-orange" id="headDiv">
			
 
				-					<img src="/watero/wateroimages/shop/logo_head.png" id="userHead">
			
 
				-				</div>
			
 
				-				<div class="nikname">
			
 
				-					<div>
			
 
				-						<span id="userNickname">水时代</span>
			
 
				-					</div>
			
 
				-					<div>
			
 
				-						<span class="go_daili_2wm"  id="2WM"  style="display:none">立即分享二维码 ></span> 
			
 
				-						<!-- <span class="btn_share to-up-img" id="toShare"  style="display:none">我要分享</span> -->
			
 
				-					</div>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-<!-- 			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				-				<div id="menu-nav" class="mui-segmented-control">
			
 
				-					<a class="mui-control-item go_cash_log">
			
 
				-						<div class="iconfont icon-orderyue"></div>
			
 
				-						余额
			
 
				-					</a>
			
 
				-					<a class="mui-control-item go_daili_order_list">
			
 
				-						<div class="iconfont icon-orderjiangli"></div>
			
 
				-						待奖励
			
 
				-					</a>
			
 
				-					<a class="mui-control-item go_couponList">
			
 
				-						<div class="iconfont icon-orderyouhui"></div>
			
 
				-						优惠券
			
 
				-					</a>
			
 
				-					<a class="mui-control-item go_gwc">
			
 
				-						<div class="iconfont icon-ordercart"></div>
			
 
				-						购物车
			
 
				-					</a>
			
 
				-				</div>
			
 
				-			</div> -->
			
 
				-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				-				<div id="menu-nav" class="mui-segmented-control">
			
 
				-					<a class="mui-control-item go_cash_log">
			
 
				-						<div class="iconfont icon-orderjiangli"></div>
			
 
				-						奖励记录
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-orderyue"></div>
			
 
				-						余额  <span class="cl-red">0.00</span>
			
 
				-					</a>
			
 
				-					<a class="mui-control-item" href="/watero/view/coupon_bag.html">
			
 
				-						<div class="iconfont icon-wodequanbao"></div>
			
 
				-						我的券包
			
 
				-					</a>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			<ul class="mui-table-view my-view-order">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a class="mui-navigate-right go_pay_count">
			
 
				-						我的订单
			
 
				-					</a>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				-				<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_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-alldingdan"></div>
			
 
				-						全部订单
			
 
				-					</a>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			<ul class="mui-table-view my-view-order">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					设备租赁
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				-				<div id="menu-lease-order" class="mui-segmented-control">
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-daifahuo1" id="rent_wait_deliver"></div>
			
 
				-						全部订单
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-yifahuo" id="rent_already_deliver"></div>
			
 
				-						已发货
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-shebeiliebiao"></div>
			
 
				-						设备列表
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-zulinxieyi" id="xieyi-dalog"></div>
			
 
				-						租赁协议
			
 
				-					</a>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			<ul class="mui-table-view my-view-order">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					服务
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				-				<div id="menu-lease-other" class="mui-segmented-control">
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-xiaxian"></div>
			
 
				-						我的好友
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-shouhou"></div>
			
 
				-						售后服务
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-kefu"></div>
			
 
				-						客服电话
			
 
				-					</a>
			
 
				-					<a class="mui-control-item">
			
 
				-						<div class="iconfont icon-order"></div>
			
 
				-						常见问答
			
 
				-					</a>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			<!-- <ul class="mui-table-view mui-grid-view mui-grid-9" id="my-grid-8">
			
 
				-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				-		                    <span class="iconfont icon-xiaxian"></span>
			
 
				-		                    <div class="mui-media-body">我的好友</div></a></li>
			
 
				-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				-		                    <span class="iconfont icon-shouhou"></span>
			
 
				-		                    <div class="mui-media-body">售后服务</div></a></li>
			
 
				-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				-		                    <span class="iconfont icon-kefu"></span>
			
 
				-		                    <div class="mui-media-body">客服电话</div></a></li>
			
 
				-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				-		                    <span class="iconfont icon-order"></span>
			
 
				-		                    <div class="mui-media-body">常见问答</div></a></li>
			
 
				-		    </ul>
			
 
				- 		     <ul class="mui-table-view my-view-order" id="try_order_list">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-						试用订单
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell mui-media">
			
 
				-					<a proid="32" style="margin-left: -20px;">
			
 
				-						<span class="mui-media-object mui-pull-left wh-80">
			
 
				-							<img src="http://h5.iamberry.com/iamberry/common/images/uploadimages/image/20160930/8D648B0F3CFDD6342D41_20160930142724_6071.jpg">
			
 
				-						</span>
			
 
				-						<div class="mui-media-body ft-12">
			
 
				-							<div>待派送</div>
			
 
				-							<div>watero水时代净水机<small>(品黑)</small></div>
			
 
				-							<div>订单号1548265444951449</div>
			
 
				-						</div>
			
 
				-					</a>
			
 
				-					<div class="btn-box"><a proid="32" class="go_chanpin_details"></a><a class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="32">立即支付</a></div>
			
 
				-				</li>
			
 
				-			</ul>	 -->
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				+		<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_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-alldingdan"></div>
			
 
				+				全部订单
			
 
				+			</a>
			
 
				+		</div>
			
 
				+	</div>
			
 
				+	<ul class="mui-table-view my-view-order">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			设备租赁
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				+		<div id="menu-lease-order" class="mui-segmented-control">
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-daifahuo1" id="rent_wait_deliver"></div>
			
 
				+				全部订单
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-yifahuo" id="rent_already_deliver"></div>
			
 
				+				已发货
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-shebeiliebiao"></div>
			
 
				+				设备列表
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-zulinxieyi" id="xieyi-dalog"></div>
			
 
				+				租赁协议
			
 
				+			</a>
			
 
				+		</div>
			
 
				+	</div>
			
 
				+	<ul class="mui-table-view my-view-order">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			服务
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
			
 
				+		<div id="menu-lease-other" class="mui-segmented-control">
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-xiaxian"></div>
			
 
				+				我的好友
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-shouhou"></div>
			
 
				+				售后服务
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-kefu"></div>
			
 
				+				客服电话
			
 
				+			</a>
			
 
				+			<a class="mui-control-item">
			
 
				+				<div class="iconfont icon-order"></div>
			
 
				+				常见问答
			
 
				+			</a>
			
 
				+		</div>
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/vip_center.js"></script>
			
 
				-	</body>
			
 
				+	<!-- <ul class="mui-table-view mui-grid-view mui-grid-9" id="my-grid-8">
			
 
				+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				+                    <span class="iconfont icon-xiaxian"></span>
			
 
				+                    <div class="mui-media-body">我的好友</div></a></li>
			
 
				+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				+                    <span class="iconfont icon-shouhou"></span>
			
 
				+                    <div class="mui-media-body">售后服务</div></a></li>
			
 
				+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				+                    <span class="iconfont icon-kefu"></span>
			
 
				+                    <div class="mui-media-body">客服电话</div></a></li>
			
 
				+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
			
 
				+                    <span class="iconfont icon-order"></span>
			
 
				+                    <div class="mui-media-body">常见问答</div></a></li>
			
 
				+    </ul>
			
 
				+      <ul class="mui-table-view my-view-order" id="try_order_list">
			
 
				+        <li class="mui-table-view-cell">
			
 
				+                试用订单
			
 
				+        </li>
			
 
				+        <li class="mui-table-view-cell mui-media">
			
 
				+            <a proid="32" style="margin-left: -20px;">
			
 
				+                <span class="mui-media-object mui-pull-left wh-80">
			
 
				+                    <img src="//h5.iamberry.com/iamberry/common/images/uploadimages/image/20160930/8D648B0F3CFDD6342D41_20160930142724_6071.jpg">
			
 
				+                </span>
			
 
				+                <div class="mui-media-body ft-12">
			
 
				+                    <div>待派送</div>
			
 
				+                    <div>watero水时代净水机<small>(品黑)</small></div>
			
 
				+                    <div>订单号1548265444951449</div>
			
 
				+                </div>
			
 
				+            </a>
			
 
				+            <div class="btn-box"><a proid="32" class="go_chanpin_details"></a><a class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="32">立即支付</a></div>
			
 
				+        </li>
			
 
				+    </ul>	 -->
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016111701"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/vip_center.js?v=2017040701"></script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/wheel_log.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/wheel_log.html
@@ -1,156 +1,153 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
			
 
				-			.mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -10px;}
			
 
				-			p{font-size:12px;}
			
 
				-			.mui-pull-right{font-size: 12px;color:#d22c50;}
			
 
				-			.mui-table-view .mui-media-body{margin-top: 5px;}
			
 
				-			.mui-table-view .mui-media-object {line-height: 50px;max-width: 50px;height: 50px;}
			
 
				-			#whell-bar{background-color: #fff;height: 60px;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.35);box-shadow: 0 0 1px rgba(0,0,0,.35);display:none;}
			
 
				-		</style>
			
 
				-		<script type="text/javascript">
			
 
				-			// 屏蔽分享
			
 
				-			window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				-	<body>
			
 
				-	<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="whell-bar">
			
 
				-			<a class="mui-tab-item mui-active">
			
 
				-				<div class="my-tab-label" style="font-size: 12px;color: #d22c50;">立即去下单，把奖品抱回家吧！</div>
			
 
				-				<button type="button" class="mui-btn my-btn-red" style="top: 0;width: 165px;background: #d22c50;">立即购买</button>
			
 
				-			</a>
			
 
				-		</nav>
			
 
				-		<!--下拉刷新容器开始-->
			
 
				-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				-			<div class="mui-scroll">
			
 
				-				<!--数据列表-->
			
 
				-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				-					
			
 
				-				</ul>
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<!--下拉刷新容器结束-->
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
			
 
				+		.mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -10px;}
			
 
				+		p{font-size:12px;}
			
 
				+		.mui-pull-right{font-size: 12px;color:#d22c50;}
			
 
				+		.mui-table-view .mui-media-body{margin-top: 5px;}
			
 
				+		.mui-table-view .mui-media-object {line-height: 50px;max-width: 50px;height: 50px;}
			
 
				+		#whell-bar{background-color: #fff;height: 60px;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.35);box-shadow: 0 0 1px rgba(0,0,0,.35);display:none;}
			
 
				+	</style>
			
 
				 	<script type="text/javascript">
			
 
				-	
			
 
				-	var pageNumber = 0,pagesize = 10;
			
 
				-	mui.init({
			
 
				-				pullRefresh: {
			
 
				-					container: '#pullrefresh',
			
 
				-					down: {
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<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="whell-bar">
			
 
				+	<a class="mui-tab-item mui-active">
			
 
				+		<div class="my-tab-label" style="font-size: 12px;color: #d22c50;">立即去下单，把奖品抱回家吧！</div>
			
 
				+		<button type="button" class="mui-btn my-btn-red" style="top: 0;width: 165px;background: #d22c50;">立即购买</button>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<!--下拉刷新容器开始-->
			
 
				+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
			
 
				+	<div class="mui-scroll">
			
 
				+		<!--数据列表-->
			
 
				+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
			
 
				+
			
 
				+		</ul>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<!--下拉刷新容器结束-->
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+
			
 
				+    var pageNumber = 0,pagesize = 10;
			
 
				+    mui.init({
			
 
				+        pullRefresh: {
			
 
				+            container: '#pullrefresh',
			
 
				+            down: {
			
 
				 //						callback: pulldownRefresh
			
 
				-					},
			
 
				-					up: {
			
 
				-						contentrefresh: '正在加载...',
			
 
				-						callback: pullupRefresh
			
 
				-					}
			
 
				-				}
			
 
				-	});
			
 
				-			/**
			
 
				-			 * 上拉加载具体业务实现
			
 
				-			 */
			
 
				-			function pullupRefresh() {
			
 
				-				/* setTimeout(function() {
			
 
				-					mui('#pullrefresh').pullRefresh().endPullupToRefresh((++count > 2)); //参数为true代表没有更多数据了。
			
 
				-					var table = document.body.querySelector('.my-tab-view-pull');
			
 
				-					var cells = document.body.querySelectorAll('.my-tab-view-pull .mui-table-view-cell');
			
 
				-					for (var i = cells.length, len = i + 10; i < len; i++) {
			
 
				-						var li = document.createElement('li');
			
 
				-						li.className = 'mui-table-view-cell';
			
 
				-						li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="images/image-12.jpg"><div class="mui-media-body">获得一等奖'+(i+1)+'<p class="mui-ellipsis">iPhone7 亮黑版 32G一台</p></div><span class="mui-btn mui-btn-link">2016.09.19 20:00</span></a>';
			
 
				-						table.appendChild(li);
			
 
				-					}
			
 
				-				}, 1500); */
			
 
				-				++pageNumber;
			
 
				-				var btnArray = ['否', '是'];
			
 
				-				var table = document.body.querySelector('.my-tab-view-pull');
			
 
				-				$.ajax(base_path + '/game/get_prize_log?dates=' + new Date().getTime(), {
			
 
				-					data: {
			
 
				-						"pageSize": pagesize,
			
 
				-						"pageNO": pageNumber
			
 
				-					},
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-					dataType: 'json',
			
 
				-					type: 'post',
			
 
				-					timeout: 15000,
			
 
				-					success: function(dt) {
			
 
				-						console.log(dt);
			
 
				-						if (dt.status) {
			
 
				-							var data =dt.data;
			
 
				-							var wheel_data =[];
			
 
				-							if (null != data && data!="0") {
			
 
				-								wheel_data = data.winningList;
			
 
				-							}
			
 
				-							mui('#pullrefresh').pullRefresh().endPullupToRefresh((wheel_data.length < pagesize)); //参数为true代表没有更多数据了。
			
 
				-							mui(wheel_data).each(function(index) {
			
 
				-								var li = document.createElement('li');
			
 
				-								li.className = 'mui-table-view-cell';
			
 
				-								li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="'+this.logsPrizeImage+'"><div class="mui-media-body">'+ this.logsPrizeName +'<span class="mui-pull-right">' + this.logsGameName + '</span><p class="mui-ellipsis">' + this.logsDate + '<span class="mui-pull-right">x' + this.logsSum + '</span></p></div></a>';
			
 
				-								table.appendChild(li);
			
 
				-						});
			
 
				-					} else {
			
 
				-						mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
			
 
				-							if (e.index == 1) {
			
 
				-								location.reload(true);
			
 
				-							}
			
 
				-						});
			
 
				-					}
			
 
				-				},
			
 
				-				error: function(xhr, type, errorThrown) {
			
 
				-					//异常处理；
			
 
				-					errorfn(xhr);
			
 
				-				}
			
 
				-			});
			
 
				-			}
			
 
				-	mui.ready(function(){
			
 
				-		console.log("页面加载完毕");
			
 
				-		mui('#pullrefresh').pullRefresh().pullupLoading();
			
 
				-		$.ajax({
			
 
				-			type: 'post',
			
 
				-			url: base_path + '/game/buyOrder',
			
 
				-			data: {gameId:2},
			
 
				-			dataType: 'json',
			
 
				-			timeout: 15000,
			
 
				-			context: $('body'),
			
 
				-			success: function(data){
			
 
				-				if(data.status){
			
 
				-					if(!data.data){
			
 
				-						$("#whell-bar").show();
			
 
				-					}
			
 
				-				}
			
 
				-			},
			
 
				-			error: function(xhr, type){
			
 
				-				console.log('Ajax error!' + xhr)
			
 
				-				}
			
 
				-			});
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});	
			
 
				-	mui('body').on('tap', '#whell-bar .mui-btn', function() {
			
 
				-		mui.openWindow({
			
 
				-		url:'http://w.iamberry.com/watero/wechat/index'
			
 
				-		});
			
 
				-	});
			
 
				-		</script>
			
 
				-	</body>
			
 
				+            },
			
 
				+            up: {
			
 
				+                contentrefresh: '正在加载...',
			
 
				+                callback: pullupRefresh
			
 
				+            }
			
 
				+        }
			
 
				+    });
			
 
				+    /**
			
 
				+     * 上拉加载具体业务实现
			
 
				+     */
			
 
				+    function pullupRefresh() {
			
 
				+		/* setTimeout(function() {
			
 
				+		 mui('#pullrefresh').pullRefresh().endPullupToRefresh((++count > 2)); //参数为true代表没有更多数据了。
			
 
				+		 var table = document.body.querySelector('.my-tab-view-pull');
			
 
				+		 var cells = document.body.querySelectorAll('.my-tab-view-pull .mui-table-view-cell');
			
 
				+		 for (var i = cells.length, len = i + 10; i < len; i++) {
			
 
				+		 var li = document.createElement('li');
			
 
				+		 li.className = 'mui-table-view-cell';
			
 
				+		 li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="images/image-12.jpg"><div class="mui-media-body">获得一等奖'+(i+1)+'<p class="mui-ellipsis">iPhone7 亮黑版 32G一台</p></div><span class="mui-btn mui-btn-link">2016.09.19 20:00</span></a>';
			
 
				+		 table.appendChild(li);
			
 
				+		 }
			
 
				+		 }, 1500); */
			
 
				+        ++pageNumber;
			
 
				+        var btnArray = ['否', '是'];
			
 
				+        var table = document.body.querySelector('.my-tab-view-pull');
			
 
				+        mui.ajax(base_path + '/game/get_prize_log?dates=' + new Date().getTime(), {
			
 
				+            data: {
			
 
				+                "pageSize": pagesize,
			
 
				+                "pageNO": pageNumber
			
 
				+            },
			
 
				+            dataType: 'json',
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                console.log(dt);
			
 
				+                if (dt.status) {
			
 
				+                    var data =dt.data;
			
 
				+                    var wheel_data =[];
			
 
				+                    if (null != data && data!="0") {
			
 
				+                        wheel_data = data.winningList;
			
 
				+                    }
			
 
				+                    mui('#pullrefresh').pullRefresh().endPullupToRefresh((wheel_data.length < pagesize)); //参数为true代表没有更多数据了。
			
 
				+                    mui(wheel_data).each(function(index) {
			
 
				+                        var li = document.createElement('li');
			
 
				+                        li.className = 'mui-table-view-cell';
			
 
				+                        li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="'+this.logsPrizeImage+'"><div class="mui-media-body">'+ this.logsPrizeName +'<span class="mui-pull-right">' + this.logsGameName + '</span><p class="mui-ellipsis">' + this.logsDate + '<span class="mui-pull-right">x' + this.logsSum + '</span></p></div></a>';
			
 
				+                        table.appendChild(li);
			
 
				+                    });
			
 
				+                } else {
			
 
				+                    mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
			
 
				+                        if (e.index == 1) {
			
 
				+                            location.reload(true);
			
 
				+                        }
			
 
				+                    });
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                //异常处理；
			
 
				+                errorfn(xhr);
			
 
				+            }
			
 
				+        });
			
 
				+    }
			
 
				+    mui.ready(function(){
			
 
				+        console.log("页面加载完毕");
			
 
				+        mui('#pullrefresh').pullRefresh().pullupLoading();
			
 
				+        $.ajax({
			
 
				+            type: 'post',
			
 
				+            url: base_path + '/game/buyOrder',
			
 
				+            data: {gameId:2},
			
 
				+            dataType: 'json',
			
 
				+            timeout: 15000,
			
 
				+            context: $('body'),
			
 
				+            success: function(data){
			
 
				+                if(data.status){
			
 
				+                    if(!data.data){
			
 
				+                        $("#whell-bar").show();
			
 
				+                    }
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type){
			
 
				+                console.log('Ajax error!' + xhr)
			
 
				+            }
			
 
				+        });
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				+    mui('body').on('tap', '#whell-bar .mui-btn', function() {
			
 
				+        mui.openWindow({
			
 
				+            url:'//w.iamberry.com/watero/wechat/index'
			
 
				+        });
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/win.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/win.html
@@ -1,74 +1,74 @@
 
				 <!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="/watero/waterocss/mui.min.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				-		<a class="mui-tab-item" >
			
 
				-			<div class="iconfont icon-home"></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">
			
 
				-			<div class="iconfont icon-vip"></div>
			
 
				-			<span class="mui-tab-label">会员中心</span>
			
 
				-		</a>
			
 
				-	</nav>
			
 
				-			<header class="mui-bar mui-bar-nav header">
			
 
				-					<div class="go-index go_index">
			
 
				-						<img src="/watero/wateroimages/shop/images/logo.png" />
			
 
				-					</div>
			
 
				-			</header>
			
 
				-			<div class="mui-content" style="background: #fff;">
			
 
				-				<div class="pl-win-tt">
			
 
				-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，XX成功！</span>
			
 
				-				<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
			
 
				-				</div>
			
 
				-				<ul class="pay_win_list">
			
 
				-					<li>订单编号：<span class="cl-0">4564654654654654</span></li>
			
 
				-					<li>收货人：王大鹏</li>
			
 
				-					<li>手机号码：13800138000</li>
			
 
				-					<li>订单金额：<span class="cl-0">￥521</span></li>
			
 
				-					<li>支付方式：在线支付</li>
			
 
				-					<li>订单时间:2015-12-12 15:000</li>
			
 
				-					<li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
			
 
				-				</ul>-->
			
 
				-			</div>
			
 
				-				<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<nav class="mui-bar mui-bar-tab" id="footer-bar">
			
 
				+	<a class="mui-tab-item" >
			
 
				+		<div class="iconfont icon-home"></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">
			
 
				+		<div class="iconfont icon-vip"></div>
			
 
				+		<span class="mui-tab-label">会员中心</span>
			
 
				+	</a>
			
 
				+</nav>
			
 
				+<header class="mui-bar mui-bar-nav header">
			
 
				+	<div class="go-index go_index">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/images/logo.png" />
			
 
				+	</div>
			
 
				+</header>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="pl-win-tt">
			
 
				+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，XX成功！</span>
			
 
				+		<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
			
 
				+        </div>
			
 
				+        <ul class="pay_win_list">
			
 
				+            <li>订单编号：<span class="cl-0">4564654654654654</span></li>
			
 
				+            <li>收货人：王大鹏</li>
			
 
				+            <li>手机号码：13800138000</li>
			
 
				+            <li>订单金额：<span class="cl-0">￥521</span></li>
			
 
				+            <li>支付方式：在线支付</li>
			
 
				+            <li>订单时间:2015-12-12 15:000</li>
			
 
				+            <li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
			
 
				+        </ul>-->
			
 
				+	</div>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 	<script>
			
 
				-	mui.ready(function(){
			
 
				-		getCartNum();
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+        mui.ready(function(){
			
 
				+            getCartNum();
			
 
				+            document.querySelector('.loading-bg').style.display='none';
			
 
				+        });
			
 
				 	</script>
			
 
				-	</body>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html
+++ b/watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html
@@ -1,369 +1,360 @@
 
				 <!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=2016101701" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/css/shop/style.css?v=2016101701" />
			
 
				-		<style>
			
 
				-.clear{clear:both;}
			
 
				-/* 大转盘样式 */
			
 
				-.drawbanner{display:block;width:95%;margin:0 auto;}
			
 
				-.drawbanner .turnplate{display:block;width:100%;position:relative;}
			
 
				-.drawbanner .turnplate canvas.item{width:100%;-webkit-transform: translateZ(0);transform: translateZ(0);}
			
 
				-.drawbanner .turnplate img.pointer{ position: absolute;width: 25%;height: 30%;left: 37.5%;top: 33%;}	
			
 
				-.mui-popup.mui-popup-in{height:370px;background: url(/images/shop/alert-bg2.png) center top /100% no-repeat;}
			
 
				-.mui-popup-inner{background-color: transparent;margin-top:100px;padding: 15px 15px 5px 15px;position: static;}
			
 
				-.mui-popup-title{color: #e23600;font-size: 13px;}
			
 
				-.mui-popup-title+.mui-popup-text{margin-top: 10px;}
			
 
				-.mui-popup-text img{width: 70px;}
			
 
				-.mui-popup-text{font-size: 14px;color: #e23600;}
			
 
				-.mui-popup-text strong{color: #fc5b8b;}
			
 
				-.mui-popup-text span{color: #fc5b8b;font-size: 35px;}
			
 
				-.mui-popup-button{background-color: transparent;}
			
 
				-.mui-popup-button:after,.mui-popup-inner:after{display: none;}
			
 
				-.mui-popup-button:first-child{    border-radius: 25px;
			
 
				-    height: 38px;
			
 
				-    line-height: 40px;
			
 
				-    font-weight: 100;
			
 
				-    color: #e23600;
			
 
				-    width: 50%;
			
 
				-    margin:10px auto 0 auto;}
			
 
				-.mui-popup-button:last-child{border-radius:1px !important;background:url(/images/shop/btn-wheel-bg1.png) center center no-repeat ;background-size: 100%; height: 55px;line-height: 68px;font-weight: 100;color: #fff;width:40%;margin:0 auto;}
			
 
				-.mui-popup-buttons{display: block;}
			
 
				-.mui-popup.mui-popup-out{-webkit-transition-duration: 0ms;transition-duration: 0ms;}
			
 
				-.mui-backdrop-action.mui-backdrop,.mui-popup-backdrop{
			
 
				-    background-color: rgba(0,0,0,.7);
			
 
				-}
			
 
				-#img-box{display:none;}	
			
 
				-.mui-popup.mui-popup-in {
			
 
				-    -webkit-transition-duration: 0ms;
			
 
				-    transition-duration: 0ms;
			
 
				-}
			
 
				-.mui-popup-buttons{height: 55px;}
			
 
				-.mui-popup-text .x-close{width: 100px;
			
 
				-    height: 50px;
			
 
				-    bottom: 0;
			
 
				-    left: 83px;
			
 
				-    position: fixed;
			
 
				-    margin-top: 310px;}
			
 
				-</style>
			
 
				-	</head>
			
 
				+<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.iamberry.com/css/mui.min.css?v=2016101701" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css?v=2016101701" />
			
 
				+	<style>
			
 
				+		.clear{clear:both;}
			
 
				+		/* 大转盘样式 */
			
 
				+		.drawbanner{display:block;width:95%;margin:0 auto;}
			
 
				+		.drawbanner .turnplate{display:block;width:100%;position:relative;}
			
 
				+		.drawbanner .turnplate canvas.item{width:100%;-webkit-transform: translateZ(0);transform: translateZ(0);}
			
 
				+		.drawbanner .turnplate img.pointer{ position: absolute;width: 25%;height: 30%;left: 37.5%;top: 33%;}
			
 
				+		.mui-popup.mui-popup-in{height:370px;background: url(//s.iamberry.com/images/shop/alert-bg2.png) center top /100% no-repeat;}
			
 
				+		.mui-popup-inner{background-color: transparent;margin-top:100px;padding: 15px 15px 5px 15px;position: static;}
			
 
				+		.mui-popup-title{color: #e23600;font-size: 13px;}
			
 
				+		.mui-popup-title+.mui-popup-text{margin-top: 10px;}
			
 
				+		.mui-popup-text img{width: 70px;}
			
 
				+		.mui-popup-text{font-size: 14px;color: #e23600;}
			
 
				+		.mui-popup-text strong{color: #fc5b8b;}
			
 
				+		.mui-popup-text span{color: #fc5b8b;font-size: 35px;}
			
 
				+		.mui-popup-button{background-color: transparent;}
			
 
				+		.mui-popup-button:after,.mui-popup-inner:after{display: none;}
			
 
				+		.mui-popup-button:first-child{    border-radius: 25px;
			
 
				+			height: 38px;
			
 
				+			line-height: 40px;
			
 
				+			font-weight: 100;
			
 
				+			color: #e23600;
			
 
				+			width: 50%;
			
 
				+			margin:10px auto 0 auto;}
			
 
				+		.mui-popup-button:last-child{border-radius:1px !important;background:url(//s.iamberry.com/images/shop/btn-wheel-bg1.png) center center no-repeat ;background-size: 100%; height: 55px;line-height: 68px;font-weight: 100;color: #fff;width:40%;margin:0 auto;}
			
 
				+		.mui-popup-buttons{display: block;}
			
 
				+		.mui-popup.mui-popup-out{-webkit-transition-duration: 0ms;transition-duration: 0ms;}
			
 
				+		.mui-backdrop-action.mui-backdrop,.mui-popup-backdrop{
			
 
				+			background-color: rgba(0,0,0,.7);
			
 
				+		}
			
 
				+		#img-box{display:none;}
			
 
				+		.mui-popup.mui-popup-in {
			
 
				+			-webkit-transition-duration: 0ms;
			
 
				+			transition-duration: 0ms;
			
 
				+		}
			
 
				+		.mui-popup-buttons{height: 55px;}
			
 
				+		.mui-popup-text .x-close{width: 100px;
			
 
				+			height: 50px;
			
 
				+			bottom: 0;
			
 
				+			left: 83px;
			
 
				+			position: fixed;
			
 
				+			margin-top: 310px;}
			
 
				+	</style>
			
 
				+</head>
			
 
				 
			
 
				-	<body style="background: #000;">
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		
			
 
				-		<div class="mui-content" style="background: #000;">
			
 
				-			<div style="padding:0">
			
 
				-				<img width="100%" src="/images/shop/wheel-body-bg.jpg" />
			
 
				-	<div style="position: absolute;top: 25%;left: 0;width: 100%;text-align: center;color: #f7630c;text-shadow: 1px 1px 1px #000;"><span id="gamecount">0</span>次免费抽 100%中奖</div>		
			
 
				-	<div style="position: absolute;left: 0;top:28%;width: 100%;">
			
 
				-	<div class="drawbanner">
			
 
				-		<div class="turnplate" style="background-image:url(/images/shop/turnplate-bg1.png);background-size:100% 100%;background-repeat: no-repeat;background-position: center;">
			
 
				-			<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
			
 
				-			<img class="pointer" src="/images/shop/turnplate-pointer1.png"/>
			
 
				+<body style="background: #000;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				 	</div>
			
 
				-	<div style="position: relative;line-height: 0;">
			
 
				-		<div style="position: absolute;left:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);" class="go_prize_log" value="1">
			
 
				-			<img width="60%" src="/images/shop/btn-jilu1.png" />
			
 
				-		</div>
			
 
				-		<div style="position: absolute;right:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);">
			
 
				-			<a href="#guize-picture"><img width="60%" src="/images/shop/btn-guize1.png" /></a>
			
 
				+</div>
			
 
				+
			
 
				+<div class="mui-content" style="background: #000;">
			
 
				+	<div style="padding:0">
			
 
				+		<img width="100%" src="//s.iamberry.com/images/shop/wheel-body-bg.jpg" />
			
 
				+		<div style="position: absolute;top: 25%;left: 0;width: 100%;text-align: center;color: #f7630c;text-shadow: 1px 1px 1px #000;"><span id="gamecount">0</span>次免费抽 100%中奖</div>
			
 
				+		<div style="position: absolute;left: 0;top:28%;width: 100%;">
			
 
				+			<div class="drawbanner">
			
 
				+				<div class="turnplate" style="background-image:url(//s.iamberry.com/images/shop/turnplate-bg1.png);background-size:100% 100%;background-repeat: no-repeat;background-position: center;">
			
 
				+					<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
			
 
				+					<img class="pointer" src="//s.iamberry.com/images/shop/turnplate-pointer1.png"/>
			
 
				+				</div>
			
 
				+			</div>
			
 
				+			<div style="position: relative;line-height: 0;">
			
 
				+				<div style="position: absolute;left:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);" class="go_prize_log" value="1">
			
 
				+					<img width="60%" src="//s.iamberry.com/images/shop/btn-jilu1.png" />
			
 
				+				</div>
			
 
				+				<div style="position: absolute;right:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);">
			
 
				+					<a href="#guize-picture"><img width="60%" src="//s.iamberry.com/images/shop/btn-guize1.png" /></a>
			
 
				+				</div>
			
 
				+			</div>
			
 
				 		</div>
			
 
				 	</div>
			
 
				-	</div>
			
 
				-	</div>
			
 
				 	<div id="img-box">
			
 
				-		<img src="/images/shop/alert-bg2.png" />
			
 
				+		<img src="//s.iamberry.com/images/shop/alert-bg2.png" />
			
 
				 	</div>
			
 
				-	</div>	
			
 
				-		<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
			
 
				-				<img style="margin-top:25%;margin-left: 5%;" width="90%" src="/images/shop/guize-bg1.png" />
			
 
				-		</div>
			
 
				-		<script src="/js/mui.min.js"></script>
			
 
				-		<script src="/js/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/js/shop/awardRotate.js"></script>
			
 
				-		<script src="/js/shop/main.js"></script>
			
 
				-		<script src="/js/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script type="text/javascript">
			
 
				-		var turnplate={
			
 
				-				restaraunts:[],				//大转盘奖品名称
			
 
				-				colors:[],					//大转盘奖品区块对应背景颜色
			
 
				-				outsideRadius:156,			//大转盘外圆的半径
			
 
				-				textRadius:130,				//大转盘奖品位置距离圆心的距离
			
 
				-				insideRadius:35,			//大转盘内圆的半径
			
 
				-				startAngle:0,				//开始角度
			
 
				-				bRotate:false				//false:停止;ture:旋转
			
 
				-		};
			
 
				-		
			
 
				-		var prizeList = null;
			
 
				-		var count=0,hide_dalog=true;
			
 
				-		$(document).ready(function(){
			
 
				-			window.repleFlag = false;
			
 
				-			window.wxFriend = {
			
 
				-				    "appId": "",
			
 
				-				    "imgUrl":'/images/shop/8.png',
			
 
				-				    "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
			
 
				-				    "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
			
 
				-				    "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
			
 
				-				    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-				    "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
			
 
				-				    "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
			
 
				-				    "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
			
 
				-				    "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
			
 
				-			};
			
 
				-			getConfig();
			
 
				-			
			
 
				-			getwheelcount();//加载抽奖次数
			
 
				-			//动态添加大转盘的奖品与奖品区域背景颜色
			
 
				-			$.ajax(base_path +'/game/get_prize_info',{
			
 
				-				data: {
			
 
				-					prizeGameId:2
			
 
				-				},
			
 
				-                xhrFields: {
			
 
				-                    withCredentials: true
			
 
				+</div>
			
 
				+<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
			
 
				+	<img style="margin-top:25%;margin-left: 5%;" width="90%" src="//s.iamberry.com/images/shop/guize-bg1.png" />
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/js/shop/awardRotate.js"></script>
			
 
				+<script src="//s.iamberry.com/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    var turnplate={
			
 
				+        restaraunts:[],				//大转盘奖品名称
			
 
				+        colors:[],					//大转盘奖品区块对应背景颜色
			
 
				+        outsideRadius:156,			//大转盘外圆的半径
			
 
				+        textRadius:130,				//大转盘奖品位置距离圆心的距离
			
 
				+        insideRadius:35,			//大转盘内圆的半径
			
 
				+        startAngle:0,				//开始角度
			
 
				+        bRotate:false				//false:停止;ture:旋转
			
 
				+    };
			
 
				+
			
 
				+    var prizeList = null;
			
 
				+    var count=0,hide_dalog=true;
			
 
				+    $(document).ready(function(){
			
 
				+        window.repleFlag = false;
			
 
				+        window.wxFriend = {
			
 
				+            "appId": "",
			
 
				+            "imgUrl":'//s.iamberry.com/images/shop/8.png',
			
 
				+            "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
			
 
				+            "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
			
 
				+            "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
			
 
				+            "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+            "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
			
 
				+            "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
			
 
				+            "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
			
 
				+            "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
			
 
				+        };
			
 
				+        getConfig();
			
 
				+
			
 
				+        getwheelcount();//加载抽奖次数
			
 
				+        //动态添加大转盘的奖品与奖品区域背景颜色
			
 
				+        mui.ajax(base_path +'/game/get_prize_info',{
			
 
				+            data: {
			
 
				+                prizeGameId:2
			
 
				+            },
			
 
				+            dataType:'json',
			
 
				+            async:true,
			
 
				+            type:'post',
			
 
				+            timeout:15000,
			
 
				+            success:function(dt){
			
 
				+                if (dt.status) {
			
 
				+                    prizeList = dt.data;
			
 
				+                    //console.log(prizeList);
			
 
				+
			
 
				+                    mui(prizeList).each(function(index){
			
 
				+                        turnplate.restaraunts[index] = this.prizeName;
			
 
				+                        if ((index + 1) % 2 == 0) {
			
 
				+                            turnplate.colors[index] = "#694cb3";
			
 
				+                        } else {
			
 
				+                            turnplate.colors[index] = "#a282f5";
			
 
				+                        }
			
 
				+                        //先把图片加载出来
			
 
				+                        $("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
			
 
				+                    });
			
 
				+                    //console.log(turnplate.restaraunts)
			
 
				+                    //防止图片没加载完设置1秒后再绘制canvas
			
 
				+                    setTimeout(function(){
			
 
				+                        drawRouletteWheel();
			
 
				+                        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+                    },1000);
			
 
				+                } else {
			
 
				+                    alert("获取奖品信息失败！")
			
 
				+                }
			
 
				+            },
			
 
				+            error:function(xhr,type,errorThrown){
			
 
				+                console.log(xhr)
			
 
				+            }
			
 
				+        });
			
 
				+
			
 
				+        //旋转转盘 item:奖品位置; txt：提示语;
			
 
				+        var rotateFn = function (item, txt, to){
			
 
				+            var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
			
 
				+            if(angles<270){
			
 
				+                angles = 270 - angles;
			
 
				+            }else{
			
 
				+                angles = 360 - angles + 270;
			
 
				+            }
			
 
				+            //console.log(angles)
			
 
				+            $('#wheelcanvas').stopRotate();
			
 
				+            $('#wheelcanvas').rotate({
			
 
				+                angle:0,
			
 
				+                animateTo:(to == null ? (angles+1800) : to),
			
 
				+                duration:3000,
			
 
				+                callback:function (){
			
 
				+                    turnplate.bRotate = !turnplate.bRotate;
			
 
				+                }
			
 
				+            });
			
 
				+        };
			
 
				+
			
 
				+        // 奖品是否抽光
			
 
				+        var flag = true;
			
 
				+
			
 
				+        $(".pointer").on("click",function(){
			
 
				+            wheel_ajax();
			
 
				+        });
			
 
				+        function wheel_ajax(){
			
 
				+            if (!flag) {
			
 
				+                // rotateFn(270, "");
			
 
				+                turnplate.bRotate = !turnplate.bRotate;//重置转盘
			
 
				+                //去产品列表
			
 
				+                var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
			
 
				+                if (r==true){
			
 
				+                    mui.openWindow({
			
 
				+                        url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
			
 
				+                    });
			
 
				+                }
			
 
				+                return;
			
 
				+            }
			
 
				+            if(turnplate.bRotate)return;
			
 
				+            rotateFn(0 , "", 90000000)
			
 
				+            turnplate.bRotate = !turnplate.bRotate;//重置转盘
			
 
				+            //获取随机数(奖品个数范围内)
			
 
				+            //替换为后台代码
			
 
				+            mui.ajax(base_path +'/game/luck_draw?gameId=2&orderId=',{
			
 
				+                data: {},
			
 
				+                dataType:'json',
			
 
				+                type:'get',
			
 
				+                timeout:15000,
			
 
				+                success:function(dt){
			
 
				+                    //console.log(dt.data);
			
 
				+                    var img,msg;
			
 
				+
			
 
				+                    if (dt.status) {
			
 
				+                        var num;
			
 
				+                        mui.each(prizeList, function(index) {
			
 
				+                            if(this.prizeId==dt.data){
			
 
				+                                msg=this.prizeName;
			
 
				+                                img=this.prizeImage;
			
 
				+                                num=index;
			
 
				+                            }
			
 
				+                        });
			
 
				+                        //console.log("num:"+(num+1))
			
 
				+                        rotateFn(num+1, "SUCCESS");//重置转盘
			
 
				+                        count--;
			
 
				+                        $("#gamecount").text(count);//点一次抽奖次数-1
			
 
				+                        if(count>0){
			
 
				+                            setTimeout(function(){
			
 
				+                                mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'继续抽奖',function(){
			
 
				+                                    removeDalog();
			
 
				+                                    wheel_ajax();
			
 
				+                                });
			
 
				+                            },3000);
			
 
				+                        }else{
			
 
				+                            flag = false;
			
 
				+                            setTimeout(function(){
			
 
				+                                mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
			
 
				+                                    mui.openWindow({
			
 
				+                                        url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
			
 
				+                                    });
			
 
				+                                });
			
 
				+                            },3000);
			
 
				+                        }
			
 
				+                    } else {
			
 
				+                        flag = false;
			
 
				+                    }
			
 
				                 },
			
 
				-				dataType:'json',
			
 
				-				async:true,
			
 
				-				type:'post',
			
 
				-				timeout:15000,
			
 
				-				success:function(dt){
			
 
				-					if (dt.status) {
			
 
				-						prizeList = dt.data;
			
 
				-						//console.log(prizeList);
			
 
				-						
			
 
				-						mui(prizeList).each(function(index){
			
 
				-							turnplate.restaraunts[index] = this.prizeName;
			
 
				-							if ((index + 1) % 2 == 0) {
			
 
				-								turnplate.colors[index] = "#694cb3";
			
 
				-							} else {
			
 
				-								turnplate.colors[index] = "#a282f5";
			
 
				-							}
			
 
				-							//先把图片加载出来
			
 
				-							$("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
			
 
				-						});
			
 
				-						//console.log(turnplate.restaraunts)
			
 
				-						//防止图片没加载完设置1秒后再绘制canvas
			
 
				-						setTimeout(function(){
			
 
				-							drawRouletteWheel();
			
 
				-							document.querySelector('.loading-bg').style.display = 'none';
			
 
				-						},1000);
			
 
				-					} else {
			
 
				-						alert("获取奖品信息失败！")
			
 
				-					}
			
 
				-				},
			
 
				-				error:function(xhr,type,errorThrown){
			
 
				-					console.log(xhr)
			
 
				-				}
			
 
				-			});
			
 
				-		
			
 
				-			//旋转转盘 item:奖品位置; txt：提示语;
			
 
				-			var rotateFn = function (item, txt, to){
			
 
				-				var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
			
 
				-				if(angles<270){
			
 
				-					angles = 270 - angles; 
			
 
				-				}else{
			
 
				-					angles = 360 - angles + 270;
			
 
				-				}
			
 
				-				//console.log(angles)
			
 
				-				$('#wheelcanvas').stopRotate();
			
 
				-				$('#wheelcanvas').rotate({
			
 
				-					angle:0,
			
 
				-					animateTo:(to == null ? (angles+1800) : to),
			
 
				-					duration:3000,
			
 
				-					callback:function (){
			
 
				-						turnplate.bRotate = !turnplate.bRotate;
			
 
				-					}
			
 
				-				});
			
 
				-			};
			
 
				-			
			
 
				-			// 奖品是否抽光
			
 
				-			var flag = true;
			
 
				-		
			
 
				-		$(".pointer").on("click",function(){
			
 
				-			wheel_ajax();
			
 
				-		});
			
 
				-		function wheel_ajax(){
			
 
				-				if (!flag) {
			
 
				-					// rotateFn(270, "");
			
 
				-					turnplate.bRotate = !turnplate.bRotate;//重置转盘
			
 
				-					//去产品列表
			
 
				-					var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
			
 
				-					if (r==true){
			
 
				-						mui.openWindow({
			
 
				-							url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
			
 
				-						});
			
 
				-					}
			
 
				-					return;
			
 
				-				}
			
 
				-				if(turnplate.bRotate)return;
			
 
				-				rotateFn(0 , "", 90000000)
			
 
				-				turnplate.bRotate = !turnplate.bRotate;//重置转盘
			
 
				-				//获取随机数(奖品个数范围内)
			
 
				-				//替换为后台代码
			
 
				-				$.ajax(base_path +'/game/luck_draw?gameId=2&orderId=',{
			
 
				-					data: {},
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-					dataType:'json',
			
 
				-					type:'get',
			
 
				-					timeout:15000,
			
 
				-					success:function(dt){
			
 
				-						//console.log(dt.data);
			
 
				-						var img,msg;
			
 
				-						
			
 
				-						if (dt.status) {
			
 
				-							var num;
			
 
				-							mui.each(prizeList, function(index) {
			
 
				-								if(this.prizeId==dt.data){
			
 
				-									msg=this.prizeName;
			
 
				-									img=this.prizeImage;
			
 
				-									num=index;
			
 
				-								}
			
 
				-							});
			
 
				-							//console.log("num:"+(num+1))
			
 
				-							rotateFn(num+1, "SUCCESS");//重置转盘
			
 
				-							count--;
			
 
				-							$("#gamecount").text(count);//点一次抽奖次数-1
			
 
				-							if(count>0){
			
 
				-								setTimeout(function(){
			
 
				-								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'继续抽奖',function(){
			
 
				-									removeDalog();
			
 
				-									wheel_ajax();
			
 
				-								});
			
 
				-								},3000);
			
 
				-							}else{
			
 
				-								flag = false;
			
 
				-								setTimeout(function(){
			
 
				-								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
			
 
				-									mui.openWindow({
			
 
				-										url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
			
 
				-									});
			
 
				-								});
			
 
				-								},3000);
			
 
				-							}
			
 
				-						} else {
			
 
				-							flag = false;
			
 
				-						}
			
 
				-					},
			
 
				-					error:function(xhr,type,errorThrown){
			
 
				-						console.log(xhr)
			
 
				-					}
			
 
				-				});
			
 
				-			}
			
 
				-		//剩余次数
			
 
				-		function getwheelcount(){
			
 
				-			$.ajax(base_path + '/game/selectHallowmasGameCount?dates=' + new Date().getTime(),{
			
 
				-				data: {
			
 
				-					gameId:2
			
 
				-				},
			
 
				-                xhrFields: {
			
 
				-                    withCredentials: true
			
 
				+                error:function(xhr,type,errorThrown){
			
 
				+                    console.log(xhr)
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				+        //剩余次数
			
 
				+        function getwheelcount(){
			
 
				+            mui.ajax(base_path + '/game/selectHallowmasGameCount?dates=' + new Date().getTime(),{
			
 
				+                data: {
			
 
				+                    gameId:2
			
 
				                 },
			
 
				-				dataType:'json',
			
 
				-				type:'post',
			
 
				-				timeout:15000,
			
 
				-				success:function(dt){
			
 
				-					if (dt.status) {
			
 
				-						count=dt.data;
			
 
				-						$("#gamecount").text(dt.data);
			
 
				-						if(dt.data<=0){
			
 
				-							flag = false;
			
 
				-						}
			
 
				-					}
			
 
				-				},
			
 
				-				error:function(xhr,type,errorThrown){
			
 
				-					console.log(xhr)
			
 
				-				}
			
 
				-			});
			
 
				-		}			
			
 
				-			
			
 
				-		});
			
 
				+                dataType:'json',
			
 
				+                type:'post',
			
 
				+                timeout:15000,
			
 
				+                success:function(dt){
			
 
				+                    if (dt.status) {
			
 
				+                        count=dt.data;
			
 
				+                        $("#gamecount").text(dt.data);
			
 
				+                        if(dt.data<=0){
			
 
				+                            flag = false;
			
 
				+                        }
			
 
				+                    }
			
 
				+                },
			
 
				+                error:function(xhr,type,errorThrown){
			
 
				+                    console.log(xhr)
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				 
			
 
				-		
			
 
				-		//页面所有元素加载完毕后执行drawRouletteWheel()方法对转盘进行渲染
			
 
				-		window.onload=function(){
			
 
				-			//drawRouletteWheel();
			
 
				-		};
			
 
				-		
			
 
				-		function drawRouletteWheel() { 
			
 
				-		  var canvas = dc("wheelcanvas");    
			
 
				-		  if (canvas.getContext) {
			
 
				-			  //根据奖品个数计算圆周角度
			
 
				-			  var arc = Math.PI / (turnplate.restaraunts.length/2);
			
 
				-			  var ctx = canvas.getContext("2d");
			
 
				-			  //在给定矩形内清空一个矩形
			
 
				-			  ctx.clearRect(0,0,422,422);
			
 
				-			  //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式  
			
 
				-			  ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
			
 
				-			  //font 属性设置或返回画布上文本内容的当前字体属性
			
 
				-			  ctx.font = '15px Arial';      
			
 
				-			  for(var i = 0; i < turnplate.restaraunts.length; i++) {       
			
 
				-				  //添加对应图标
			
 
				-				  if (prizeList != null) {
			
 
				-					  var angle = turnplate.startAngle + i * arc;
			
 
				-					  ctx.fillStyle = turnplate.colors[i];
			
 
				-					  ctx.beginPath();
			
 
				-					  //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）    
			
 
				-					  ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);    
			
 
				-					  ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
			
 
				-					  ctx.stroke();  
			
 
				-					  ctx.fill();
			
 
				-					  //锁画布(为了保存之前的画布状态)
			
 
				-					  ctx.save();   
			
 
				-					  
			
 
				-					  //----绘制奖品开始----
			
 
				-					  ctx.fillStyle = "#fff";
			
 
				-					  var text = turnplate.restaraunts[i];
			
 
				-					  var line_height = 17;
			
 
				-					  //translate方法重新映射画布上的 (0,0) 位置
			
 
				-					  ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
			
 
				-					  
			
 
				-					  //rotate方法旋转当前的绘图
			
 
				-					  ctx.rotate(angle + arc / 2 + Math.PI / 2);
			
 
				-					  
			
 
				-					  /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
			
 
				-						 //在画布上绘制填色的文本。文本的默认颜色是黑色
			
 
				-						  //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
			
 
				-					  ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
			
 
				-					  var img= dc(prizeList[i].prizeId);
			
 
				-					  ctx.drawImage(img,-25,10);
			
 
				-					 
			
 
				-					  //把当前画布返回（调整）到上一个save()状态之前 
			
 
				-				  }
			
 
				-				  //----绘制奖品结束----
			
 
				-				  ctx.restore();
			
 
				-			  }     
			
 
				-		  } 
			
 
				-		}
			
 
				-		var mask = mui.createMask(function() {	
			
 
				-		}); //callback为用户点击蒙版时自动执行的回调；
			
 
				-		mui('body').on('tap', '#guize-picture,#share-picture', function(e) {
			
 
				-			mui(this).popover('toggle');
			
 
				-		});
			
 
				-		mui('body').on('tap', '.x-close', function(e) {
			
 
				-			//console.log("关闭");
			
 
				-			hide_dalog=false;
			
 
				-			removeDalog();
			
 
				-		});
			
 
				-		function removeDalog(){
			
 
				-			var dalog=$('.mui-popup');
			
 
				-			dalog.remove();
			
 
				-			$(".mui-popup-backdrop").removeClass("mui-active");
			
 
				-		}
			
 
				-		</script>
			
 
				-	</body>
			
 
				+    });
			
 
				+
			
 
				+
			
 
				+    //页面所有元素加载完毕后执行drawRouletteWheel()方法对转盘进行渲染
			
 
				+    window.onload=function(){
			
 
				+        //drawRouletteWheel();
			
 
				+    };
			
 
				+
			
 
				+    function drawRouletteWheel() {
			
 
				+        var canvas = dc("wheelcanvas");
			
 
				+        if (canvas.getContext) {
			
 
				+            //根据奖品个数计算圆周角度
			
 
				+            var arc = Math.PI / (turnplate.restaraunts.length/2);
			
 
				+            var ctx = canvas.getContext("2d");
			
 
				+            //在给定矩形内清空一个矩形
			
 
				+            ctx.clearRect(0,0,422,422);
			
 
				+            //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式
			
 
				+            ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
			
 
				+            //font 属性设置或返回画布上文本内容的当前字体属性
			
 
				+            ctx.font = '15px Arial';
			
 
				+            for(var i = 0; i < turnplate.restaraunts.length; i++) {
			
 
				+                //添加对应图标
			
 
				+                if (prizeList != null) {
			
 
				+                    var angle = turnplate.startAngle + i * arc;
			
 
				+                    ctx.fillStyle = turnplate.colors[i];
			
 
				+                    ctx.beginPath();
			
 
				+                    //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）
			
 
				+                    ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);
			
 
				+                    ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
			
 
				+                    ctx.stroke();
			
 
				+                    ctx.fill();
			
 
				+                    //锁画布(为了保存之前的画布状态)
			
 
				+                    ctx.save();
			
 
				+
			
 
				+                    //----绘制奖品开始----
			
 
				+                    ctx.fillStyle = "#fff";
			
 
				+                    var text = turnplate.restaraunts[i];
			
 
				+                    var line_height = 17;
			
 
				+                    //translate方法重新映射画布上的 (0,0) 位置
			
 
				+                    ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
			
 
				+
			
 
				+                    //rotate方法旋转当前的绘图
			
 
				+                    ctx.rotate(angle + arc / 2 + Math.PI / 2);
			
 
				+
			
 
				+                    /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
			
 
				+                    //在画布上绘制填色的文本。文本的默认颜色是黑色
			
 
				+                    //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
			
 
				+                    ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
			
 
				+                    var img= dc(prizeList[i].prizeId);
			
 
				+                    ctx.drawImage(img,-25,10);
			
 
				+
			
 
				+                    //把当前画布返回（调整）到上一个save()状态之前
			
 
				+                }
			
 
				+                //----绘制奖品结束----
			
 
				+                ctx.restore();
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+    var mask = mui.createMask(function() {
			
 
				+    }); //callback为用户点击蒙版时自动执行的回调；
			
 
				+    mui('body').on('tap', '#guize-picture,#share-picture', function(e) {
			
 
				+        mui(this).popover('toggle');
			
 
				+    });
			
 
				+    mui('body').on('tap', '.x-close', function(e) {
			
 
				+        //console.log("关闭");
			
 
				+        hide_dalog=false;
			
 
				+        removeDalog();
			
 
				+    });
			
 
				+    function removeDalog(){
			
 
				+        var dalog=$('.mui-popup');
			
 
				+        dalog.remove();
			
 
				+        $(".mui-popup-backdrop").removeClass("mui-active");
			
 
				+    }
			
 
				+</script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/common/js/admin/public/wxtree.js
+++ b/watero-wechat-web/src/main/webapp/common/js/admin/public/wxtree.js
@@ -464,8 +464,8 @@
 
				 						return false;
			
 
				 					}
			
 
				 				}
			
 
				-				if (url != null && url != "" && url.indexOf('http://') < 0) {
			
 
				-					alert('链接必须以http://开头!');
			
 
				+				if (url != null && url != "" && url.indexOf('http://') < 0 && url.indexOf('https://') < 0) {
			
 
				+					alert('链接必须以http://或https://开头!');
			
 
				 					return false;
			
 
				 				}
			
 
				 				if (url.indexOf("\"") > -1 || url.indexOf("\“") > -1
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/layer.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/layer.js
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/main.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/main.js
@@ -1,559 +1,546 @@
 
				-var domanUrl = "http://" + window.location.host,
			
 
				-	base_path = "http://test.iamberry.com/watero/wechat",
			
 
				-	url_path = "http://test.iamberry.com",
			
 
				-	marquee = '';
			
 
				+var domanUrl = "//" + window.location.host,
			
 
				+    base_path = "/watero/wechat",
			
 
				+    marquee = '';
			
 
				 mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function(index, el) {
			
 
				-	el.addEventListener('tap', function() {
			
 
				-		switch(index) {
			
 
				-			case 0:
			
 
				-				mui.openWindow({
			
 
				-					url: base_path + '/index'
			
 
				-				});
			
 
				-				break;
			
 
				-			case 1:
			
 
				-				mui.openWindow({
			
 
				-					url: '/watero/html/wechat/shopping_cart.html'
			
 
				-				});
			
 
				-				break;
			
 
				-			case 2:
			
 
				-				mui.openWindow({
			
 
				-					url: '/watero/html/wechat/order_list.html'
			
 
				-				});
			
 
				-				break;
			
 
				-			case 3:
			
 
				-				mui.openWindow({
			
 
				-					url: '/watero/html/wechat/vip_center.html'
			
 
				-				});
			
 
				-				break;
			
 
				-			default:
			
 
				-				break
			
 
				-		}
			
 
				-	}, false)
			
 
				+    el.addEventListener('tap', function() {
			
 
				+        switch(index) {
			
 
				+            case 0:
			
 
				+                mui.openWindow({
			
 
				+                    url: base_path + '/index'
			
 
				+                });
			
 
				+                break;
			
 
				+            case 1:
			
 
				+                mui.openWindow({
			
 
				+                    url: base_path + '/wxCart/goCart'
			
 
				+                });
			
 
				+                break;
			
 
				+            case 2:
			
 
				+                mui.openWindow({
			
 
				+                    url: '/watero/pay/goOrderList'
			
 
				+                });
			
 
				+                break;
			
 
				+            case 3:
			
 
				+                mui.openWindow({
			
 
				+                    url: base_path + '/agentWechat/member'
			
 
				+                });
			
 
				+                break;
			
 
				+            default:
			
 
				+                break
			
 
				+        }
			
 
				+    }, false)
			
 
				 });
			
 
				 
			
 
				 function getCartNum() {
			
 
				-	$.ajax(base_path + '/cart/getCartNumByCartOpenId', {
			
 
				-		data: {
			
 
				-			openid: '230'
			
 
				-		},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				+    mui.ajax(base_path + '/cart/getCartNumByCartOpenId', {
			
 
				+        data: {
			
 
				+            openid: '230'
			
 
				         },
			
 
				-		dataType: 'json',
			
 
				-		type: 'post',
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			if(dt.status) {
			
 
				-				if(dt.data == "0") {
			
 
				-					$('.icon-gouwuche span').hide()
			
 
				-				} else {
			
 
				-					$('.icon-gouwuche span').text(dt.data).show()
			
 
				-				}
			
 
				-			} else {
			
 
				-				console.log(dt)
			
 
				-			}
			
 
				-		},
			
 
				-		error: function(xhr, type, errorThrown) {
			
 
				-			errorfn(xhr)
			
 
				-		}
			
 
				-	})
			
 
				+        dataType: 'json',
			
 
				+        type: 'post',
			
 
				+        timeout: 15000,
			
 
				+        success: function(dt) {
			
 
				+            if(dt.status) {
			
 
				+                if(dt.data == "0") {
			
 
				+                    $('.icon-gouwuche span').hide()
			
 
				+                } else {
			
 
				+                    $('.icon-gouwuche span').text(dt.data).show()
			
 
				+                }
			
 
				+            } else {
			
 
				+                console.log(dt)
			
 
				+            }
			
 
				+        },
			
 
				+        error: function(xhr, type, errorThrown) {
			
 
				+            errorfn(xhr)
			
 
				+        }
			
 
				+    })
			
 
				 };
			
 
				 mui('body').on('tap', '.go_index', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: base_path + '/index'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/index'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_gwc', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/shopping_cart.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/wxCart/goCart'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_web_shop', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/chanpin_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/wxCart/goProductList'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_chanpin_details', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: base_path + '/product/desc?productId=' + this.getAttribute("proid")+'&colorId='+this.getAttribute("colorid")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/product/desc?productId=' + this.getAttribute("proid")+'&colorId='+this.getAttribute("colorid")
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_couponList', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/coupon_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/couponWechat/couponList'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go-clearing', function() {
			
 
				-	var th=this;
			
 
				-	$.ajax(base_path + '/cart/addProductToCart', {
			
 
				-		data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				+    var th=this;
			
 
				+    mui.ajax(base_path + '/cart/addProductToCart', {
			
 
				+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
			
 
				+        dataType: 'json',
			
 
				+        type: 'GET',
			
 
				+        timeout: 15000,
			
 
				+        success: function(dt) {
			
 
				+            if(dt.status) {
			
 
				+                mui.openWindow({
			
 
				+                    url: '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
			
 
				+                })
			
 
				+            } else {
			
 
				+                mui.alert(dt.message)
			
 
				+            }
			
 
				         },
			
 
				-		dataType: 'json',
			
 
				-		type: 'GET',
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			if(dt.status) {
			
 
				-				mui.openWindow({
			
 
				-					url: url_path + '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
			
 
				-				})
			
 
				-			} else {
			
 
				-				mui.alert(dt.message)
			
 
				-			}
			
 
				-		},
			
 
				-		error: function(xhr, type, errorThrown) {
			
 
				-			console.log(xhr)
			
 
				-		}
			
 
				-	})
			
 
				+        error: function(xhr, type, errorThrown) {
			
 
				+            console.log(xhr)
			
 
				+        }
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_gwc_pro', function() {
			
 
				-	var th=this;
			
 
				-	$.ajax(base_path + '/cart/addProductToCart', {
			
 
				-		data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				+    var th=this;
			
 
				+    mui.ajax(base_path + '/cart/addProductToCart', {
			
 
				+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
			
 
				+        dataType: 'json',
			
 
				+        type: 'GET',
			
 
				+        timeout: 15000,
			
 
				+        success: function(dt) {
			
 
				+            if(dt.status) {
			
 
				+                getCartNum()
			
 
				+            } else {
			
 
				+                mui.alert(dt.message)
			
 
				+            }
			
 
				         },
			
 
				-		dataType: 'json',
			
 
				-		type: 'GET',
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			if(dt.status) {
			
 
				-				getCartNum()
			
 
				-			} else {
			
 
				-				mui.alert(dt.message)
			
 
				-			}
			
 
				-		},
			
 
				-		error: function(xhr, type, errorThrown) {
			
 
				-			errorfn(xhr)
			
 
				-		}
			
 
				-	})
			
 
				+        error: function(xhr, type, errorThrown) {
			
 
				+            errorfn(xhr)
			
 
				+        }
			
 
				+    })
			
 
				 });
			
 
				 
			
 
				 function marquee_Show() {
			
 
				-	$.ajax(base_path + '/coupon/checkCurrentPreferential', {
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				+    mui.ajax(base_path + '/coupon/checkCurrentPreferential', {
			
 
				+        dataType: 'json',
			
 
				+        type: 'POST',
			
 
				+        async: false,
			
 
				+        timeout: 15000,
			
 
				+        success: function(dt) {
			
 
				+            if(dt.status) {
			
 
				+                marquee = '<span class="mui-h6">专属优惠：</span>'
			
 
				+            } else {
			
 
				+                marquee = ''
			
 
				+            }
			
 
				         },
			
 
				-		dataType: 'json',
			
 
				-		type: 'POST',
			
 
				-		async: false,
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			if(dt.status) {
			
 
				-				marquee = '<span class="mui-h6">专属优惠：</span>'
			
 
				-			} else {
			
 
				-				marquee = ''
			
 
				-			}
			
 
				-		},
			
 
				-		error: function(xhr, type, errorThrown) {
			
 
				-			console.log(xhr)
			
 
				-		}
			
 
				-	})
			
 
				+        error: function(xhr, type, errorThrown) {
			
 
				+            console.log(xhr)
			
 
				+        }
			
 
				+    })
			
 
				 };
			
 
				 mui('body').on('tap', '.go_order_details', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_details.html?orderId=' + this.getAttribute("value")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderInfo?orderId=' + this.getAttribute("value")
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_pay_count', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_list.html?salesStatus=1'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderList?salesStatus=1'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_deliver_count', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_list.html?salesStatus=2'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderList?salesStatus=2'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_delivered_count', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_list.html?salesStatus=5'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderList?salesStatus=5'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_all_count', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_list.html?salesStatus=-1'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderList?salesStatus=-1'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_tixian_guize', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/tixian_guize.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/integralWechat/withdrawRule'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_agent_rule', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/daili_guize.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/agentRule'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_publicity', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: base_path + '/agentWechat/goPublicity?userType=' + this.getAttribute("userType") + "&isDrp=" + this.getAttribute("isDrp")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/goPublicity?userType=' + this.getAttribute("userType") + "&isDrp=" + this.getAttribute("isDrp")
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_daili_order_list', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/daili_order_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/order'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_daili_rebackOrder_list', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/daili_rebackOrder_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/reback'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_order_list', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/order_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/pay/goOrderList'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_xiaxian_list', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/xiaxian_list.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/agentNext'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_tixian_apply', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/tixian_apply.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/withdraw/index'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_tixian_cash', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/tixian_apply_cash.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/withdraw/cash'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_daili_2wm', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/daili_2wm.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/member/showQrcode'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_cash_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/cash_log.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/cashWechat/log'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_jifen_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/jifen_log.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/integralWechat/log'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_jifen_guize', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/fenxiao_guize.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/integralWechat/integralRule'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_tixian_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/tixian_log.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/integralWechat/withdrawLog'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_tixian_cash_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/tixian_log_cash.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/agentWechat/withdrawCashLog'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.show_post_info', function() {
			
 
				-	var urlStr = document.domain;
			
 
				-	var postfirm = $(this).prop('postfirm');
			
 
				-	if (postfirm == 'sto') {
			
 
				-		mui.openWindow({
			
 
				-			url: 'http://tuisong.wx.sto.cn/Track/Result163?billCode=' + this.getAttribute("postNum")
			
 
				-		});
			
 
				-	} else {
			
 
				-		var href = window.location.href;
			
 
				-		mui.openWindow({
			
 
				-			url: 'https://m.kuaidi100.com/index_all.html?type=ems&postid=' + this.getAttribute("postNum") + '&callbackurl=' + href
			
 
				-		});
			
 
				-	}
			
 
				+    var urlStr = document.domain;
			
 
				+    var postfirm = $(this).prop('postfirm');
			
 
				+    if (postfirm == 'sto') {
			
 
				+        mui.openWindow({
			
 
				+            url: 'http://tuisong.wx.sto.cn/Track/Result163?billCode=' + this.getAttribute("postNum")
			
 
				+        });
			
 
				+    } else {
			
 
				+        var href = window.location.href;
			
 
				+        mui.openWindow({
			
 
				+            url: '//m.kuaidi100.com/index_all.html?type=ems&postid=' + this.getAttribute("postNum") + '&callbackurl=' + href
			
 
				+        });
			
 
				+    }
			
 
				 });
			
 
				 mui('body').on('tap', '.go_fenxiao_tixian_apply', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/fenxiao_tixian_apply.html?openid='
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/drp/withdrawalsPage?openid='
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_fenxiao_tixian_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/fenxiao_tixian_log.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/drp/withdrawalsList'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.fenxiao_vip', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/fenxiao_guize.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/drp/rulePage'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.to-up-img', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/up.html?userType=1'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/sharePage/upShare?userType=1'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.fenxiao_info', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/personal_information.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/drp/placeInfo_detail'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_luck_draw', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/share_zhuanpan.html?orderId=' + this.getAttribute("value")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/activity/go_luck_draw?orderId=' + this.getAttribute("value")
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.go_prize_log', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/wechat/wheel_log.html?gameId=' + this.getAttribute("value")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/activity/go_prize_log?gameId=' + this.getAttribute("value")
			
 
				+    })
			
 
				 });
			
 
				 
			
 
				 function errorfn(xhr) {
			
 
				-	if(xhr.readyState == 4 && xhr.status == 200) {} else {
			
 
				-		var ref = location.href.split("#")[0],
			
 
				-			src = '';
			
 
				-		if(ref.indexOf('?') != -1) {
			
 
				-			src = ref + "&date=" + new Date().getTime()
			
 
				-		} else {
			
 
				-			src = ref + "?date=" + new Date().getTime()
			
 
				-		}
			
 
				-		location.href = src;
			
 
				-		return
			
 
				-	}
			
 
				+    if(xhr.readyState == 4 && xhr.status == 200) {} else {
			
 
				+        var ref = location.href.split("#")[0],
			
 
				+            src = '';
			
 
				+        if(ref.indexOf('?') != -1) {
			
 
				+            src = ref + "&date=" + new Date().getTime()
			
 
				+        } else {
			
 
				+            src = ref + "?date=" + new Date().getTime()
			
 
				+        }
			
 
				+        location.href = src;
			
 
				+        return
			
 
				+    }
			
 
				 }
			
 
				 
			
 
				 function CheckImgExists(imgurl) {
			
 
				-	var ImgObj = new Image();
			
 
				-	ImgObj.src = imgurl;
			
 
				-	if(ImgObj.fileSize > 0 || (ImgObj.width > 0 && ImgObj.height > 0)) {
			
 
				-		return ImgObj
			
 
				-	} else {
			
 
				-		return false
			
 
				-	}
			
 
				+    var ImgObj = new Image();
			
 
				+    ImgObj.src = imgurl;
			
 
				+    if(ImgObj.fileSize > 0 || (ImgObj.width > 0 && ImgObj.height > 0)) {
			
 
				+        return ImgObj
			
 
				+    } else {
			
 
				+        return false
			
 
				+    }
			
 
				 };
			
 
				 
			
 
				 function gotoTop(acceleration, stime) {
			
 
				-	acceleration = acceleration || 0.1;
			
 
				-	stime = stime || 10;
			
 
				-	var x1 = 0,
			
 
				-		y1 = 0,
			
 
				-		x2 = 0,
			
 
				-		y2 = 0,
			
 
				-		x3 = 0,
			
 
				-		y3 = 0;
			
 
				-	if(document.documentElement) {
			
 
				-		x1 = document.documentElement.scrollLeft || 0;
			
 
				-		y1 = document.documentElement.scrollTop || 0
			
 
				-	}
			
 
				-	if(document.body) {
			
 
				-		x2 = document.body.scrollLeft || 0;
			
 
				-		y2 = document.body.scrollTop || 0
			
 
				-	}
			
 
				-	var x3 = window.scrollX || 0;
			
 
				-	var y3 = window.scrollY || 0;
			
 
				-	var x = Math.max(x1, Math.max(x2, x3));
			
 
				-	var y = Math.max(y1, Math.max(y2, y3));
			
 
				-	var speeding = 1 + acceleration;
			
 
				-	window.scrollTo(Math.floor(x / speeding), Math.floor(y / speeding));
			
 
				-	if(x > 0 || y > 0) {
			
 
				-		var run = "gotoTop(" + acceleration + ", " + stime + ")";
			
 
				-		window.setTimeout(run, stime)
			
 
				-	}
			
 
				+    acceleration = acceleration || 0.1;
			
 
				+    stime = stime || 10;
			
 
				+    var x1 = 0,
			
 
				+        y1 = 0,
			
 
				+        x2 = 0,
			
 
				+        y2 = 0,
			
 
				+        x3 = 0,
			
 
				+        y3 = 0;
			
 
				+    if(document.documentElement) {
			
 
				+        x1 = document.documentElement.scrollLeft || 0;
			
 
				+        y1 = document.documentElement.scrollTop || 0
			
 
				+    }
			
 
				+    if(document.body) {
			
 
				+        x2 = document.body.scrollLeft || 0;
			
 
				+        y2 = document.body.scrollTop || 0
			
 
				+    }
			
 
				+    var x3 = window.scrollX || 0;
			
 
				+    var y3 = window.scrollY || 0;
			
 
				+    var x = Math.max(x1, Math.max(x2, x3));
			
 
				+    var y = Math.max(y1, Math.max(y2, y3));
			
 
				+    var speeding = 1 + acceleration;
			
 
				+    window.scrollTo(Math.floor(x / speeding), Math.floor(y / speeding));
			
 
				+    if(x > 0 || y > 0) {
			
 
				+        var run = "gotoTop(" + acceleration + ", " + stime + ")";
			
 
				+        window.setTimeout(run, stime)
			
 
				+    }
			
 
				 };
			
 
				 
			
 
				 function accDiv(arg1, arg2) {
			
 
				-	var t1 = 0,
			
 
				-		t2 = 0,
			
 
				-		r1, r2;
			
 
				-	try {
			
 
				-		t1 = arg1.toString().split(".")[1].length
			
 
				-	} catch(e) {}
			
 
				-	try {
			
 
				-		t2 = arg2.toString().split(".")[1].length
			
 
				-	} catch(e) {}
			
 
				-	with(Math) {
			
 
				-		r1 = Number(arg1.toString().replace(".", ""));
			
 
				-		r2 = Number(arg2.toString().replace(".", ""));
			
 
				-		return(r1 / r2) * pow(10, t2 - t1)
			
 
				-	}
			
 
				+    var t1 = 0,
			
 
				+        t2 = 0,
			
 
				+        r1, r2;
			
 
				+    try {
			
 
				+        t1 = arg1.toString().split(".")[1].length
			
 
				+    } catch(e) {}
			
 
				+    try {
			
 
				+        t2 = arg2.toString().split(".")[1].length
			
 
				+    } catch(e) {}
			
 
				+    with(Math) {
			
 
				+        r1 = Number(arg1.toString().replace(".", ""));
			
 
				+        r2 = Number(arg2.toString().replace(".", ""));
			
 
				+        return(r1 / r2) * pow(10, t2 - t1)
			
 
				+    }
			
 
				 };
			
 
				 Number.prototype.div = function(arg) {
			
 
				-	return accDiv(this, arg)
			
 
				+    return accDiv(this, arg)
			
 
				 };
			
 
				 
			
 
				 function accAdd(arg1, arg2) {
			
 
				-	var r1, r2, m, c;
			
 
				-	try {
			
 
				-		r1 = arg1.toString().split(".")[1].length
			
 
				-	} catch(e) {
			
 
				-		r1 = 0
			
 
				-	}
			
 
				-	try {
			
 
				-		r2 = arg2.toString().split(".")[1].length
			
 
				-	} catch(e) {
			
 
				-		r2 = 0
			
 
				-	}
			
 
				-	c = Math.abs(r1 - r2);
			
 
				-	m = Math.pow(10, Math.max(r1, r2));
			
 
				-	if(c > 0) {
			
 
				-		var cm = Math.pow(10, c);
			
 
				-		if(r1 > r2) {
			
 
				-			arg1 = Number(arg1.toString().replace(".", ""));
			
 
				-			arg2 = Number(arg2.toString().replace(".", "")) * cm
			
 
				-		} else {
			
 
				-			arg1 = Number(arg1.toString().replace(".", "")) * cm;
			
 
				-			arg2 = Number(arg2.toString().replace(".", ""))
			
 
				-		}
			
 
				-	} else {
			
 
				-		arg1 = Number(arg1.toString().replace(".", ""));
			
 
				-		arg2 = Number(arg2.toString().replace(".", ""))
			
 
				-	}
			
 
				-	return(arg1 + arg2) / m
			
 
				+    var r1, r2, m, c;
			
 
				+    try {
			
 
				+        r1 = arg1.toString().split(".")[1].length
			
 
				+    } catch(e) {
			
 
				+        r1 = 0
			
 
				+    }
			
 
				+    try {
			
 
				+        r2 = arg2.toString().split(".")[1].length
			
 
				+    } catch(e) {
			
 
				+        r2 = 0
			
 
				+    }
			
 
				+    c = Math.abs(r1 - r2);
			
 
				+    m = Math.pow(10, Math.max(r1, r2));
			
 
				+    if(c > 0) {
			
 
				+        var cm = Math.pow(10, c);
			
 
				+        if(r1 > r2) {
			
 
				+            arg1 = Number(arg1.toString().replace(".", ""));
			
 
				+            arg2 = Number(arg2.toString().replace(".", "")) * cm
			
 
				+        } else {
			
 
				+            arg1 = Number(arg1.toString().replace(".", "")) * cm;
			
 
				+            arg2 = Number(arg2.toString().replace(".", ""))
			
 
				+        }
			
 
				+    } else {
			
 
				+        arg1 = Number(arg1.toString().replace(".", ""));
			
 
				+        arg2 = Number(arg2.toString().replace(".", ""))
			
 
				+    }
			
 
				+    return(arg1 + arg2) / m
			
 
				 };
			
 
				 Number.prototype.add = function(arg) {
			
 
				-	return accAdd(arg, this)
			
 
				+    return accAdd(arg, this)
			
 
				 };
			
 
				 
			
 
				 function accSub(arg1, arg2) {
			
 
				-	var r1, r2, m, n;
			
 
				-	try {
			
 
				-		r1 = arg1.toString().split(".")[1].length
			
 
				-	} catch(e) {
			
 
				-		r1 = 0
			
 
				-	}
			
 
				-	try {
			
 
				-		r2 = arg2.toString().split(".")[1].length
			
 
				-	} catch(e) {
			
 
				-		r2 = 0
			
 
				-	}
			
 
				-	m = Math.pow(10, Math.max(r1, r2));
			
 
				-	n = (r1 >= r2) ? r1 : r2;
			
 
				-	return((arg1 * m - arg2 * m) / m).toFixed(n)
			
 
				+    var r1, r2, m, n;
			
 
				+    try {
			
 
				+        r1 = arg1.toString().split(".")[1].length
			
 
				+    } catch(e) {
			
 
				+        r1 = 0
			
 
				+    }
			
 
				+    try {
			
 
				+        r2 = arg2.toString().split(".")[1].length
			
 
				+    } catch(e) {
			
 
				+        r2 = 0
			
 
				+    }
			
 
				+    m = Math.pow(10, Math.max(r1, r2));
			
 
				+    n = (r1 >= r2) ? r1 : r2;
			
 
				+    return((arg1 * m - arg2 * m) / m).toFixed(n)
			
 
				 };
			
 
				 Number.prototype.sub = function(arg) {
			
 
				-	return accMul(arg, this)
			
 
				+    return accMul(arg, this)
			
 
				 };
			
 
				 
			
 
				 function accMul(arg1, arg2) {
			
 
				-	var m = 0,
			
 
				-		s1 = arg1.toString(),
			
 
				-		s2 = arg2.toString();
			
 
				-	try {
			
 
				-		m += s1.split(".")[1].length
			
 
				-	} catch(e) {}
			
 
				-	try {
			
 
				-		m += s2.split(".")[1].length
			
 
				-	} catch(e) {}
			
 
				-	return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
			
 
				+    var m = 0,
			
 
				+        s1 = arg1.toString(),
			
 
				+        s2 = arg2.toString();
			
 
				+    try {
			
 
				+        m += s1.split(".")[1].length
			
 
				+    } catch(e) {}
			
 
				+    try {
			
 
				+        m += s2.split(".")[1].length
			
 
				+    } catch(e) {}
			
 
				+    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
			
 
				 };
			
 
				 Number.prototype.mul = function(arg) {
			
 
				-	return accMul(arg, this)
			
 
				+    return accMul(arg, this)
			
 
				 };
			
 
				 
			
 
				 function switchcolor(color) {
			
 
				-	var pro_color = "";
			
 
				-	switch(color) {
			
 
				-		case 1:
			
 
				-			pro_color = "品蓝";
			
 
				-			break;
			
 
				-		case 2:
			
 
				-			pro_color = "品黑";
			
 
				-			break;
			
 
				-		case 3:
			
 
				-			pro_color = "苹果绿";
			
 
				-			break;
			
 
				-		case 4:
			
 
				-			pro_color = "西瓜红";
			
 
				-			break;
			
 
				-		case 5:
			
 
				-			pro_color = "白色";
			
 
				-			break;
			
 
				+    var pro_color = "";
			
 
				+    switch(color) {
			
 
				+        case 1:
			
 
				+            pro_color = "品蓝";
			
 
				+            break;
			
 
				+        case 2:
			
 
				+            pro_color = "品黑";
			
 
				+            break;
			
 
				+        case 3:
			
 
				+            pro_color = "苹果绿";
			
 
				+            break;
			
 
				+        case 4:
			
 
				+            pro_color = "西瓜红";
			
 
				+            break;
			
 
				+        case 5:
			
 
				+            pro_color = "白色";
			
 
				+            break;
			
 
				         case 36:
			
 
				             pro_color = "银色";
			
 
				             break;
			
 
				         case 37:
			
 
				             pro_color = "磨砂";
			
 
				             break;
			
 
				-		default:
			
 
				-			pro_color = "品蓝";
			
 
				-			break
			
 
				-	}
			
 
				-	return pro_color
			
 
				+        default:
			
 
				+            pro_color = "品蓝";
			
 
				+            break
			
 
				+    }
			
 
				+    return pro_color
			
 
				 };
			
 
				 
			
 
				 function switchColorImg(colorId){
			
 
				-	var img='';
			
 
				-	switch (colorId){
			
 
				-		case 1:
			
 
				-			img='http://static.iamberry.com/watero/images/shop/cp-blue.png'
			
 
				-			break;
			
 
				-		case 2:
			
 
				-			img='http://static.iamberry.com/watero/images/shop/cp-black.png'
			
 
				-			break;
			
 
				-		case 3:
			
 
				-			img='http://static.iamberry.com/watero/images/shop/cp-green.png'
			
 
				-			break;
			
 
				-		case 4:
			
 
				-			img='http://static.iamberry.com/watero/images/shop/cp-red.png'
			
 
				-			break;
			
 
				-		default:
			
 
				-			img='http://static.iamberry.com/watero/images/shop/cp-blue.png'
			
 
				-			break;
			
 
				-	}
			
 
				-	return img;
			
 
				+    var img='';
			
 
				+    switch (colorId){
			
 
				+        case 1:
			
 
				+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
			
 
				+            break;
			
 
				+        case 2:
			
 
				+            img='//s.iamberry.com/watero/images/shop/cp-black.png'
			
 
				+            break;
			
 
				+        case 3:
			
 
				+            img='//s.iamberry.com/watero/images/shop/cp-green.png'
			
 
				+            break;
			
 
				+        case 4:
			
 
				+            img='//s.iamberry.com/watero/images/shop/cp-red.png'
			
 
				+            break;
			
 
				+        default:
			
 
				+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
			
 
				+            break;
			
 
				+    }
			
 
				+    return img;
			
 
				 };
			
 
				 
			
 
				 function getParam(paramName) {
			
 
				-	paramValue = "", isFound = !1;
			
 
				-	if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
			
 
				-		arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
			
 
				-		while(i < arrSource.length && !isFound) {
			
 
				-			arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
			
 
				-		}
			
 
				-	}
			
 
				-	return paramValue == "" && (paramValue = null), paramValue
			
 
				+    paramValue = "", isFound = !1;
			
 
				+    if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
			
 
				+        arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
			
 
				+        while(i < arrSource.length && !isFound) {
			
 
				+            arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
			
 
				+        }
			
 
				+    }
			
 
				+    return paramValue == "" && (paramValue = null), paramValue
			
 
				 };
			
 
				 
			
 
				 function dc(objectid) {
			
 
				-	if(document.getElementById && document.getElementById(objectid)) {
			
 
				-		return document.getElementById(objectid)
			
 
				-	} else if(document.all && document.all(objectid)) {
			
 
				-		return document.all(objectid)
			
 
				-	} else if(document.layers && document.layers[objectid]) {
			
 
				-		return document.layers[objectid]
			
 
				-	} else {
			
 
				-		return false
			
 
				-	}
			
 
				+    if(document.getElementById && document.getElementById(objectid)) {
			
 
				+        return document.getElementById(objectid)
			
 
				+    } else if(document.all && document.all(objectid)) {
			
 
				+        return document.all(objectid)
			
 
				+    } else if(document.layers && document.layers[objectid]) {
			
 
				+        return document.layers[objectid]
			
 
				+    } else {
			
 
				+        return false
			
 
				+    }
			
 
				 };
			
 
				 
			
 
				 function formatDate(now) {
			
 
				-	now = new Date(now);
			
 
				-	var year = now.getFullYear();
			
 
				-	var month = now.getMonth() + 1;
			
 
				-	var date = now.getDate();
			
 
				-	var hour = now.getHours();
			
 
				-	var minute = now.getMinutes();
			
 
				-	var second = now.getSeconds();
			
 
				-	return year + "-" + month + "-" + date + "   " + hour + ":" + minute + ":" + second
			
 
				+    now = new Date(now);
			
 
				+    var year = now.getFullYear();
			
 
				+    var month = now.getMonth() + 1;
			
 
				+    var date = now.getDate();
			
 
				+    var hour = now.getHours();
			
 
				+    var minute = now.getMinutes();
			
 
				+    var second = now.getSeconds();
			
 
				+    return year + "-" + month + "-" + date + "   " + hour + ":" + minute + ":" + second
			
 
				 };
			
 
				 
			
 
				 function springFestivalPop() {
			
 
				-	if(getCookie("WATERO_WEB_") == null) {
			
 
				-		maskspringFestival.show();
			
 
				-		$(".mui-backdrop").append('<div style="position:relative;"><img src="http://static.iamberry.com/watero/images/shop/springFestival_2017.png" style="width:80%;margin:10% 10% auto 10%;"/><button type="button" id="close-springFestival" class="mui-btn my-btn-red" style="position: absolute;bottom: 5%;left: 50%;-webkit-transform: translateX(-50%)">我知道了</button></div>');
			
 
				-		mui('body').on('tap', '#close-springFestival', function(e) {
			
 
				-			setCookie();
			
 
				-			$(".mui-backdrop").hide();
			
 
				-		});
			
 
				-	}
			
 
				+    if(getCookie("WATERO_WEB_") == null) {
			
 
				+        maskspringFestival.show();
			
 
				+        $(".mui-backdrop").append('<div style="position:relative;"><img src="//s.iamberry.com/watero/images/shop/springFestival_2017.png" style="width:80%;margin:10% 10% auto 10%;"/><button type="button" id="close-springFestival" class="mui-btn my-btn-red" style="position: absolute;bottom: 5%;left: 50%;-webkit-transform: translateX(-50%)">我知道了</button></div>');
			
 
				+        mui('body').on('tap', '#close-springFestival', function(e) {
			
 
				+            setCookie();
			
 
				+            $(".mui-backdrop").hide();
			
 
				+        });
			
 
				+    }
			
 
				 };
			
 
				 
			
 
				 function getCookie(name) {
			
 
				-	var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
			
 
				-	if(arr = document.cookie.match(reg))
			
 
				-		return unescape(arr[2]);
			
 
				-	else
			
 
				-		return null;
			
 
				+    var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
			
 
				+    if(arr = document.cookie.match(reg))
			
 
				+        return unescape(arr[2]);
			
 
				+    else
			
 
				+        return null;
			
 
				 };
			
 
				 var maskspringFestival = mui.createMask(function() {
			
 
				-	return false;
			
 
				+    return false;
			
 
				 }); //callback为用户点击蒙版时自动执行的回调；
			
 
				 function setCookie() {
			
 
				-	var Days = 30;
			
 
				-	var exp = new Date();
			
 
				-	exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
			
 
				-	document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
			
 
				+    var Days = 30;
			
 
				+    var exp = new Date();
			
 
				+    exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
			
 
				+    document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
			
 
				 };
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js
@@ -1,22 +1,21 @@
 
				 var isPay = true;
			
 
				 var isEfficacious = true;
			
 
				-mui.ready(function () {
			
 
				+mui
			
 
				+    .ready(function() {
			
 
				         var orderId = getParam("orderId");
			
 
				         $('#check-luck-draw').attr("value", orderId);
			
 
				         var table = document.body.querySelector('.shopping-cart-list');
			
 
				-        $.ajax(
			
 
				+        mui
			
 
				+            .ajax(
			
 
				                 base_path + '/cart/getShopOrderByOrderId',
			
 
				                 {
			
 
				-                    data: {
			
 
				-                        orderId: orderId
			
 
				+                    data : {
			
 
				+                        orderId : orderId
			
 
				                     },
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-                    dataType: 'json',
			
 
				-                    type: 'post',
			
 
				-                    timeout: 15000,
			
 
				-                    success: function (dt) {
			
 
				+                    dataType : 'json',
			
 
				+                    type : 'post',
			
 
				+                    timeout : 15000,
			
 
				+                    success : function(dt) {
			
 
				                         if (dt.status) {
			
 
				                             var bannerdata = dt.data;
			
 
				                             isEfficacious = bannerdata.efficacious;
			
@@ -144,7 +143,7 @@ mui.ready(function () {
 
				                             if (item != null) {
			
 
				                                 $(item)
			
 
				                                     .each(
			
 
				-                                        function (index) {
			
 
				+                                        function(index) {
			
 
				                                             var pro_color = switchcolor(this.itemColorId);
			
 
				                                             var colorImg = switchColorImg(this.itemColorId);
			
 
				                                             var li = document
			
@@ -185,7 +184,7 @@ mui.ready(function () {
 
				                             document.querySelector('.loading-bg').style.display = 'none'
			
 
				                         }
			
 
				                     },
			
 
				-                    error: function (xhr, type, errorThrown) {
			
 
				+                    error : function(xhr, type, errorThrown) {
			
 
				                         console.log(xhr)
			
 
				                     }
			
 
				                 });
			
@@ -198,26 +197,24 @@ function goOrderPay() {
 
				     }
			
 
				     var salesOrderid = $('#salesOrderid').html();
			
 
				     var dataArgs = {
			
 
				-        "orderId": salesOrderid
			
 
				+        "orderId" : salesOrderid
			
 
				     };
			
 
				     if (isPay) {
			
 
				         layer.open({
			
 
				-            type: 2,
			
 
				-            shadeClose: false,
			
 
				-            content: "正在请求加载订单信息..."
			
 
				+            type : 2,
			
 
				+            shadeClose : false,
			
 
				+            content : "正在请求加载订单信息..."
			
 
				         });
			
 
				         isPay = false;
			
 
				-        $.ajax(
			
 
				+        mui
			
 
				+            .ajax(
			
 
				                 base_path + '/cart/orderPay',
			
 
				                 {
			
 
				-                    data: dataArgs,
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-                    dataType: 'json',
			
 
				-                    type: 'POST',
			
 
				-                    timeout: 15000,
			
 
				-                    success: function (dt) {
			
 
				+                    data : dataArgs,
			
 
				+                    dataType : 'json',
			
 
				+                    type : 'POST',
			
 
				+                    timeout : 15000,
			
 
				+                    success : function(dt) {
			
 
				                         layer.closeAll();
			
 
				                         if (dt.status) {
			
 
				                             var str = dt.data.info;
			
@@ -226,29 +223,28 @@ function goOrderPay() {
 
				                                 .invoke(
			
 
				                                     'getBrandWCPayRequest',
			
 
				                                     obj,
			
 
				-                                    function (res) {
			
 
				+                                    function(res) {
			
 
				                                         if (res.err_msg == 'get_brand_wcpay_request:ok') {
			
 
				                                             var orderIds = {
			
 
				-                                                "orderId": dt.data.orderId
			
 
				+                                                "orderId" : dt.data.orderId
			
 
				                                             };
			
 
				                                             layer
			
 
				                                                 .open({
			
 
				-                                                    type: 2,
			
 
				-                                                    shadeClose: false,
			
 
				-                                                    content: "正在请求加载订单信息..."
			
 
				+                                                    type : 2,
			
 
				+                                                    shadeClose : false,
			
 
				+                                                    content : "正在请求加载订单信息..."
			
 
				                                                 });
			
 
				-                                            $.ajax(
			
 
				+                                            mui
			
 
				+                                                .ajax(
			
 
				                                                     base_path
			
 
				                                                     + '/order/checkOrderPaySuccess',
			
 
				                                                     {
			
 
				-                                                        data: orderIds,
			
 
				-                                                        xhrFields: {
			
 
				-                                                            withCredentials: true
			
 
				-                                                        },
			
 
				-                                                        dataType: 'json',
			
 
				-                                                        type: 'post',
			
 
				-                                                        timeout: 15000,
			
 
				-                                                        success: function (dt) {
			
 
				+                                                        data : orderIds,
			
 
				+                                                        dataType : 'json',
			
 
				+                                                        type : 'post',
			
 
				+                                                        timeout : 15000,
			
 
				+                                                        success : function(
			
 
				+                                                            dt) {
			
 
				                                                             if (dt.status) {
			
 
				                                                                 window.location.href = base_path
			
 
				                                                                     + "/order/paySuccess?orderId="
			
@@ -263,9 +259,10 @@ function goOrderPay() {
 
				                                                                     1000)
			
 
				                                                             }
			
 
				                                                         },
			
 
				-                                                        error: function (xhr,
			
 
				-                                                                         type,
			
 
				-                                                                         errorThrown) {
			
 
				+                                                        error : function(
			
 
				+                                                            xhr,
			
 
				+                                                            type,
			
 
				+                                                            errorThrown) {
			
 
				                                                             isPay = true;
			
 
				                                                             layer
			
 
				                                                                 .closeAll();
			
@@ -293,7 +290,7 @@ function goOrderPay() {
 
				                             mui.alert(dt.message)
			
 
				                         }
			
 
				                     },
			
 
				-                    error: function (xhr, type, errorThrown) {
			
 
				+                    error : function(xhr, type, errorThrown) {
			
 
				                         isPay = true;
			
 
				                         layer.closeAll();
			
 
				                         mui.alert("您的网络异常，请刷新重试!");
			
@@ -323,9 +320,9 @@ function operation(num) {
 
				         info = "您确定要取消订单吗?";
			
 
				         url = base_path + '/cart/cancelOrder';
			
 
				         data = {
			
 
				-            orderId: orderId,
			
 
				-            changeOrderId: changeOrderId,
			
 
				-            status: status
			
 
				+            orderId : orderId,
			
 
				+            changeOrderId : changeOrderId,
			
 
				+            status : status
			
 
				         }
			
 
				     } else if (status == 2) {
			
 
				         if (salesLockType == 2) {
			
@@ -346,9 +343,9 @@ function operation(num) {
 
				             }
			
 
				         }
			
 
				         data = {
			
 
				-            orderId: orderId,
			
 
				-            remark: returnReason,
			
 
				-            status: status
			
 
				+            orderId : orderId,
			
 
				+            remark : returnReason,
			
 
				+            status : status
			
 
				         }
			
 
				     } else if (status == 5 || status == 12) {
			
 
				         if (num == 1) {
			
@@ -356,9 +353,9 @@ function operation(num) {
 
				             message = "超出换货期限,不能换货!";
			
 
				             url = base_path + '/cart/exchangeOrder';
			
 
				             data = {
			
 
				-                orderId: orderId,
			
 
				-                changeOrderId: changeOrderId,
			
 
				-                status: status
			
 
				+                orderId : orderId,
			
 
				+                changeOrderId : changeOrderId,
			
 
				+                status : status
			
 
				             }
			
 
				         } else {
			
 
				             if (salesLockType == 2) {
			
@@ -379,26 +376,23 @@ function operation(num) {
 
				                 }
			
 
				             }
			
 
				             data = {
			
 
				-                orderId: orderId,
			
 
				-                remark: returnReason,
			
 
				-                returnOrderId: returnOrderId,
			
 
				-                status: status
			
 
				+                orderId : orderId,
			
 
				+                remark : returnReason,
			
 
				+                returnOrderId : returnOrderId,
			
 
				+                status : status
			
 
				             }
			
 
				         }
			
 
				     }
			
 
				-    var btnArray = ['否', '是'];
			
 
				-    mui.confirm(info, '水时代-提示', btnArray, function (e) {
			
 
				+    var btnArray = [ '否', '是' ];
			
 
				+    mui.confirm(info, '水时代-提示', btnArray, function(e) {
			
 
				         if (e.index == 1) {
			
 
				             $.ajax({
			
 
				-                data: data,
			
 
				-                xhrFields: {
			
 
				-                    withCredentials: true
			
 
				-                },
			
 
				-                url: url,
			
 
				-                dataType: 'json',
			
 
				-                type: 'post',
			
 
				-                timeout: 15000,
			
 
				-                success: function (dt) {
			
 
				+                data : data,
			
 
				+                url : url,
			
 
				+                dataType : 'json',
			
 
				+                type : 'post',
			
 
				+                timeout : 15000,
			
 
				+                success : function(dt) {
			
 
				                     if (dt.status) {
			
 
				                         var bannerdata = dt.data;
			
 
				                         location.reload()
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/order_list.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/order_list.js
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/pay_win.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/pay_win.js
@@ -9,11 +9,8 @@ mui.ready(function () {
 
				 });
			
 
				 function selectUser(orderId) {
			
 
				     var btnArray = ['否', '是'];
			
 
				-    $.ajax(base_path + '/order/getOrderInfo', {
			
 
				+    mui.ajax(base_path + '/order/getOrderInfo', {
			
 
				         data: orderId,
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				         dataType: 'json',
			
 
				         type: 'post',
			
 
				         timeout: 15000,
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/personal_information.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/personal_information.js
@@ -1,10 +1,7 @@
 
				 mui.ready(function () {
			
 
				     var showCityPickerButton = dc('showCityPicker3');
			
 
				-    $.ajax({
			
 
				+    mui.ajax({
			
 
				         data: {},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				         dataType: "json",
			
 
				         type: 'post',
			
 
				         url: base_path + '/placeInfo/get_placeInfo_detail',
			
@@ -54,7 +51,7 @@ mui.ready(function () {
 
				     })
			
 
				 });
			
 
				 mui('body').on('tap', '#btn_submit', function () {
			
 
				-    mui.openWindow({url: '/watero/html/wechat/add_information.html?dates=' + new Date().getTime()})
			
 
				+    mui.openWindow({url: base_path + '/drp/placeInfo_update?dates=' + new Date().getTime()})
			
 
				 });
			
 
				 function toDrpCenter() {
			
 
				     window.location.href = base_path + "/drp/indexPage?dates=" + new Date().getTime()
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_apply_cash.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_apply_cash.js
@@ -48,11 +48,8 @@ mui.ready(function () {
 
				                 "bankName": bankNo,
			
 
				                 "branch": bankch
			
 
				             };
			
 
				-            $.ajax(base_path + '/withdraw/applyCash', {
			
 
				+            mui.ajax(base_path + '/withdraw/applyCash', {
			
 
				                 data: paramArgs,
			
 
				-                xhrFields: {
			
 
				-                    withCredentials: true
			
 
				-                },
			
 
				                 dataType: 'json',
			
 
				                 async: false,
			
 
				                 type: 'POST',
			
@@ -92,10 +89,7 @@ function cashChange() {
 
				     }
			
 
				     userInputMoney = cashNum
			
 
				 };function applyBofore() {
			
 
				-    $.ajax(base_path + '/withdraw/applyCashBefore', {
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				+    mui.ajax(base_path + '/withdraw/applyCashBefore', {
			
 
				         dataType: 'json',
			
 
				         type: 'POST',
			
 
				         timeout: 15000,
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log.js
@@ -9,15 +9,11 @@ var pageNumber = 0, pagesize = 10;
 
				 function pullupRefresh() {
			
 
				     pageNumber += 1;
			
 
				     var btnArray = ['否', '是'];
			
 
				-    $.ajax(base_path + '/withdraw/selectUserLogs?dates=' + new Date().getTime(), {
			
 
				+    mui.ajax(base_path + '/withdraw/selectUserLogs?dates=' + new Date().getTime(), {
			
 
				         data: {
			
 
				             "pageSize": pagesize,
			
 
				             "pageNo": pageNumber
			
 
				-        },
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
			
 
				+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
			
 
				             if (dt.status) {
			
 
				                 var log_list = [];
			
 
				                 log_list = dt.data;
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log_cash.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log_cash.js
@@ -8,11 +8,8 @@ mui.init({
 
				 var pageNumber = 0, pagesize = 10;
			
 
				 function pullupRefresh() {
			
 
				     pageNumber += 1;
			
 
				-    $.ajax(base_path + '/withdraw/selectUserLogs', {
			
 
				+    mui.ajax(base_path + '/withdraw/selectUserLogs', {
			
 
				         data: {"pageSize": pagesize, "pageNo": pageNumber},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				         dataType: 'json',
			
 
				         type: 'post',
			
 
				         timeout: 15000,
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js
@@ -1,285 +1,268 @@
 
				 mui.ready(function() {
			
 
				-	marquee_Show();
			
 
				-	getCartNum();
			
 
				-	mui.each(document.querySelectorAll('#menu-lease-other .mui-control-item'), function(index, el) {
			
 
				-		el.addEventListener('tap', function() {
			
 
				-			switch(index) {
			
 
				-				case 0:
			
 
				-					mui.openWindow({
			
 
				-						url: '/watero/html/wechat/xiaxian_list.html'
			
 
				-					});
			
 
				-					break;
			
 
				-				case 1:
			
 
				-					mui.openWindow({
			
 
				-						url: 'http://www.iamberry.com/iamberry_wechat/after_service_watero.html'
			
 
				-					});
			
 
				-					break;
			
 
				-				case 2:
			
 
				-					mui.confirm('服务时间：工作日9:00-18:00', '客服电话：<a>400-8006692</a>', ['取消', '拨打'], function(e) {
			
 
				-						if(e.index == 1) {
			
 
				-							location.href = 'tel:4008006692'
			
 
				-						}
			
 
				-					});
			
 
				-					break;
			
 
				-				case 3:
			
 
				-					mui.openWindow({
			
 
				-						url: 'http://w.iamberry.com/watero/view/faq.html'
			
 
				-					});
			
 
				-					break;
			
 
				-				default:
			
 
				-					break
			
 
				-			}
			
 
				-		}, false)
			
 
				-	});
			
 
				-	/*mui.each(document.querySelectorAll('#menu-nav .mui-control-item'), function(index, el) {
			
 
				-		var th=this;
			
 
				-		el.addEventListener('tap', function() {
			
 
				-					mui.openWindow({
			
 
				-						url: th.getAttribute("href")
			
 
				-					});
			
 
				-		}, false)
			
 
				-	});*/
			
 
				-    mui('body').on('tap', '#menu-nav .go_coupon_bag', function() {
			
 
				-        mui.openWindow({
			
 
				-            url: '/watero/view/coupon_bag.html'
			
 
				-        })
			
 
				+    marquee_Show();
			
 
				+    getCartNum();
			
 
				+    mui.each(document.querySelectorAll('#menu-lease-other .mui-control-item'), function(index, el) {
			
 
				+        el.addEventListener('tap', function() {
			
 
				+            switch(index) {
			
 
				+                case 0:
			
 
				+                    mui.openWindow({
			
 
				+                        url: base_path + '/agentWechat/agentNext'
			
 
				+                    });
			
 
				+                    break;
			
 
				+                case 1:
			
 
				+                    mui.openWindow({
			
 
				+                        url: '//www.iamberry.com/iamberry_wechat/after_service_watero.html'
			
 
				+                    });
			
 
				+                    break;
			
 
				+                case 2:
			
 
				+                    mui.confirm('服务时间：工作日9:00-18:00', '客服电话：<a>400-8006692</a>', ['取消', '拨打'], function(e) {
			
 
				+                        if(e.index == 1) {
			
 
				+                            location.href = 'tel:4008006692'
			
 
				+                        }
			
 
				+                    });
			
 
				+                    break;
			
 
				+                case 3:
			
 
				+                    mui.openWindow({
			
 
				+                        url: '//w.iamberry.com/watero/view/faq.html'
			
 
				+                    });
			
 
				+                    break;
			
 
				+                default:
			
 
				+                    break
			
 
				+            }
			
 
				+        }, false)
			
 
				     });
			
 
				-	$.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				-		dataType: 'json',
			
 
				-		type: 'post',
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			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.shareType != null && typeof(data.shareType) != "undefined" && data.shareType == 2) {
			
 
				-					$("#2WM").show();
			
 
				-					if(userNickname != "") {
			
 
				-						$("#userNickname").html(userNickname + "(会员)")
			
 
				-					}
			
 
				-				} else {
			
 
				-					if(userNickname != "") {
			
 
				-						$("#userNickname").html(userNickname + "(用户)")
			
 
				-					}
			
 
				-				}
			
 
				-				$.ajax({
			
 
				-					type: 'post',
			
 
				-					url: base_path + '/probationOrder/membersProbationOrder',
			
 
				-					data: {},
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				+    mui.each(document.querySelectorAll('#menu-nav .mui-control-item'), function(index, el) {
			
 
				+        var th=this;
			
 
				+        el.addEventListener('tap', function() {
			
 
				+            mui.openWindow({
			
 
				+                url: th.getAttribute("href")
			
 
				+            });
			
 
				+        }, false)
			
 
				+    });
			
 
				+    mui.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
			
 
				+        dataType: 'json',
			
 
				+        type: 'post',
			
 
				+        timeout: 15000,
			
 
				+        success: function(dt) {
			
 
				+            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.shareType != null && typeof(data.shareType) != "undefined" && data.shareType == 2) {
			
 
				+                    $("#2WM").show();
			
 
				+                    if(userNickname != "") {
			
 
				+                        $("#userNickname").html(userNickname + "(会员)")
			
 
				+                    }
			
 
				+                } else {
			
 
				+                    if(userNickname != "") {
			
 
				+                        $("#userNickname").html(userNickname + "(用户)")
			
 
				+                    }
			
 
				+                }
			
 
				+                $.ajax({
			
 
				+                    type: 'post',
			
 
				+                    url: base_path + '/probationOrder/membersProbationOrder',
			
 
				+                    data: {},
			
 
				+                    dataType: 'json',
			
 
				+                    timeout: 15000,
			
 
				+                    success: function(dts) {
			
 
				+                        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)
			
 
				+                        }
			
 
				                     },
			
 
				-					dataType: 'json',
			
 
				-					timeout: 15000,
			
 
				-					success: function(dts) {
			
 
				-						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>')
			
 
				-	}
			
 
				+                    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>')
			
 
				+    }
			
 
				 });
			
 
				 mui('body').on('tap', '#rent_wait_deliver', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/rent/lease_order_details.html?rentStatus=-1'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/view/rent/lease_order_details.html?rentStatus=-1'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '#rent_already_deliver', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/rent/lease_order_details.html?rentStatus=5'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/view/rent/lease_order_details.html?rentStatus=5'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '.icon-shebeiliebiao', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/rent/my_equipment.html'
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/view/rent/my_equipment.html'
			
 
				+    })
			
 
				 });
			
 
				 mui('body').on('tap', '#xieyi-dalog', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: '/watero/html/rent/try_xieyi.html'
			
 
				-	});
			
 
				+    mui.openWindow({
			
 
				+        url: '/watero/view/rent/try_xieyi.html'
			
 
				+    });
			
 
				 });
			
 
				 mui('body').on('tap', '.go_try_order', function() {
			
 
				-	mui.openWindow({
			
 
				-		url: base_path + '/probation/try_order?orderId=' + this.getAttribute("proid")
			
 
				-	})
			
 
				+    mui.openWindow({
			
 
				+        url: base_path + '/probation/try_order?orderId=' + this.getAttribute("proid")
			
 
				+    })
			
 
				 });
			
 
				 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")
			
 
				-			},
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				+    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,
			
 
				-			success: function(dt) {
			
 
				-				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")
			
 
				-								},
			
 
				-                                xhrFields: {
			
 
				-                                    withCredentials: true
			
 
				+            dataType: 'json',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                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,
			
 
				+                                success: function(data) {
			
 
				+                                    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)
			
 
				+                                    }
			
 
				                                 },
			
 
				-								dataType: 'json',
			
 
				-								timeout: 15000,
			
 
				-								success: function(data) {
			
 
				-									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
			
 
				-	}
			
 
				+                                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 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 "试用已结束"
			
 
				-		}
			
 
				-	}
			
 
				+    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 "试用已结束"
			
 
				+        }
			
 
				+    }
			
 
				 }();
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/wechat-utils-1.0.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/wechat-utils-1.0.js
@@ -4,234 +4,231 @@
 
				  * @version V.1.0
			
 
				  */
			
 
				 // 获取绑定微信JSSDK的配置参数 
			
 
				-var getConfigUrl = "http://test.iamberry.com/watero/config/get";
			
 
				+var getConfigUrl = "/watero/config/get";
			
 
				 // JSSDK是否绑定成功
			
 
				 var jssdkSuccess = true;
			
 
				 //是否隐藏全局菜单
			
 
				 if (window.hiddenAllWechatMenu == null) {
			
 
				-	window.hiddenAllWechatMenu = false;
			
 
				+    window.hiddenAllWechatMenu = false;
			
 
				 }
			
 
				 // 分享信息全局变量
			
 
				 window.wxFriend = null;
			
 
				 if (window.repleFlag) {
			
 
				-	// 自定义
			
 
				-	window.wxFriend = window.repleWxData;
			
 
				+    // 自定义
			
 
				+    window.wxFriend = window.repleWxData;
			
 
				 } else {
			
 
				-	// 使用全局默认
			
 
				-	window.wxFriend = {
			
 
				-	    "appId": "",
			
 
				-	    "imgUrl":'http://m.iamberry.com/common/goods/images/indexShare.jpg',
			
 
				-	    "link":"http://w.iamberry.com/watero/wechat/index",
			
 
				-	    "desc":"Watero水时代商城，开启优雅生活",
			
 
				-	    "title":"Watero水时代商城，好水，好茶，生活不将就！",
			
 
				-	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-	    "shareTimeSuccess":"这里是分享朋友圈后调用的文字",
			
 
				-	    "shareTimeCancel":"这里是取消分享给朋友圈后调用的文字",
			
 
				-	    "shareAppSuccess":"这里是分享好友后调用的文字",
			
 
				-	    "shareAppCancel":"这里是取消分享给好友后调用的文字"
			
 
				-	};
			
 
				+    // 使用全局默认
			
 
				+    window.wxFriend = {
			
 
				+        "appId": "",
			
 
				+        "imgUrl":'//m.iamberry.com/common/goods/images/indexShare.jpg',
			
 
				+        "link":"//w.iamberry.com/watero/wechat/index",
			
 
				+        "desc":"Watero水时代商城，开启优雅生活",
			
 
				+        "title":"Watero水时代商城，好水，好茶，生活不将就！",
			
 
				+        "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+        "shareTimeSuccess":"这里是分享朋友圈后调用的文字",
			
 
				+        "shareTimeCancel":"这里是取消分享给朋友圈后调用的文字",
			
 
				+        "shareAppSuccess":"这里是分享好友后调用的文字",
			
 
				+        "shareAppCancel":"这里是取消分享给好友后调用的文字"
			
 
				+    };
			
 
				 }
			
 
				 // 微信共享地址数据
			
 
				 window.wechatAddr = {
			
 
				-	"status":false, // 是否调用成功，true成功，false失败
			
 
				-	"statusMsg":"失败时信息",
			
 
				-	"detailInfo":"详细地址",
			
 
				-	"postalCode":"邮编",
			
 
				-	"userName":"收货人",
			
 
				-	"userTel":"收货人电话",
			
 
				-	"nationalCode":"收货地址国家码"
			
 
				+    "status":false, // 是否调用成功，true成功，false失败
			
 
				+    "statusMsg":"失败时信息",
			
 
				+    "detailInfo":"详细地址",
			
 
				+    "postalCode":"邮编",
			
 
				+    "userName":"收货人",
			
 
				+    "userTel":"收货人电话",
			
 
				+    "nationalCode":"收货地址国家码"
			
 
				 };
			
 
				 /** 引入JSSDK1.0基本组件,微信共享地址智能使用1.0版本，并且需要服务器返回参数支持 */
			
 
				-//incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.0.0.js");
			
 
				+//incoldeJSFile("//res.wx.qq.com/open/js/jweixin-1.0.0.js");
			
 
				 /** 引入JSSDK1.1基本组件 ，支持摇一摇、微信共享地址 */
			
 
				-incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.1.0.js"); 
			
 
				+incoldeJSFile("//res.wx.qq.com/open/js/jweixin-1.1.0.js");
			
 
				 getConfig(); // 配置JSSDK组件
			
 
				 
			
 
				 /** 获取服务器JSSDK参数配置 */
			
 
				 function getConfig(){
			
 
				-	$.ajax({
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				-		type: 'get', url: getConfigUrl, data: {appid: "", url: location.href,"date":new Date().getTime()}, dataType: 'json', timeout: 10000, context: $('body'),
			
 
				-		success: function(data){setConfig(data);},
			
 
				-		error: function(xhr, type){/*getConfig();*/mui.alert('网络异常，请刷新重试，否则某些功能不能使用!')}
			
 
				-	});
			
 
				+    $.ajax({
			
 
				+        type: 'get', url: getConfigUrl, data: {appid: "", url: location.href,"date":new Date().getTime()}, dataType: 'json', timeout: 10000, context: $('body'),
			
 
				+        success: function(data){setConfig(data);},
			
 
				+        error: function(xhr, type){getConfig();mui.alert('网络异常，请刷新重试，否则某些功能不能使用!')}
			
 
				+    });
			
 
				 }
			
 
				 
			
 
				 /**配置JS-SDK*/
			
 
				 function setConfig(config){
			
 
				-	wx.config({
			
 
				-	  debug: false,
			
 
				-	  appId: config.appId,
			
 
				-	  timestamp: config.timestamp,
			
 
				-	  nonceStr: config.nonceStr,
			
 
				-	  signature: config.signature,
			
 
				-	  jsApiList: [
			
 
				-        'checkJsApi',
			
 
				-        'onMenuShareTimeline',
			
 
				-        'onMenuShareAppMessage',
			
 
				-        'hideMenuItems',
			
 
				-        'showMenuItems'
			
 
				+    wx.config({
			
 
				+        debug: false,
			
 
				+        appId: config.appId,
			
 
				+        timestamp: config.timestamp,
			
 
				+        nonceStr: config.nonceStr,
			
 
				+        signature: config.signature,
			
 
				+        jsApiList: [
			
 
				+            'checkJsApi',
			
 
				+            'onMenuShareTimeline',
			
 
				+            'onMenuShareAppMessage',
			
 
				+            'hideMenuItems',
			
 
				+            'showMenuItems'
			
 
				         ]
			
 
				-	});
			
 
				-	wx.ready(function(){ //JSSDK绑定成功
			
 
				-		wxReadySuccess();
			
 
				-	});
			
 
				-	wx.error(function(res){ // JSSDK绑定失败的方法
			
 
				-		wxReadyError();
			
 
				-	});
			
 
				+    });
			
 
				+    wx.ready(function(){ //JSSDK绑定成功
			
 
				+        wxReadySuccess();
			
 
				+    });
			
 
				+    wx.error(function(res){ // JSSDK绑定失败的方法
			
 
				+        wxReadyError();
			
 
				+    });
			
 
				 }
			
 
				 
			
 
				 /** JSSDK绑定成功调用事件 */
			
 
				 function wxReadySuccess() {
			
 
				-	window.jssdkSuccess = true;
			
 
				-	shareMessage();
			
 
				+    window.jssdkSuccess = true;
			
 
				+    shareMessage();
			
 
				     wx.getNetworkType({success: function (res) {}});
			
 
				     if (window.hiddenAllWechatMenu) {
			
 
				-    	 wx.showMenuItems({
			
 
				-	        menuList: [
			
 
				-	        ] // 要显示的菜单项，所有menu项见附录3
			
 
				-	    });
			
 
				-	    wx.hideMenuItems({
			
 
				-	        menuList: [
			
 
				-	            "menuItem:copyUrl",
			
 
				-	            "menuItem:openWithSafari",
			
 
				-	            "menuItem:originPage",
			
 
				-	            "menuItem:share:email",
			
 
				-	            "menuItem:dayMode",
			
 
				-	            "menuItem:setFont",
			
 
				-	            "menuItem:nightMode",
			
 
				-	            "menuItem:share:qq",
			
 
				-	            "menuItem:dayMode",
			
 
				-	            "menuItem:exposeArticle",
			
 
				-	            "menuItem:nightMode",
			
 
				-	            "menuItem:openWithQQBrowser",
			
 
				-	            "menuItem:share:QZone",
			
 
				-	            "menuItem:favorite",
			
 
				-	            "menuItem:share:facebook",
			
 
				-	            "menuItem:share:appMessage",
			
 
				-	            "menuItem:share:timeline"
			
 
				-	        ] // 要隐藏的菜单项，所有menu项见附录3
			
 
				-	    });
			
 
				+        wx.showMenuItems({
			
 
				+            menuList: [
			
 
				+            ] // 要显示的菜单项，所有menu项见附录3
			
 
				+        });
			
 
				+        wx.hideMenuItems({
			
 
				+            menuList: [
			
 
				+                "menuItem:copyUrl",
			
 
				+                "menuItem:openWithSafari",
			
 
				+                "menuItem:originPage",
			
 
				+                "menuItem:share:email",
			
 
				+                "menuItem:dayMode",
			
 
				+                "menuItem:setFont",
			
 
				+                "menuItem:nightMode",
			
 
				+                "menuItem:share:qq",
			
 
				+                "menuItem:dayMode",
			
 
				+                "menuItem:exposeArticle",
			
 
				+                "menuItem:nightMode",
			
 
				+                "menuItem:openWithQQBrowser",
			
 
				+                "menuItem:share:QZone",
			
 
				+                "menuItem:favorite",
			
 
				+                "menuItem:share:facebook",
			
 
				+                "menuItem:share:appMessage",
			
 
				+                "menuItem:share:timeline"
			
 
				+            ] // 要隐藏的菜单项，所有menu项见附录3
			
 
				+        });
			
 
				     } else {
			
 
				-    	 wx.showMenuItems({
			
 
				-	        menuList: [
			
 
				-	            "menuItem:share:appMessage",
			
 
				-	            "menuItem:share:timeline"
			
 
				-	        ] // 要显示的菜单项，所有menu项见附录3
			
 
				-	    });
			
 
				-	    wx.hideMenuItems({
			
 
				-	        menuList: [
			
 
				-	            "menuItem:copyUrl",
			
 
				-	            "menuItem:openWithSafari",
			
 
				-	            "menuItem:originPage",
			
 
				-	            "menuItem:share:email",
			
 
				-	            "menuItem:dayMode",
			
 
				-	            "menuItem:setFont",
			
 
				-	            "menuItem:nightMode",
			
 
				-	            "menuItem:share:qq",
			
 
				-	            "menuItem:dayMode",
			
 
				-	            "menuItem:exposeArticle",
			
 
				-	            "menuItem:nightMode",
			
 
				-	            "menuItem:openWithQQBrowser",
			
 
				-	            "menuItem:share:QZone",
			
 
				-	            "menuItem:favorite",
			
 
				-	            "menuItem:share:facebook"
			
 
				-	        ] // 要隐藏的菜单项，所有menu项见附录3
			
 
				-	    });
			
 
				+        wx.showMenuItems({
			
 
				+            menuList: [
			
 
				+                "menuItem:share:appMessage",
			
 
				+                "menuItem:share:timeline"
			
 
				+            ] // 要显示的菜单项，所有menu项见附录3
			
 
				+        });
			
 
				+        wx.hideMenuItems({
			
 
				+            menuList: [
			
 
				+                "menuItem:copyUrl",
			
 
				+                "menuItem:openWithSafari",
			
 
				+                "menuItem:originPage",
			
 
				+                "menuItem:share:email",
			
 
				+                "menuItem:dayMode",
			
 
				+                "menuItem:setFont",
			
 
				+                "menuItem:nightMode",
			
 
				+                "menuItem:share:qq",
			
 
				+                "menuItem:dayMode",
			
 
				+                "menuItem:exposeArticle",
			
 
				+                "menuItem:nightMode",
			
 
				+                "menuItem:openWithQQBrowser",
			
 
				+                "menuItem:share:QZone",
			
 
				+                "menuItem:favorite",
			
 
				+                "menuItem:share:facebook"
			
 
				+            ] // 要隐藏的菜单项，所有menu项见附录3
			
 
				+        });
			
 
				     }
			
 
				-   
			
 
				+
			
 
				 }
			
 
				 
			
 
				 /** JSSDK 绑定失败调用方法 */
			
 
				 function wxReadyError() {
			
 
				-	// alert(wxFriend.netError);
			
 
				+    // alert(wxFriend.netError);
			
 
				 }
			
 
				 
			
 
				 /** 分享时、分享后调用方法 */
			
 
				 function shareMessage(title, message) {
			
 
				-	title = title || wxFriend.title;
			
 
				+    title = title || wxFriend.title;
			
 
				     message = message || wxFriend.desc;
			
 
				     wx.onMenuShareTimeline({ //分享到朋友圈,只有标题、图标，没有内容简介
			
 
				         title: title, link: wxFriend.link, imgUrl: wxFriend.imgUrl,
			
 
				         success: function () {
			
 
				-        	if (wxFriend.shareAppSuccess != null && wxFriend.shareAppSuccess != "") {
			
 
				-        		// alert(wxFriend.shareAppSuccess);
			
 
				-        	}
			
 
				+            if (wxFriend.shareAppSuccess != null && wxFriend.shareAppSuccess != "") {
			
 
				+                // alert(wxFriend.shareAppSuccess);
			
 
				+            }
			
 
				         },
			
 
				         cancel: function () {
			
 
				-        	if (wxFriend.shareTimeCancel != null && wxFriend.shareTimeCancel != "") {
			
 
				-        		// alert(wxFriend.shareTimeCancel);
			
 
				-        	}
			
 
				+            if (wxFriend.shareTimeCancel != null && wxFriend.shareTimeCancel != "") {
			
 
				+                // alert(wxFriend.shareTimeCancel);
			
 
				+            }
			
 
				         }
			
 
				     });
			
 
				     wx.onMenuShareAppMessage({ // 分享给好友，有标题、内容简介、图标
			
 
				         title: title, desc: message, link: wxFriend.link, imgUrl: wxFriend.imgUrl,
			
 
				         success: function () {
			
 
				-        	if (wxFriend.shareAppSuccess != null && wxFriend.shareAppSuccess != "") {
			
 
				-        		// alert(wxFriend.shareAppSuccess);
			
 
				-        	}
			
 
				+            if (wxFriend.shareAppSuccess != null && wxFriend.shareAppSuccess != "") {
			
 
				+                // alert(wxFriend.shareAppSuccess);
			
 
				+            }
			
 
				         },
			
 
				         cancel: function () {
			
 
				-        	if (wxFriend.shareTimeCancel != null && wxFriend.shareTimeCancel != "") {
			
 
				-        		// alert(wxFriend.shareTimeCancel);
			
 
				-        	}
			
 
				+            if (wxFriend.shareTimeCancel != null && wxFriend.shareTimeCancel != "") {
			
 
				+                // alert(wxFriend.shareTimeCancel);
			
 
				+            }
			
 
				         }
			
 
				     });
			
 
				 }
			
 
				 
			
 
				-/** 
			
 
				+/**
			
 
				  * 微信支付
			
 
				  * str:微信支付参数,字符串
			
 
				  * paySuccessCallBack:微信支付成功后回调方法,此方法必须为全局时，方可以回调成功
			
 
				  * payCancelCallBack:微信支付失败后回调方法,此方法必须为全局时，方可以回调成功
			
 
				  */
			
 
				 function wechatPay(str, paySuccessCallBack, payCancelCallBack) {
			
 
				-	if (typeof WeixinJSBridge == "undefined"){
			
 
				-		alert("非微信浏览器！无法发起微信支付请求!");
			
 
				-		return;
			
 
				-	}
			
 
				-	var obj = JSON.parse("{" + str + "}");
			
 
				-	WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
			
 
				-       if(res.err_msg=='get_brand_wcpay_request:ok'){
			
 
				-    	   paySuccessCallBack
			
 
				-       }else{
			
 
				-    	   payCancelCallBack
			
 
				-       }
			
 
				-	});
			
 
				+    if (typeof WeixinJSBridge == "undefined"){
			
 
				+        alert("非微信浏览器！无法发起微信支付请求!");
			
 
				+        return;
			
 
				+    }
			
 
				+    var obj = JSON.parse("{" + str + "}");
			
 
				+    WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
			
 
				+        if(res.err_msg=='get_brand_wcpay_request:ok'){
			
 
				+            paySuccessCallBack
			
 
				+        }else{
			
 
				+            payCancelCallBack
			
 
				+        }
			
 
				+    });
			
 
				 }
			
 
				 if (typeof WeixinJSBridge == "undefined"){
			
 
				-   if( document.addEventListener ){
			
 
				-       document.addEventListener('WeixinJSBridgeReady', wechatPay, false);
			
 
				-   }else if (document.attachEvent){
			
 
				-       document.attachEvent('WeixinJSBridgeReady', wechatPay); 
			
 
				-       document.attachEvent('onWeixinJSBridgeReady', wechatPay);
			
 
				-   }
			
 
				+    if( document.addEventListener ){
			
 
				+        document.addEventListener('WeixinJSBridgeReady', wechatPay, false);
			
 
				+    }else if (document.attachEvent){
			
 
				+        document.attachEvent('WeixinJSBridgeReady', wechatPay);
			
 
				+        document.attachEvent('onWeixinJSBridgeReady', wechatPay);
			
 
				+    }
			
 
				 }
			
 
				 /** 发起微信共享地址Version 1.0 */
			
 
				 function editAddrV0(config) {
			
 
				-	WeixinJSBridge.invoke('editAddress', {"appId" : config.appId, "scope" : "jsapi_address", "signType" : "SHA1", "addrSign" : config.addrSign, "timeStamp" : config.timestamp, "nonceStr" : config.nonceStr}, 
			
 
				-		function(res) {
			
 
				-			if ("edit_address:ok" == res.err_msg) {
			
 
				-				var address = res.proviceFirstStageName + "-" + res.addressCitySecondStageName + "-" + res.addressCountiesThirdStageName + "-" + res.addressDetailInfo;
			
 
				-				wechatAddr.status = true;
			
 
				-				wechatAddr.detailInfo = address;
			
 
				-				wechatAddr.postalCode = res.addressPostalCode;
			
 
				-				wechatAddr.userName = res.userName;
			
 
				-				wechatAddr.userTel = res.telNumber;
			
 
				-				return wechatAddr;
			
 
				-			} else if ("edit_address:fail" == res.err_msg) {// 没有选择
			
 
				-				wechatAddr.statusMsg = "您没有选择收货地址!";
			
 
				-				return wechatAddr;
			
 
				-			} else { // 参数过时，请刷新
			
 
				-				wechatAddr.statusMsg = "操作过时，请刷新重试!";
			
 
				-				return wechatAddr;
			
 
				-			}
			
 
				-		}
			
 
				-	);
			
 
				+    WeixinJSBridge.invoke('editAddress', {"appId" : config.appId, "scope" : "jsapi_address", "signType" : "SHA1", "addrSign" : config.addrSign, "timeStamp" : config.timestamp, "nonceStr" : config.nonceStr},
			
 
				+        function(res) {
			
 
				+            if ("edit_address:ok" == res.err_msg) {
			
 
				+                var address = res.proviceFirstStageName + "-" + res.addressCitySecondStageName + "-" + res.addressCountiesThirdStageName + "-" + res.addressDetailInfo;
			
 
				+                wechatAddr.status = true;
			
 
				+                wechatAddr.detailInfo = address;
			
 
				+                wechatAddr.postalCode = res.addressPostalCode;
			
 
				+                wechatAddr.userName = res.userName;
			
 
				+                wechatAddr.userTel = res.telNumber;
			
 
				+                return wechatAddr;
			
 
				+            } else if ("edit_address:fail" == res.err_msg) {// 没有选择
			
 
				+                wechatAddr.statusMsg = "您没有选择收货地址!";
			
 
				+                return wechatAddr;
			
 
				+            } else { // 参数过时，请刷新
			
 
				+                wechatAddr.statusMsg = "操作过时，请刷新重试!";
			
 
				+                return wechatAddr;
			
 
				+            }
			
 
				+        }
			
 
				+    );
			
 
				 }
			
 
				-/** 
			
 
				+/**
			
 
				  * 发起微信共享地址Version 1.1<br>
			
 
				  * {<br>
			
 
				  * 		status : 状态，true:请求成功,false:请求失败<br>
			
@@ -249,20 +246,20 @@ function editAddrV0(config) {
 
				  * }
			
 
				  */
			
 
				 function editAddrV1(successCallback, errorCallback) {
			
 
				-	if (!window.jssdkSuccess) {
			
 
				-		mui.alert("错误啦 ~~ 请刷新重试!");
			
 
				-		return;
			
 
				-	}
			
 
				-	wx.openAddress({
			
 
				-		success: successCallback,
			
 
				-		cancel: errorCallback
			
 
				-	});
			
 
				+    if (!window.jssdkSuccess) {
			
 
				+        mui.alert("错误啦 ~~ 请刷新重试!");
			
 
				+        return;
			
 
				+    }
			
 
				+    wx.openAddress({
			
 
				+        success: successCallback,
			
 
				+        cancel: errorCallback
			
 
				+    });
			
 
				 }
			
 
				 /** 动态引入wechat utils JavaScript */
			
 
				 function incoldeJSFile(jsUrl) {
			
 
				-	var typeHand = document.getElementsByTagName('head').item(0); 
			
 
				-    var typeScript= document.createElement("script"); 
			
 
				-    typeScript.type = "text/javascript"; 
			
 
				-    typeScript.src=jsUrl; 
			
 
				-    typeHand.appendChild(typeScript); 
			
 
				+    var typeHand = document.getElementsByTagName('head').item(0);
			
 
				+    var typeScript= document.createElement("script");
			
 
				+    typeScript.type = "text/javascript";
			
 
				+    typeScript.src=jsUrl;
			
 
				+    typeHand.appendChild(typeScript);
			
 
				 }
			
--- a/watero-wechat-web/src/main/webapp/common/shop/js/page/xiaxian.js
+++ b/watero-wechat-web/src/main/webapp/common/shop/js/page/xiaxian.js
@@ -10,9 +10,6 @@ function pullupRefresh() {
 
				     var btnArray = ['否', '是'];
			
 
				     $.ajax(base_path + '/member/porxyCheckUser', {
			
 
				         data: {"endNO": endNO, "pageSize": pageSize},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				         dataType: 'json',
			
 
				         type: 'post',
			
 
				         timeout: 15000,
			
--- a/watero-wechat-web/src/main/webapp/view/lease_desc.html
+++ b/watero-wechat-web/src/main/webapp/view/lease_desc.html
@@ -1,98 +1,98 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				-	<head>
			
 
				-		<meta charset="UTF-8">
			
 
				-		<title>产品介绍</title>
			
 
				-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				+<head>
			
 
				+	<meta charset="UTF-8">
			
 
				+	<title>产品介绍</title>
			
 
				+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				 		.table-box{display:table;width:100%;text-align: center;border:1px solid rgba(0,0,0,.1);border-radius: 7px;}
			
 
				 		.table-box>div{display:table-cell;width: 50%;height: 100%;vertical-align: middle;}
			
 
				 		.table-box>div:first-child{font-size: 0;line-height: 0;}
			
 
				 		.table-box>div img{width:100%;}
			
 
				 		h4{color:#666;padding-bottom:10px;}
			
 
				 		.mui-table-view:after,.mui-table-view:before,.mui-table-view li:after,.mui-table-view:before{display:none;}
			
 
				-		</style>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<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>
			
 
				+	</style>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+	<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 class="mui-content" style="background: #fff;">
			
 
				-		<ul class="mui-table-view" style="margin-top: 5px;">
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<ul class="mui-table-view" style="margin-top: 5px;">
			
 
				 		<li class="mui-table-view-cell">
			
 
				-		<div class="table-box">
			
 
				-		<div><img src="/watero/wateroimages/shop/desc_menu1.jpg" /></div><div><h4>产品资质</h4><h6>查看更多</h6></div>
			
 
				-		</div>
			
 
				+			<div class="table-box">
			
 
				+				<div><img src="//s.iamberry.com/watero/images/shop/desc_menu1.jpg" /></div><div><h4>产品资质</h4><h6>查看更多</h6></div>
			
 
				+			</div>
			
 
				 		</li>
			
 
				 		<li class="mui-table-view-cell">
			
 
				-		<div class="table-box">
			
 
				-		<div><img src="/watero/wateroimages/shop/desc_menu2.jpg" /></div><div><h4>产品H5</h4><h6>查看更多</h6></div>
			
 
				-		</div>
			
 
				+			<div class="table-box">
			
 
				+				<div><img src="//s.iamberry.com/watero/images/shop/desc_menu2.jpg" /></div><div><h4>产品H5</h4><h6>查看更多</h6></div>
			
 
				+			</div>
			
 
				 		</li>
			
 
				 		<li class="mui-table-view-cell">
			
 
				-		<div class="table-box">
			
 
				-		<div><img src="/watero/wateroimages/shop/desc_menu3.jpg" /></div><div><h4>功能介绍视频</h4><h6>查看更多</h6></div>
			
 
				-		</div>
			
 
				+			<div class="table-box">
			
 
				+				<div><img src="//s.iamberry.com/watero/images/shop/desc_menu3.jpg" /></div><div><h4>功能介绍视频</h4><h6>查看更多</h6></div>
			
 
				+			</div>
			
 
				 		</li>
			
 
				 		<li class="mui-table-view-cell">
			
 
				-		<div class="table-box">
			
 
				-		<div><img src="/watero/wateroimages/shop/desc_menu4.jpg" /></div><div><h4>生活场景视频</h4><h6>查看更多</h6></div>
			
 
				-		</div>
			
 
				+			<div class="table-box">
			
 
				+				<div><img src="//s.iamberry.com/watero/images/shop/desc_menu4.jpg" /></div><div><h4>生活场景视频</h4><h6>查看更多</h6></div>
			
 
				+			</div>
			
 
				 		</li>
			
 
				-		</ul>	
			
 
				-	</div>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 <script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		mui.each(document.querySelectorAll('.mui-table-view .mui-table-view-cell'), function(index, el) {
			
 
				-			el.addEventListener('tap', function() {
			
 
				-				switch (index) {
			
 
				-					case 0:
			
 
				-						//产品资质
			
 
				-						mui.openWindow({
			
 
				-							url: 'http://w.iamberry.com/watero/view/product/certificate.html'
			
 
				-						});
			
 
				-						break;
			
 
				-					case 1:
			
 
				-						//产品H5
			
 
				-						mui.openWindow({
			
 
				-							url: 'http://www.watero.cn/watero_wap_app_1.2/index.html'
			
 
				-						});
			
 
				-						break;
			
 
				-					case 2:
			
 
				-						//功能介绍视频
			
 
				-						mui.openWindow({
			
 
				-							url: 'https://m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
			
 
				-						});
			
 
				-						break;
			
 
				-					case 3:
			
 
				-						//生活场景视频
			
 
				-						mui.openWindow({
			
 
				-							url: 'https://m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
			
 
				-						});
			
 
				-						break;
			
 
				-					default:
			
 
				-						break;
			
 
				-				}
			
 
				-			}, false);
			
 
				-		});
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+    mui.ready(function(){
			
 
				+        mui.each(document.querySelectorAll('.mui-table-view .mui-table-view-cell'), function(index, el) {
			
 
				+            el.addEventListener('tap', function() {
			
 
				+                switch (index) {
			
 
				+                    case 0:
			
 
				+                        //产品资质
			
 
				+                        mui.openWindow({
			
 
				+                            url: '//w.iamberry.com/watero/view/product/certificate.html'
			
 
				+                        });
			
 
				+                        break;
			
 
				+                    case 1:
			
 
				+                        //产品H5
			
 
				+                        mui.openWindow({
			
 
				+                            url: '//www.watero.cn/watero_wap_app_1.2/index.html'
			
 
				+                        });
			
 
				+                        break;
			
 
				+                    case 2:
			
 
				+                        //功能介绍视频
			
 
				+                        mui.openWindow({
			
 
				+                            url: '//m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
			
 
				+                        });
			
 
				+                        break;
			
 
				+                    case 3:
			
 
				+                        //生活场景视频
			
 
				+                        mui.openWindow({
			
 
				+                            url: '//m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
			
 
				+                        });
			
 
				+                        break;
			
 
				+                    default:
			
 
				+                        break;
			
 
				+                }
			
 
				+            }, false);
			
 
				+        });
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				 </script>
			
 
				 </body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/lease_order_win.html
+++ b/watero-wechat-web/src/main/webapp/view/lease_order_win.html
@@ -1,119 +1,116 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.tips{padding-bottom: 65px;}
			
 
				-			.gift-card-title{padding:35px 0 0 0;}
			
 
				-			.gift-card-title .mui-table-view-cell.mui-active{background:transparent;}
			
 
				-			.gift-card-title .mui-table-view-cell>a:not(.mui-btn){color: #fff;}
			
 
				-			.gift-card-title .mui-table-view-cell>a:not(.mui-btn).mui-active{background:transparent;}
			
 
				-			.gift-card-title .mui-navigate-right:after{color: #fff;font-size: 20px;right: 7px;}
			
 
				-			.gift-card-title .mui-table-view-cell{color: #fff;}
			
 
				-			.mui-table-view-cell:after,.mui-table-view:after,.mui-table-view:before{display:none;}
			
 
				-			.mui-icon-checkmarkempty{font-size:90px;background: #1cc9f4;border-radius: 50%;}
			
 
				-			.my-btn-line{border: 1px solid #71d8ec; background: transparent;color: #71d8ec;padding: 5px 10px;}
			
 
				-			#go_lease_order_details{color:#1cc9f4;text-decoration: underline;}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-			// 屏蔽分享
			
 
				-			//window.hiddenAllWechatMenu = true;
			
 
				-	var url = 'http://'+document.domain+'/watero/view/i_want_lease_test.html';
			
 
				-	window.repleFlag = true;
			
 
				-	window.repleWxData = {
			
 
				-		"appId": "",
			
 
				-		"imgUrl": '/watero/images/shop/share-lease.png',
			
 
				-		"link": url,
			
 
				-		"desc": "快来围观吧，美国watero一款可移动的净水机。",
			
 
				-		"title": "净水机可以租啦！",
			
 
				-		"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-		"shareTimeSuccess": "分享成功",
			
 
				-		"shareTimeCancel": "已取消分享",
			
 
				-		"shareAppSuccess": "分享成功!",
			
 
				-		"shareAppCancel": "已取消分享"
			
 
				-	};
			
 
				-		</script>
			
 
				-	</head>
			
 
				-	<body style="background: #fff;">
			
 
				-	<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.tips{padding-bottom: 65px;}
			
 
				+		.gift-card-title{padding:35px 0 0 0;}
			
 
				+		.gift-card-title .mui-table-view-cell.mui-active{background:transparent;}
			
 
				+		.gift-card-title .mui-table-view-cell>a:not(.mui-btn){color: #fff;}
			
 
				+		.gift-card-title .mui-table-view-cell>a:not(.mui-btn).mui-active{background:transparent;}
			
 
				+		.gift-card-title .mui-navigate-right:after{color: #fff;font-size: 20px;right: 7px;}
			
 
				+		.gift-card-title .mui-table-view-cell{color: #fff;}
			
 
				+		.mui-table-view-cell:after,.mui-table-view:after,.mui-table-view:before{display:none;}
			
 
				+		.mui-icon-checkmarkempty{font-size:90px;background: #1cc9f4;border-radius: 50%;}
			
 
				+		.my-btn-line{border: 1px solid #71d8ec; background: transparent;color: #71d8ec;padding: 5px 10px;}
			
 
				+		#go_lease_order_details{color:#1cc9f4;text-decoration: underline;}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        //window.hiddenAllWechatMenu = true;
			
 
				+        var url = '//'+document.domain+'/watero/view/i_want_lease_test.html';
			
 
				+        window.repleFlag = true;
			
 
				+        window.repleWxData = {
			
 
				+            "appId": "",
			
 
				+            "imgUrl": '//s.iamberry.com/watero/images/shop/share-lease.png',
			
 
				+            "link": url,
			
 
				+            "desc": "快来围观吧，美国watero一款可移动的净水机。",
			
 
				+            "title": "净水机可以租啦！",
			
 
				+            "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+            "shareTimeSuccess": "分享成功",
			
 
				+            "shareTimeCancel": "已取消分享",
			
 
				+            "shareAppSuccess": "分享成功!",
			
 
				+            "shareAppCancel": "已取消分享"
			
 
				+        };
			
 
				+	</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 class="tips">
			
 
				-					<ul class="mui-table-view gift-card-title">
			
 
				-					<li class="mui-table-view-cell mui-text-center">
			
 
				-					<span class="mui-icon mui-icon-checkmarkempty"></span>
			
 
				-					</li>
			
 
				-					</ul>
			
 
				-				<ul class="mui-table-view mui-text-center">
			
 
				-				<li style="color: #999;">
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="tips">
			
 
				+		<ul class="mui-table-view gift-card-title">
			
 
				+			<li class="mui-table-view-cell mui-text-center">
			
 
				+				<span class="mui-icon mui-icon-checkmarkempty"></span>
			
 
				+			</li>
			
 
				+		</ul>
			
 
				+		<ul class="mui-table-view mui-text-center">
			
 
				+			<li style="color: #999;">
			
 
				 				租用下单成功
			
 
				-				</li>
			
 
				-				<li style="color: #999;">
			
 
				+			</li>
			
 
				+			<li style="color: #999;">
			
 
				 				我们将尽快联系您发货
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-				<a id="go_lease_order_details" name="/watero/html/rent/lease_order_details.html?rentStatus=-1">查看租用订单详情</a>
			
 
				-				</li>
			
 
				-				<li class="mui-text-center gzwx">
			
 
				-				<img width="30%" style="padding-top:35px;" src="/watero/wateroimages/shop/lease-2wm.png" />
			
 
				-				<li>
			
 
				-				<li class="mui-table-view-cell gzwx" style="color: #999;">
			
 
				+			</li>
			
 
				+			<li class="mui-table-view-cell">
			
 
				+				<a id="go_lease_order_details" name="/watero/view/rent/lease_order_details.html?rentStatus=-1">查看租用订单详情</a>
			
 
				+			</li>
			
 
				+			<li class="mui-text-center gzwx">
			
 
				+				<img width="30%" style="padding-top:35px;" src="//s.iamberry.com/watero/images/shop/lease-2wm.png" />
			
 
				+			<li>
			
 
				+			<li class="mui-table-view-cell gzwx" style="color: #999;">
			
 
				 				请长按识别二维码，关注公众号享受售后服务
			
 
				-				<li>
			
 
				-				</ul>
			
 
				-			</div>
			
 
				-			</div>
			
 
				-			<div style="position: fixed;width: 100%;left: 0;bottom: 0;text-align: center;padding: 15px 0;color: #999;">
			
 
				-				深圳爱贝源科技有限公司<br/>服务热线：<a href="tel:400-800-6692">400-800-6692</a>
			
 
				-			</div>
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+			<li>
			
 
				+		</ul>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div style="position: fixed;width: 100%;left: 0;bottom: 0;text-align: center;padding: 15px 0;color: #999;">
			
 
				+	深圳爱贝源科技有限公司<br/>服务热线：<a href="tel:400-800-6692">400-800-6692</a>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 <script type="text/javascript">
			
 
				-mui.ready(function() {
			
 
				-    $.ajax(base_path + '/rent_order/isFocus', {
			
 
				-        data: {},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				-        type: 'post',
			
 
				-        timeout: 15000,
			
 
				-        success: function(dt) {
			
 
				-			/*console.log(dt)*/
			
 
				-            if(dt.isRedirect) {
			
 
				-                location.href = dt.redirectURL;
			
 
				-            }else{
			
 
				-                if(dt.status) {
			
 
				-                    $(".gzwx").hide();
			
 
				+    mui.ready(function() {
			
 
				+        mui.ajax(base_path + '/rent_order/isFocus', {
			
 
				+            data: {},
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+				/*console.log(dt)*/
			
 
				+                if(dt.isRedirect) {
			
 
				+                    location.href = dt.redirectURL;
			
 
				                 }else{
			
 
				-                    $(".gzwx").show();
			
 
				-				}
			
 
				+                    if(dt.status) {
			
 
				+                        $(".gzwx").hide();
			
 
				+                    }else{
			
 
				+                        $(".gzwx").show();
			
 
				+                    }
			
 
				+                    document.querySelector('.loading-bg').style.display = 'none';
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                console.log(xhr)
			
 
				                 document.querySelector('.loading-bg').style.display = 'none';
			
 
				             }
			
 
				-        },
			
 
				-        error: function(xhr, type, errorThrown) {
			
 
				-            console.log(xhr)
			
 
				-            document.querySelector('.loading-bg').style.display = 'none';
			
 
				-        }
			
 
				+        });
			
 
				+    });
			
 
				+    mui('body').on('tap', '#go_lease_order_details', function() {
			
 
				+        location.href=this.getAttribute("name");
			
 
				     });
			
 
				-});
			
 
				-mui('body').on('tap', '#go_lease_order_details', function() {
			
 
				-	location.href=this.getAttribute("name");
			
 
				-});
			
 
				 </script>
			
 
				 </body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/lease_test_xieyi.html
+++ b/watero-wechat-web/src/main/webapp/view/lease_test_xieyi.html
@@ -1,40 +1,40 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				-	<head>
			
 
				-		<meta charset="UTF-8">
			
 
				-		<title>租赁协议</title>
			
 
				-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.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>
			
 
				+<head>
			
 
				+	<meta charset="UTF-8">
			
 
				+	<title>租赁协议</title>
			
 
				+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.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>
			
 
				 
			
 
				-			<div class="mui-content" style="background: #fff;">
			
 
				-				<img width="100%" src="/watero/wateroimages/shop/xieyi_lease1.jpg" />
			
 
				-			</div>
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<img width="100%" src="//s.iamberry.com/watero/images/shop/xieyi_lease1.jpg" />
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 <script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		//$(".new-time").text(formatDate(new Date()));
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+    mui.ready(function(){
			
 
				+        //$(".new-time").text(formatDate(new Date()));
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				 </script>
			
 
				 </body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/lease_xieyi.html
+++ b/watero-wechat-web/src/main/webapp/view/lease_xieyi.html
@@ -6,9 +6,9 @@
 
				 		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				+		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				 		<style
			
 
				 			.mui-table-view>li{margin: 10px 0;}
			
 
				 		.mui-table-view:before,.mui-table-view:after{display: none;}
			
@@ -60,10 +60,10 @@
 
				 				</ul>
			
 
				 				</div>
			
 
				 			</div>
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 <script type="text/javascript">
			
 
				 	mui.ready(function(){
			
 
				 		//$(".new-time").text(formatDate(new Date()));
			
--- a/watero-wechat-web/src/main/webapp/view/order_service.html
+++ b/watero-wechat-web/src/main/webapp/view/order_service.html
@@ -1,39 +1,39 @@
 
				 <!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" href="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.huanhuo,.tuihuo,.tuikuan{position: relative;display: inline-block;width: 70px;height: 20px;color: #666;    text-align: center;}
			
 
				-			.huanhuo:after{content: '申请换货';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				-			.tuihuo:after{content: '申请退货';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				-			.tuikuan:after{content: '申请退款';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				-			.iconfont{color: #22cbf5;font-size: 30px;}
			
 
				-			.mui-table-view:after,.mui-table-view:before,.mui-table-view .mui-table-view-cell:after,.mui-table-view .mui-table-view-cell:before{display: none;}
			
 
				-			.mui-table-view-cell{padding: 20px 15px;background: #eee;margin: 10px 0;border-radius: 5px;}
			
 
				-			.mui-navigate-right:after, .mui-push-right:after {font-size: 25px;color: #666;}
			
 
				-		</style>
			
 
				-		<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>
			
 
				+<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" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.huanhuo,.tuihuo,.tuikuan{position: relative;display: inline-block;width: 70px;height: 20px;color: #666;    text-align: center;}
			
 
				+		.huanhuo:after{content: '申请换货';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				+		.tuihuo:after{content: '申请退货';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				+		.tuikuan:after{content: '申请退款';position: absolute;right: 1px;top: 0;font-size: 14px;width: 5em;}
			
 
				+		.iconfont{color: #22cbf5;font-size: 30px;}
			
 
				+		.mui-table-view:after,.mui-table-view:before,.mui-table-view .mui-table-view-cell:after,.mui-table-view .mui-table-view-cell:before{display: none;}
			
 
				+		.mui-table-view-cell{padding: 20px 15px;background: #eee;margin: 10px 0;border-radius: 5px;}
			
 
				+		.mui-navigate-right:after, .mui-push-right:after {font-size: 25px;color: #666;}
			
 
				+	</style>
			
 
				+	<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 class="mui-content" style="background: #fff;">
			
 
				-		<div class="mui-content-padded">
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<div class="mui-content-padded">
			
 
				 		<ul class="mui-table-view" id="my_order_service">
			
 
				 			<li class="mui-table-view-cell">
			
 
				 				<a class="mui-navigate-right my-navigate-right" href="/watero/view/apply_replacement.html">
			
@@ -50,38 +50,35 @@
 
				 						<span class="iconfont icon-tuikuan"><span/><div class="tuikuan"></div>
			
 
				 				</a>
			
 
				 			</li>
			
 
				-		</ul>	
			
 
				-		</div>	
			
 
				+		</ul>
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-	    var parm=getParam("orderId"),item=getParam("itemId"),postStatus=getParam("postStatus");
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        var parm=getParam("orderId"),item=getParam("itemId"),postStatus=getParam("postStatus");
			
 
				         mui.each(document.querySelectorAll('#my_order_service .my-navigate-right'), function(index, el) {
			
 
				             var th=this;
			
 
				             el.addEventListener('tap', function() {
			
 
				                 if(postStatus==5){
			
 
				-                        mui.openWindow({
			
 
				-                            url: th.getAttribute("href")+"?orderId="+parm+"&itemId="+item
			
 
				-                        });
			
 
				+                    mui.openWindow({
			
 
				+                        url: th.getAttribute("href")+"?orderId="+parm+"&itemId="+item
			
 
				+                    });
			
 
				                 }else{
			
 
				                     mui.alert('此订单暂时不支持此操作');
			
 
				-				}
			
 
				+                }
			
 
				             }, false)
			
 
				         });
			
 
				         mui('body').on('tap', '.my-navigate-right1', function() {
			
 
				             if(postStatus==2) {
			
 
				-                $.ajax(base_path + '/rent_order/apply_return_money', {
			
 
				+                mui.ajax(base_path + '/rent_order/apply_return_money', {
			
 
				                     data: {
			
 
				                         orderId: parm,
			
 
				                         itemId: item
			
 
				                     },
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				                     type: 'post',
			
 
				                     timeout: 15000,
			
 
				                     success: function (dt) {
			
@@ -91,7 +88,7 @@
 
				                         } else {
			
 
				                             if (dt.status) {
			
 
				                                 mui.alert("申请成功！", function () {
			
 
				-                                    location.href = '/watero/html/rent/lease_order_details.html?rentStatus=-1';
			
 
				+                                    location.href = '/watero/view/rent/lease_order_details.html?rentStatus=-1';
			
 
				                                 });
			
 
				                             } else {
			
 
				                                 mui.alert(dt.message);
			
@@ -104,12 +101,12 @@
 
				                 });
			
 
				             }else if(postStatus==3){
			
 
				                 mui.alert('正在退款中，请耐心等候');
			
 
				-			}else{
			
 
				+            }else{
			
 
				                 mui.alert('此订单暂时不支持此操作');
			
 
				-			}
			
 
				-		});
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+            }
			
 
				+        });
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				     function getOrderStatus(status){
			
 
				         switch (status){
			
 
				             case 0:
			
@@ -140,6 +137,6 @@
 
				                 break;
			
 
				         }
			
 
				     }
			
 
				-	</script>
			
 
				-	</body>
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/push_jiangli.html
+++ b/watero-wechat-web/src/main/webapp/view/push_jiangli.html
@@ -1,104 +1,101 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				 		.desc-content{padding:30px 0 40px 0;background: #fff;}
			
 
				 		.img_div>img{display: block;}
			
 
				 		.my-btn-blue{border: 1px solid rgba(73,212,246,.5);background-color: transparent;color: rgb(73,212,246);}
			
 
				 		.my-btn-box{text-align: center;padding: 20px;background: #fff;}
			
 
				 		.my-btn-box>button{margin: 0 25px;}
			
 
				 		.my-btn-blue:active{background-color:rgb(73,212,246) !important;color: #fff !important;}
			
 
				-		.mui-backdrop {position: fixed;z-index: 998;top: 0;right: 0;bottom: 0;left: 0;background: url(/watero/images/shop/share_tj.png) top center no-repeat rgba(0, 0, 0, .4);background-size: 100%;}
			
 
				-		</style>
			
 
				-	</head>
			
 
				-	<body>
			
 
				-	<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				-	</div>
			
 
				-	<div class="mui-content">
			
 
				-		<div class="img_div">
			
 
				-		<img width="100%" src="/watero/wateroimages/shop/2017-04-13-01.jpg" />
			
 
				-		<img width="100%" src="/watero/wateroimages/shop/2017-04-13-02.jpg" />
			
 
				-		<img width="100%" src="/watero/wateroimages/shop/2017-04-13-03.jpg" />
			
 
				-		</div>
			
 
				-		<div class="my-btn-box">
			
 
				-			<button class="mui-btn my-btn-blue" id="i_want_lease">我要租用</button><button class="mui-btn my-btn-blue" id="my_btn_share">分享推荐</button>
			
 
				-		</div>
			
 
				-		<div class="mui-text-center mui-h6 desc-content">
			
 
				-			注：本活动最终解释权归爱贝源科技有限公司所有
			
 
				+		.mui-backdrop {position: fixed;z-index: 998;top: 0;right: 0;bottom: 0;left: 0;background: url(//s.iamberry.com/watero/images/shop/share_tj.png) top center no-repeat rgba(0, 0, 0, .4);background-size: 100%;}
			
 
				+	</style>
			
 
				+</head>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<div class="img_div">
			
 
				+		<img width="100%" src="//s.iamberry.com/watero/images/shop/2017-04-13-01.jpg" />
			
 
				+		<img width="100%" src="//s.iamberry.com/watero/images/shop/2017-04-13-02.jpg" />
			
 
				+		<img width="100%" src="//s.iamberry.com/watero/images/shop/2017-04-13-03.jpg" />
			
 
				+	</div>
			
 
				+	<div class="my-btn-box">
			
 
				+		<button class="mui-btn my-btn-blue" id="i_want_lease">我要租用</button><button class="mui-btn my-btn-blue" id="my_btn_share">分享推荐</button>
			
 
				+	</div>
			
 
				+	<div class="mui-text-center mui-h6 desc-content">
			
 
				+		注：本活动最终解释权归爱贝源科技有限公司所有
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		$.ajax({
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        $.ajax({
			
 
				+            type: 'post',
			
 
				+            url: base_path + '/rent_order/select_rent_order_num',
			
 
				+            data: {},
			
 
				+            dataType: 'json',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                console.log(dt)
			
 
				+                if(dt.isRedirect) {
			
 
				+                    location.href = dt.redirectURL;
			
 
				+                } else {
			
 
				+                    if(dt.status){
			
 
				+                        if(dt.data>0){
			
 
				+                            mui.openWindow({
			
 
				+                                url: "/watero/view/rent/i_want_lease.html?dates=" + new Date().getTime()
			
 
				+                            })
			
 
				+                        }
			
 
				+                    }
			
 
				+                }
			
 
				             },
			
 
				-			type: 'post',
			
 
				-			url: base_path + '/rent_order/select_rent_order_num',
			
 
				-			data: {},
			
 
				-			dataType: 'json',
			
 
				-			timeout: 15000,
			
 
				-			success: function(dt) {
			
 
				-				console.log(dt)
			
 
				-				if(dt.isRedirect) {
			
 
				-					location.href = dt.redirectURL;
			
 
				-				} else {
			
 
				-					if(dt.status){
			
 
				-						if(dt.data>0){
			
 
				-							mui.openWindow({
			
 
				-								url: "/watero/html/rent/i_want_lease.html?dates=" + new Date().getTime()
			
 
				-							})
			
 
				-						}
			
 
				-					}
			
 
				-				}
			
 
				-			},
			
 
				-			error: function(xhr, type, errorThrown) {
			
 
				-				console.log(xhr);
			
 
				-			}
			
 
				-		})
			
 
				-		var url = domanUrl+"/watero/view/push_jiangli.html";
			
 
				-		window.repleFlag = false;
			
 
				-		window.wxFriend = {
			
 
				-			"appId": "",
			
 
				-			"imgUrl": '/watero/images/shop/share_lease_0.jpg',
			
 
				-			"link": url,
			
 
				-			"desc": "高端智能净水机不用买，可以直接拿回家用啦！这是一款可租赁的智能净水机！体验好了，分享出去，还可有千元现金可以拿！",
			
 
				-			"title": "Watero智能净水机免费用！还可赢现金豪礼！",
			
 
				-			"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-			"shareTimeSuccess": "分享成功",
			
 
				-			"shareTimeCancel": "已取消分享",
			
 
				-			"shareAppSuccess": "分享成功!",
			
 
				-			"shareAppCancel": "已取消分享"
			
 
				-		};
			
 
				-		getConfig();
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});	
			
 
				-	mui('body').on('tap', '#i_want_lease', function() {
			
 
				-		mui.openWindow({
			
 
				-			url: "/watero/html/rent/i_want_lease.html?dates=" + new Date().getTime()
			
 
				-		})
			
 
				-	});
			
 
				-	mui('body').on('tap', '#my_btn_share', function() {
			
 
				-		 mask.show();
			
 
				-	});
			
 
				-	var mask = mui.createMask(function() {});
			
 
				-	</script>
			
 
				-	</body>
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                console.log(xhr);
			
 
				+            }
			
 
				+        })
			
 
				+        var url = domanUrl+"/watero/view/push_jiangli.html";
			
 
				+        window.repleFlag = false;
			
 
				+        window.wxFriend = {
			
 
				+            "appId": "",
			
 
				+            "imgUrl": '//s.iamberry.com/watero/images/shop/share_lease_0.jpg',
			
 
				+            "link": url,
			
 
				+            "desc": "高端智能净水机不用买，可以直接拿回家用啦！这是一款可租赁的智能净水机！体验好了，分享出去，还可有千元现金可以拿！",
			
 
				+            "title": "Watero智能净水机免费用！还可赢现金豪礼！",
			
 
				+            "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+            "shareTimeSuccess": "分享成功",
			
 
				+            "shareTimeCancel": "已取消分享",
			
 
				+            "shareAppSuccess": "分享成功!",
			
 
				+            "shareAppCancel": "已取消分享"
			
 
				+        };
			
 
				+        getConfig();
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				+    mui('body').on('tap', '#i_want_lease', function() {
			
 
				+        mui.openWindow({
			
 
				+            url: "/watero/view/rent/i_want_lease.html?dates=" + new Date().getTime()
			
 
				+        })
			
 
				+    });
			
 
				+    mui('body').on('tap', '#my_btn_share', function() {
			
 
				+        mask.show();
			
 
				+    });
			
 
				+    var mask = mui.createMask(function() {});
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/iot.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/iot.html
@@ -1,117 +1,117 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.mui-table-view .mui-table-view-cell img {
			
 
				-				width: 100%;
			
 
				-			}
			
 
				-			li {
			
 
				-				text-align: center;padding-top: 10px;
			
 
				-			}
			
 
				-		</style>
			
 
				-	</head>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.mui-table-view .mui-table-view-cell img {
			
 
				+			width: 100%;
			
 
				+		}
			
 
				+		li {
			
 
				+			text-align: center;padding-top: 10px;
			
 
				+		}
			
 
				+	</style>
			
 
				+</head>
			
 
				 
			
 
				-	<body style="background: #fff;">
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<header class="mui-bar mui-bar-nav header">
			
 
				-			<div class="go-index go_index">
			
 
				-				<img src="/watero/wateroimages/shop/logo.png">
			
 
				-			</div>
			
 
				-		</header>
			
 
				-		<div class="mui-content" style="background: #fff;">
			
 
				-			<ul class="mui-table-view">
			
 
				-			    <li>
			
 
				-					<textarea rows="5" cols="10" id="text-info"></textarea>
			
 
				-				</li>
			
 
				-				<li>
			
 
				-					<button type="button" id="send-btn" class="mui-btn mui-btn-primary">向机器发送消息</button>
			
 
				-				</li>
			
 
				-				<li>
			
 
				-					<button type="button" id="revc-btn" class="mui-btn mui-btn-primary">接受消息</button>
			
 
				-				</li>
			
 
				-				<li id="text-message"></li>
			
 
				-			</ul>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<header class="mui-bar mui-bar-nav header">
			
 
				+	<div class="go-index go_index">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/logo.png">
			
 
				+	</div>
			
 
				+</header>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<ul class="mui-table-view">
			
 
				+		<li>
			
 
				+			<textarea rows="5" cols="10" id="text-info"></textarea>
			
 
				+		</li>
			
 
				+		<li>
			
 
				+			<button type="button" id="send-btn" class="mui-btn mui-btn-primary">向机器发送消息</button>
			
 
				+		</li>
			
 
				+		<li>
			
 
				+			<button type="button" id="revc-btn" class="mui-btn mui-btn-primary">接受消息</button>
			
 
				+		</li>
			
 
				+		<li id="text-message"></li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/wechat_iot.js?v=6734343"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function() {
			
 
				+        // console.log("页面加载完毕" + base64encode("test"))
			
 
				+        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+		/* $("#test-btn-scan").click(function(){
			
 
				+		 wx.scanQRCode({
			
 
				+		 needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				+		 scanType: ["qrCode"],
			
 
				+		 success: function (res) {
			
 
				+		 var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
			
 
				+		 }
			
 
				+		 });
			
 
				+		 }); */
			
 
				+        $("#revc-btn").click(function() {
			
 
				+            getData();
			
 
				+        });
			
 
				+        $("#send-btn").click(function() {
			
 
				+            //               gh_2674097b2442_5321e5d368254ac8
			
 
				+            // mui.alert("data:" + $("#text-info").val());
			
 
				+            sendMsgAndReceiveData("gh_2674097b2442_6d2fd2a9287de3de", ($("#text-info").val()), function(state, data) {
			
 
				+                if (200 == state) {
			
 
				+                    // 成功
			
 
				+                    $("#text-message").append('<p>' + (data) + "</p>");
			
 
				+                } else {
			
 
				+                    // 失败
			
 
				+                    $("#text-message").append('<p>err:' + (data) + "</p>");
			
 
				+                }
			
 
				+            });
			
 
				+            // getData();
			
 
				+        });
			
 
				+
			
 
				+    });
			
 
				+
			
 
				+    function getData() {
			
 
				+        receiveData(function(res) {
			
 
				+            $("#text-message").append('<p>' + base64decode(res.base64Data) + "</p>");
			
 
				+        });
			
 
				+    }
			
 
				 
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/wechat_iot.js"></script>
			
 
				-		<script type="text/javascript">
			
 
				-			mui.ready(function() {
			
 
				-				// console.log("页面加载完毕" + base64encode("test"))
			
 
				-				document.querySelector('.loading-bg').style.display = 'none';
			
 
				-				/* $("#test-btn-scan").click(function(){
			
 
				-					wx.scanQRCode({
			
 
				-						needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				-						scanType: ["qrCode"],
			
 
				-						success: function (res) {
			
 
				-							var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
			
 
				-						}
			
 
				-					});
			
 
				-				}); */
			
 
				-				$("#revc-btn").click(function() {
			
 
				-					getData();
			
 
				-				});
			
 
				-				$("#send-btn").click(function() {
			
 
				-					//               gh_2674097b2442_5321e5d368254ac8
			
 
				-					// mui.alert("data:" + $("#text-info").val());
			
 
				-					sendMsgAndReceiveData("gh_2674097b2442_6d2fd2a9287de3de", ($("#text-info").val()), function(state, data) {
			
 
				-						if (200 == state) {
			
 
				-							// 成功
			
 
				-							$("#text-message").append('<p>' + (data) + "</p>");
			
 
				-						} else {
			
 
				-							// 失败
			
 
				-							$("#text-message").append('<p>err:' + (data) + "</p>");
			
 
				-						}
			
 
				-					});
			
 
				-					// getData();
			
 
				-				});
			
 
				+    function test() {
			
 
				+        console.log(parseInt(base64decode("EQ=="),16));
			
 
				+    }
			
 
				 
			
 
				-			});
			
 
				-			
			
 
				-			function getData() {
			
 
				-				receiveData(function(res) {
			
 
				-					$("#text-message").append('<p>' + base64decode(res.base64Data) + "</p>");
			
 
				-				});
			
 
				-			}
			
 
				+    function getTicket() {
			
 
				+        // , 'gh_2674097b2442_5321e5d368254ac8', 'gh_2674097b2442_27ac2c088f9c2007'
			
 
				+        var ds = ['gh_2674097b2442_5321e5d368254ac8'];
			
 
				 
			
 
				-			function test() {
			
 
				-				console.log(parseInt(base64decode("EQ=="),16));
			
 
				-			}
			
 
				+        for (var i = 0; i < ds.length; i ++) {
			
 
				+            var d = ds[i];
			
 
				+            wx.invoke('getWXDeviceTicket', {'deviceId':d,'type':'2', 'connType':'blue'}, function(res) {
			
 
				+                try
			
 
				+                {
			
 
				+                    new Image().src = "//w.iamberry.com/watero/ticket/" + JSON.stringify(res);
			
 
				+                } catch (err) {
			
 
				+                }
			
 
				+            });
			
 
				+        }
			
 
				+        mui.alert("ok");
			
 
				+    }
			
 
				 
			
 
				-			function getTicket() {
			
 
				-				// , 'gh_2674097b2442_5321e5d368254ac8', 'gh_2674097b2442_27ac2c088f9c2007'
			
 
				-				var ds = ['gh_2674097b2442_5321e5d368254ac8'];
			
 
				-				
			
 
				-				for (var i = 0; i < ds.length; i ++) {
			
 
				-					var d = ds[i];
			
 
				-					wx.invoke('getWXDeviceTicket', {'deviceId':d,'type':'2', 'connType':'blue'}, function(res) {
			
 
				-						try
			
 
				-						{
			
 
				-							new Image().src = "http://test.iamberry.com/watero/ticket/" + JSON.stringify(res);
			
 
				-						} catch (err) {
			
 
				-						}
			
 
				-					});
			
 
				-				}
			
 
				-				mui.alert("ok");
			
 
				-			}
			
 
				-			
			
 
				-		</script>
			
 
				-	</body>
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/lease_after_sales.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/lease_after_sales.html
@@ -1,209 +1,209 @@
 
				 <!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" href="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/icons-extra.css"/>
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/style.css" />
			
 
				-		<style type="text/css">
			
 
				-	.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;}
			
 
				-    .my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				-    .my-btn-hand.active{background-color: #1cc9f4;}
			
 
				-    .cl-blue{color: #1cc9f4;}
			
 
				-    .iconfont{font-size: 20px;}
			
 
				-    .mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				-    .lease-ul{font-size: 12px;color: #999;}
			
 
				-    article, section, time, aside {
			
 
				-				display: block;
			
 
				-			}
			
 
				-			.point-time {
			
 
				-				content: "";
			
 
				-				position: absolute;
			
 
				-				width: 12px;
			
 
				-				height: 12px;
			
 
				-				top: 5px;
			
 
				-				left: 28%;
			
 
				-				background: #1c87bf;
			
 
				-				margin-left: -5px;
			
 
				-				border-radius: 50%;
			
 
				-			}
			
 
				+<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" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/icons-extra.css"/>
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style type="text/css">
			
 
				+		.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;}
			
 
				+		.my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				+		.my-btn-hand.active{background-color: #1cc9f4;}
			
 
				+		.cl-blue{color: #1cc9f4;}
			
 
				+		.iconfont{font-size: 20px;}
			
 
				+		.mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				+		.lease-ul{font-size: 12px;color: #999;}
			
 
				+		article, section, time, aside {
			
 
				+			display: block;
			
 
				+		}
			
 
				+		.point-time {
			
 
				+			content: "";
			
 
				+			position: absolute;
			
 
				+			width: 12px;
			
 
				+			height: 12px;
			
 
				+			top: 5px;
			
 
				+			left: 28%;
			
 
				+			background: #1c87bf;
			
 
				+			margin-left: -5px;
			
 
				+			border-radius: 50%;
			
 
				+		}
			
 
				 
			
 
				-			.text-red {
			
 
				-				color: #f6393f;
			
 
				-			}
			
 
				+		.text-red {
			
 
				+			color: #f6393f;
			
 
				+		}
			
 
				 
			
 
				-			.text-blue {
			
 
				-				color: #1c87bf;
			
 
				-			}
			
 
				-			.point-blue {
			
 
				-				background-color: #1cc9f4;
			
 
				-			}
			
 
				-			.content {
			
 
				-				width: 100%;
			
 
				-				margin: 0 auto;
			
 
				-				padding: 10px 0;
			
 
				-			}
			
 
				-			.content article {
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article > h3 {
			
 
				-				width: 100%;
			
 
				-				height: 20px;
			
 
				-				line-height: 20px;
			
 
				-				text-align: left;
			
 
				-				text-indent: 3%;
			
 
				-				font-size: 1.4em;
			
 
				-				color: #fff;
			
 
				-				padding: 10px 0 20px;
			
 
				-				background-color: #dd6d01;
			
 
				-			}
			
 
				-			.content article section {
			
 
				-				padding: 0 0 17px;
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article section:before {
			
 
				-				content: "";
			
 
				-				width: 2px;
			
 
				-				top: 5px;
			
 
				-				bottom:-30px;
			
 
				-				left: 28%;
			
 
				-				background: #1cc9f4;
			
 
				-				position: absolute;
			
 
				-			}
			
 
				-			.content article section:last-child:before {
			
 
				-				display: none;
			
 
				-			}
			
 
				-			.content article section time {
			
 
				-				width: 25%;
			
 
				-				display: block;
			
 
				-				position: absolute;
			
 
				-			}
			
 
				-			.content article section time > span {
			
 
				-				display: block;
			
 
				-				text-align: center;
			
 
				-				margin-left: 0;
			
 
				-				color: #999;
			
 
				-			}
			
 
				-			.content article section aside {
			
 
				-				color: #3a3a38;
			
 
				-				margin-left: 35%;
			
 
				-				padding-bottom: 15px;
			
 
				-			}
			
 
				-			.content article section .brief {
			
 
				-				color: #9f9f9f;
			
 
				-			}
			
 
				-			.content article section aside .things {
			
 
				-				color: #999;margin-top: 5px;
			
 
				-			}
			
 
				-		</style>
			
 
				+		.text-blue {
			
 
				+			color: #1c87bf;
			
 
				+		}
			
 
				+		.point-blue {
			
 
				+			background-color: #1cc9f4;
			
 
				+		}
			
 
				+		.content {
			
 
				+			width: 100%;
			
 
				+			margin: 0 auto;
			
 
				+			padding: 10px 0;
			
 
				+		}
			
 
				+		.content article {
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article > h3 {
			
 
				+			width: 100%;
			
 
				+			height: 20px;
			
 
				+			line-height: 20px;
			
 
				+			text-align: left;
			
 
				+			text-indent: 3%;
			
 
				+			font-size: 1.4em;
			
 
				+			color: #fff;
			
 
				+			padding: 10px 0 20px;
			
 
				+			background-color: #dd6d01;
			
 
				+		}
			
 
				+		.content article section {
			
 
				+			padding: 0 0 17px;
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article section:before {
			
 
				+			content: "";
			
 
				+			width: 2px;
			
 
				+			top: 5px;
			
 
				+			bottom:-30px;
			
 
				+			left: 28%;
			
 
				+			background: #1cc9f4;
			
 
				+			position: absolute;
			
 
				+		}
			
 
				+		.content article section:last-child:before {
			
 
				+			display: none;
			
 
				+		}
			
 
				+		.content article section time {
			
 
				+			width: 25%;
			
 
				+			display: block;
			
 
				+			position: absolute;
			
 
				+		}
			
 
				+		.content article section time > span {
			
 
				+			display: block;
			
 
				+			text-align: center;
			
 
				+			margin-left: 0;
			
 
				+			color: #999;
			
 
				+		}
			
 
				+		.content article section aside {
			
 
				+			color: #3a3a38;
			
 
				+			margin-left: 35%;
			
 
				+			padding-bottom: 15px;
			
 
				+		}
			
 
				+		.content article section .brief {
			
 
				+			color: #9f9f9f;
			
 
				+		}
			
 
				+		.content article section aside .things {
			
 
				+			color: #999;margin-top: 5px;
			
 
				+		}
			
 
				+	</style>
			
 
				 	<script>
			
 
				-		// 屏蔽分享
			
 
				-		window.hiddenAllWechatMenu = true;
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				 	</script>
			
 
				-	</head>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content">
			
 
				-				<ul class="mui-table-view">
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						<span class="iconfont icon-lease5 cl-blue"></span>&nbsp;返还押金
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				<div class="mui-content-madded">
			
 
				-					<ul class="lease-ul">
			
 
				-						<li><span class="cl-blue">如果1、2项已经完成，只需录入物流单号申请退货即可！</span></li>
			
 
				-					</ul>
			
 
				-				
			
 
				-				<div class="content">
			
 
				-					<article>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>第一步</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									我已联系客服，并告 知退货原因
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>第二步</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									我已和客服确认，并 且已经将水机寄回到 和客服联系的地址
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>第三步</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									公司收货，客服确认 后，会将押金退还到 您支付账户
			
 
				-								</p>
			
 
				-								<p class="brief">
			
 
				-									<span>注意：如果机器损坏 可能产生赔偿问题</span>
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>第四步</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									押金退还以后，申请 退货完成
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-					</article>
			
 
				-				</div>
			
 
				-				<div>
			
 
				-					<input type="text" class="mui-input-text" value="" placeholder="请输入物流单号">
			
 
				-				</div>
			
 
				-			</div>	
			
 
				-			<div class="buy-footer">
			
 
				-				<button type="button" class="mui-btn my-btn-hand active">申请退货</button>
			
 
				-			</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<ul class="mui-table-view">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<span class="iconfont icon-lease5 cl-blue"></span>&nbsp;返还押金
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div class="mui-content-madded">
			
 
				+		<ul class="lease-ul">
			
 
				+			<li><span class="cl-blue">如果1、2项已经完成，只需录入物流单号申请退货即可！</span></li>
			
 
				+		</ul>
			
 
				+
			
 
				+		<div class="content">
			
 
				+			<article>
			
 
				+				<section>
			
 
				+					<span class="point-time point-blue"></span>
			
 
				+					<time>
			
 
				+						<span>第一步</span>
			
 
				+					</time>
			
 
				+					<aside>
			
 
				+						<p class="things">
			
 
				+							我已联系客服，并告 知退货原因
			
 
				+						</p>
			
 
				+					</aside>
			
 
				+				</section>
			
 
				+				<section>
			
 
				+					<span class="point-time point-blue"></span>
			
 
				+					<time>
			
 
				+						<span>第二步</span>
			
 
				+					</time>
			
 
				+					<aside>
			
 
				+						<p class="things">
			
 
				+							我已和客服确认，并 且已经将水机寄回到 和客服联系的地址
			
 
				+						</p>
			
 
				+					</aside>
			
 
				+				</section>
			
 
				+				<section>
			
 
				+					<span class="point-time point-blue"></span>
			
 
				+					<time>
			
 
				+						<span>第三步</span>
			
 
				+					</time>
			
 
				+					<aside>
			
 
				+						<p class="things">
			
 
				+							公司收货，客服确认 后，会将押金退还到 您支付账户
			
 
				+						</p>
			
 
				+						<p class="brief">
			
 
				+							<span>注意：如果机器损坏 可能产生赔偿问题</span>
			
 
				+						</p>
			
 
				+					</aside>
			
 
				+				</section>
			
 
				+				<section>
			
 
				+					<span class="point-time point-blue"></span>
			
 
				+					<time>
			
 
				+						<span>第四步</span>
			
 
				+					</time>
			
 
				+					<aside>
			
 
				+						<p class="things">
			
 
				+							押金退还以后，申请 退货完成
			
 
				+						</p>
			
 
				+					</aside>
			
 
				+				</section>
			
 
				+			</article>
			
 
				+		</div>
			
 
				+		<div>
			
 
				+			<input type="text" class="mui-input-text" value="" placeholder="请输入物流单号">
			
 
				 		</div>
			
 
				+	</div>
			
 
				+	<div class="buy-footer">
			
 
				+		<button type="button" class="mui-btn my-btn-hand active">申请退货</button>
			
 
				+	</div>
			
 
				+</div>
			
 
				 
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script>
			
 
				-			mui.ready(function() {
			
 
				-				console.log("页面加载完毕")
			
 
				-				document.querySelector('.loading-bg').style.display = 'none';
			
 
				-			});
			
 
				-		</script>
			
 
				-	</body>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script>
			
 
				+    mui.ready(function() {
			
 
				+        console.log("页面加载完毕")
			
 
				+        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/lease_for_my_equipment.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/lease_for_my_equipment.html
@@ -1,172 +1,169 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.my-bar-nav {top: 0;-webkit-box-shadow: 0 0 0 #ccc;box-shadow: 0 0 0 #ccc;background: #fff;}
			
 
				-			.my-bar-nav  .mui-btn-link{color: #1cc9f4;font-size: 14px;}
			
 
				-			.mui-content>.mui-table-view:first-child {margin-top: 50px;}
			
 
				-			.my-btn-bluetooth{color: #1cc9f4;padding:2px 18px;font-size: 15px;border-color: #1cc9f4;}
			
 
				-			.my-table-noline:after,.my-table-noline:before,.my-table-noline li:after,.my-table-noline:before{display: none;}
			
 
				-			.mui-btn-link{color: #1cc9f4;}
			
 
				-			.my-btn-water-quality{padding:6px 38px;font-size: 15px;}
			
 
				-			.my-btn-water-quality.active{border: 1px solid rgba(78,215,249,.5);color: #1cc9f4;}
			
 
				-			.my-box-w{position: absolute;left: 50%;top: 50%;background: rgba(255,255,255,.1);width: 100px;height: 100px;border-radius: 50%;margin-left: -50px;margin-top: -60px;padding: 8px;}
			
 
				-			.my-box-n{background: rgba(255,255,255,.2);position: relative;height: 100%;width: 100%;border-radius: 50%;}
			
 
				-			.my-box-machine{position: absolute;left: 50%;top: 50%;width: auto;color: #fff;-webkit-transform:translateX(-50%) translateY(-20%);}
			
 
				-			.machine-num{position: absolute;left: 50%;top: 50%;margin-top:40px;-webkit-transform: translateX(-50%);color: #fff;}
			
 
				-			#user-head img{border:3px solid rgba(56,209,247,.5);border-radius: 50%;}
			
 
				-		</style>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.my-bar-nav {top: 0;-webkit-box-shadow: 0 0 0 #ccc;box-shadow: 0 0 0 #ccc;background: #fff;}
			
 
				+		.my-bar-nav  .mui-btn-link{color: #1cc9f4;font-size: 14px;}
			
 
				+		.mui-content>.mui-table-view:first-child {margin-top: 50px;}
			
 
				+		.my-btn-bluetooth{color: #1cc9f4;padding:2px 18px;font-size: 15px;border-color: #1cc9f4;}
			
 
				+		.my-table-noline:after,.my-table-noline:before,.my-table-noline li:after,.my-table-noline:before{display: none;}
			
 
				+		.mui-btn-link{color: #1cc9f4;}
			
 
				+		.my-btn-water-quality{padding:6px 38px;font-size: 15px;}
			
 
				+		.my-btn-water-quality.active{border: 1px solid rgba(78,215,249,.5);color: #1cc9f4;}
			
 
				+		.my-box-w{position: absolute;left: 50%;top: 50%;background: rgba(255,255,255,.1);width: 100px;height: 100px;border-radius: 50%;margin-left: -50px;margin-top: -60px;padding: 8px;}
			
 
				+		.my-box-n{background: rgba(255,255,255,.2);position: relative;height: 100%;width: 100%;border-radius: 50%;}
			
 
				+		.my-box-machine{position: absolute;left: 50%;top: 50%;width: auto;color: #fff;-webkit-transform:translateX(-50%) translateY(-20%);}
			
 
				+		.machine-num{position: absolute;left: 50%;top: 50%;margin-top:40px;-webkit-transform: translateX(-50%);color: #fff;}
			
 
				+		#user-head img{border:3px solid rgba(56,209,247,.5);border-radius: 50%;}
			
 
				+	</style>
			
 
				 	<script>
			
 
				-		// 屏蔽分享
			
 
				-		window.hiddenAllWechatMenu = true;
			
 
				+        // 屏蔽分享
			
 
				+        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>
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				+		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				 	</div>
			
 
				-	<div class="mui-content" style="background: #fff;">
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				 	<div style="position: relative;">
			
 
				-		    <img width="100%" src="/watero/wateroimages/shop/renew_bg1.png">
			
 
				-		    <span class="my-box-w">
			
 
				+		<img width="100%" src="//s.iamberry.com/watero/images/shop/renew_bg1.png">
			
 
				+		<span class="my-box-w">
			
 
				 		    	<div class="my-box-n">
			
 
				 		    		<div class="my-box-machine">
			
 
				 		    			<span class="iconfont icon-shebeiliebiao" style="font-size: 70px;"></span>
			
 
				 		    		</div>
			
 
				 		    	</div>
			
 
				 		    </span>
			
 
				-		    <span class="machine-num">
			
 
				+		<span class="machine-num">
			
 
				 		    	净饮一体机
			
 
				 		    </span>
			
 
				-		</div>
			
 
				-			<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				-				<li class="mui-table-view-cell" id="user-head">
			
 
				-					<img id="shareHead" src="/watero/wateroimages/shop/image-12.jpg" width="100px" />
			
 
				-				</li>				
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<span id="shareName" class="mui-h5">爱贝源</span>
			
 
				-					<br/>
			
 
				-					<span id="shareTime" class="mui-h6">2017-03-22 10:00:00</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell" id="expain">
			
 
				-				<span class="mui-h5">hi，我为你准备了一台净水机</span>
			
 
				-				<br/>
			
 
				-					<span class="mui-h5"> 送你一份饮水健康，希望你喜欢</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-				<span class="mui-h5">1.打开手机蓝牙，靠近设备</span>
			
 
				-				<br/>
			
 
				-				<span class="mui-h5">2.点击此下方“立即激活”按钮</span>
			
 
				-				<br/>
			
 
				-					<span class="mui-h5">3.扫描设备机身二维码激活设备</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<button type="button" class="my-btn-bluetooth iconfont icon-erweima" id="toActivate">
			
 
				-						立即激活
			
 
				-					</button>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<a style="text-decoration: underline;font-size: 13px;color: #999;">帮助文档</a>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		console.log("页面加载完毕");
			
 
				-		var shareId = getParam("shareId");
			
 
				-		$.ajax(base_path + '/machine/received_machine?dates=' + new Date().getTime(), {
			
 
				-			data: {
			
 
				-				"shareId":shareId
			
 
				-			},
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				+	<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				+		<li class="mui-table-view-cell" id="user-head">
			
 
				+			<img id="shareHead" src="//s.iamberry.com/watero/images/shop/image-12.jpg" width="100px" />
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<span id="shareName" class="mui-h5">爱贝源</span>
			
 
				+			<br/>
			
 
				+			<span id="shareTime" class="mui-h6">2017-03-22 10:00:00</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell" id="expain">
			
 
				+			<span class="mui-h5">hi，我为你准备了一台净水机</span>
			
 
				+			<br/>
			
 
				+			<span class="mui-h5"> 送你一份饮水健康，希望你喜欢</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<span class="mui-h5">1.打开手机蓝牙，靠近设备</span>
			
 
				+			<br/>
			
 
				+			<span class="mui-h5">2.点击此下方“立即激活”按钮</span>
			
 
				+			<br/>
			
 
				+			<span class="mui-h5">3.扫描设备机身二维码激活设备</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<button type="button" class="my-btn-bluetooth iconfont icon-erweima" id="toActivate">
			
 
				+				立即激活
			
 
				+			</button>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<a style="text-decoration: underline;font-size: 13px;color: #999;">帮助文档</a>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        console.log("页面加载完毕");
			
 
				+        var shareId = getParam("shareId");
			
 
				+        mui.ajax(base_path + '/machine/received_machine?dates=' + new Date().getTime(), {
			
 
				+            data: {
			
 
				+                "shareId":shareId
			
 
				             },
			
 
				-			dataType: 'json',
			
 
				-			type: 'post',
			
 
				-			timeout: 15000,
			
 
				-			success: function(dt) {
			
 
				-				if(dt.isRedirect) {
			
 
				-					location.href = dt.redirectURL;
			
 
				-				} else {
			
 
				-					if(dt.resultCode == '500'){
			
 
				-						mui.alert(dt.message);
			
 
				-						return;
			
 
				-					}
			
 
				-					var user = dt.data;
			
 
				-					if(checkStr(user.userHead)){
			
 
				-						$("#shareHead").attr("src",user.userHead);
			
 
				-					}
			
 
				-					if(checkStr(user.userName)){
			
 
				-						$("#shareName").text(decodeURI(user.userName));
			
 
				-					}
			
 
				-					if(checkStr(user.userDate)){
			
 
				-						$("#shareTime").text(user.userDate);
			
 
				-					}
			
 
				-					if(user.isUsed == '2' || dt.resultCode == '201'){
			
 
				-						$('#toActivate').hide();
			
 
				-					}
			
 
				-					if(dt.resultCode == '201'){//说明是本人进入页面
			
 
				-						if(user.isUsed == '0'){
			
 
				-							$("#expain").text("好友还未领取你送的净水机，快快提醒他哦!");
			
 
				-						}else{
			
 
				-							$("#expain").text("好友已经领取你送的净水机，并收到了你的心意!");
			
 
				-						}
			
 
				-						return;
			
 
				-					}
			
 
				-					if(dt.status) {
			
 
				-						mui.alert("领取成功!");
			
 
				-					} else {
			
 
				-						if(user.isUsed == '2' != ''){
			
 
				-							mui.alert(dt.message);
			
 
				-						}
			
 
				-					}
			
 
				-				}
			
 
				-			},
			
 
				-			error: function(xhr, type, errorThrown) {
			
 
				-				mui.alert("操作有误!该机器不可分享!");
			
 
				-				console.log(xhr)
			
 
				-			}
			
 
				-		})
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				-	
			
 
				-	//激活
			
 
				-	mui('body').on('tap', '#toActivate', function() {
			
 
				-		wx.scanQRCode({
			
 
				-		    needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				-		    scanType: ["qrCode"], // 可以指定扫二维码还是一维码，默认二者都有
			
 
				-		    success: function (res) {
			
 
				-			    //console.log("result--->" + result);
			
 
				-			}
			
 
				-		});
			
 
				-	});
			
 
				-	
			
 
				-	/**
			
 
				-	*	校验变量是否为 undefined、null、空字符串
			
 
				-	*/
			
 
				-	function checkStr(str){
			
 
				-		if(typeof(str) != "undefined" && str != null && str != ''){
			
 
				-			return true;
			
 
				-		}else{
			
 
				-			return false;
			
 
				-		}
			
 
				-	}
			
 
				-	</script>
			
 
				-	</body>
			
 
				+            dataType: 'json',
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                if(dt.isRedirect) {
			
 
				+                    location.href = dt.redirectURL;
			
 
				+                } else {
			
 
				+                    if(dt.resultCode == '500'){
			
 
				+                        mui.alert(dt.message);
			
 
				+                        return;
			
 
				+                    }
			
 
				+                    var user = dt.data;
			
 
				+                    if(checkStr(user.userHead)){
			
 
				+                        $("#shareHead").attr("src",user.userHead);
			
 
				+                    }
			
 
				+                    if(checkStr(user.userName)){
			
 
				+                        $("#shareName").text(decodeURI(user.userName));
			
 
				+                    }
			
 
				+                    if(checkStr(user.userDate)){
			
 
				+                        $("#shareTime").text(user.userDate);
			
 
				+                    }
			
 
				+                    if(user.isUsed == '2' || dt.resultCode == '201'){
			
 
				+                        $('#toActivate').hide();
			
 
				+                    }
			
 
				+                    if(dt.resultCode == '201'){//说明是本人进入页面
			
 
				+                        if(user.isUsed == '0'){
			
 
				+                            $("#expain").text("好友还未领取你送的净水机，快快提醒他哦!");
			
 
				+                        }else{
			
 
				+                            $("#expain").text("好友已经领取你送的净水机，并收到了你的心意!");
			
 
				+                        }
			
 
				+                        return;
			
 
				+                    }
			
 
				+                    if(dt.status) {
			
 
				+                        mui.alert("领取成功!");
			
 
				+                    } else {
			
 
				+                        if(user.isUsed == '2' != ''){
			
 
				+                            mui.alert(dt.message);
			
 
				+                        }
			
 
				+                    }
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                mui.alert("操作有误!该机器不可分享!");
			
 
				+                console.log(xhr)
			
 
				+            }
			
 
				+        })
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				+
			
 
				+    //激活
			
 
				+    mui('body').on('tap', '#toActivate', function() {
			
 
				+        wx.scanQRCode({
			
 
				+            needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				+            scanType: ["qrCode"], // 可以指定扫二维码还是一维码，默认二者都有
			
 
				+            success: function (res) {
			
 
				+                //console.log("result--->" + result);
			
 
				+            }
			
 
				+        });
			
 
				+    });
			
 
				+
			
 
				+    /**
			
 
				+     *	校验变量是否为 undefined、null、空字符串
			
 
				+     */
			
 
				+    function checkStr(str){
			
 
				+        if(typeof(str) != "undefined" && str != null && str != ''){
			
 
				+            return true;
			
 
				+        }else{
			
 
				+            return false;
			
 
				+        }
			
 
				+    }
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/lease_order_details.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/lease_order_details.html
@@ -1,452 +1,446 @@
 
				 <!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" href="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/icons-extra.css"/>
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/style.css" />
			
 
				-		<style type="text/css">
			
 
				-	.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;}
			
 
				-    .my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				-    .my-btn-hand.active{background-color: #1cc9f4;}
			
 
				-    .cl-blue{color: #1cc9f4;}
			
 
				-    .iconfont{font-size: 20px;}
			
 
				-    .mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				-    .lease-ul{font-size: 12px;color: #999;}
			
 
				-    .lease-left{display: inline-block;width: 25%;}
			
 
				-    .ul_radio{width: 73%;display: inline-block;}
			
 
				-	.ul_radio li{width:100%;height: 55px;margin: 0 1%;border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				-	.radio-cell .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				-	.lease-r-center{position: absolute;left: 70px;top: 20px;}
			
 
				-	.lease-select-box{padding: 12px 0;position: relative;}
			
 
				-	.lease-select{position: absolute;left: 0;top: 10px;}
			
 
				-	.order-noline{font-size: 13px;color: #666;padding: 5px 0;background: #f8f8f8;}
			
 
				-	.order-noline>li{margin:7px 0;}
			
 
				-	.order-noline .mui-media{padding-left: 10px;padding-right: 10px;}
			
 
				-	
			
 
				-	.order-noline li:after{}
			
 
				-	.wh-60{width: 50px;margin-right:25px;}
			
 
				-	.btn-give,.btn-activation{padding: 3px 10px; border: 0;font-size: 14px;margin-right: 10px;color: #1cc9f4;width: 90px;background-color: transparent;}
			
 
				-	.btn-give:before,.btn-activation:before,.btn-tui:before,.btn-shouhou:before{font-size: 16px;}
			
 
				-	.btn-tui{padding: 3px 10px;border:0;font-size: 14px;color: #1CC9F4;}
			
 
				-	.btn-shouhou{padding: 3px 10px;border: 0;font-size: 14px;color: #1CC9F4;}
			
 
				-	.lease-order-list li:before,.lease-order-list li:after{display: none;}
			
 
				-	.lease-order-list>.mui-table-view-cell{margin:10px;background:#f8f8f8;padding: 10px;border-radius: 5px;}
			
 
				-	.lease-order-list:after,.lease-order-list:before,.order-noline:after{display: none;}
			
 
				-	.lease-titie{padding: 12px;font-size: 12px;color: #999;background: #fff;}
			
 
				-	.ui{padding:0 0  8px 0;}
			
 
				-	.line{width: 100%;height: 10px;position: relative;}
			
 
				-	.line:after{content: '';position: absolute;left: 0;top: 50%;height: 1px;background: #c8c7cc;width: 100%;-webkit-transform: scaleY(.5);transform: scaleY(.5);}
			
 
				-	.sp-details{border-bottom: 1px solid rgba(0,0,0,.1);    margin-bottom: 0px !important;}
			
 
				-	.mui-backdrop {
			
 
				-				position: fixed;
			
 
				-				z-index: 998;
			
 
				-				top: 0;
			
 
				-				right: 0;
			
 
				-				bottom: 0;
			
 
				-				left: 0;
			
 
				-				background:url(/watero/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .8);
			
 
				-				background-size: 80%;
			
 
				-			}
			
 
				-	.mui-backdrop:after{content:'点键右上角分享，将水机送给好友吧。';position: absolute;left:0;top:0;width:100%; text-align: center;color:#fff;padding-top:50%;font-size:18px;}
			
 
				-		</style>
			
 
				+<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" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/icons-extra.css"/>
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style type="text/css">
			
 
				+		.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;}
			
 
				+		.my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				+		.my-btn-hand.active{background-color: #1cc9f4;}
			
 
				+		.cl-blue{color: #1cc9f4;}
			
 
				+		.iconfont{font-size: 20px;}
			
 
				+		.mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				+		.lease-ul{font-size: 12px;color: #999;}
			
 
				+		.lease-left{display: inline-block;width: 25%;}
			
 
				+		.ul_radio{width: 73%;display: inline-block;}
			
 
				+		.ul_radio li{width:100%;height: 55px;margin: 0 1%;border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				+		.radio-cell .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				+		.lease-r-center{position: absolute;left: 70px;top: 20px;}
			
 
				+		.lease-select-box{padding: 12px 0;position: relative;}
			
 
				+		.lease-select{position: absolute;left: 0;top: 10px;}
			
 
				+		.order-noline{font-size: 13px;color: #666;padding: 5px 0;background: #f8f8f8;}
			
 
				+		.order-noline>li{margin:7px 0;}
			
 
				+		.order-noline .mui-media{padding-left: 10px;padding-right: 10px;}
			
 
				+
			
 
				+		.order-noline li:after{}
			
 
				+		.wh-60{width: 50px;margin-right:25px;}
			
 
				+		.btn-give,.btn-activation{padding: 3px 10px; border: 0;font-size: 14px;margin-right: 10px;color: #1cc9f4;width: 90px;background-color: transparent;}
			
 
				+		.btn-give:before,.btn-activation:before,.btn-tui:before,.btn-shouhou:before{font-size: 16px;}
			
 
				+		.btn-tui{padding: 3px 10px;border:0;font-size: 14px;color: #1CC9F4;}
			
 
				+		.btn-shouhou{padding: 3px 10px;border: 0;font-size: 14px;color: #1CC9F4;}
			
 
				+		.lease-order-list li:before,.lease-order-list li:after{display: none;}
			
 
				+		.lease-order-list>.mui-table-view-cell{margin:10px;background:#f8f8f8;padding: 10px;border-radius: 5px;}
			
 
				+		.lease-order-list:after,.lease-order-list:before,.order-noline:after{display: none;}
			
 
				+		.lease-titie{padding: 12px;font-size: 12px;color: #999;background: #fff;}
			
 
				+		.ui{padding:0 0  8px 0;}
			
 
				+		.line{width: 100%;height: 10px;position: relative;}
			
 
				+		.line:after{content: '';position: absolute;left: 0;top: 50%;height: 1px;background: #c8c7cc;width: 100%;-webkit-transform: scaleY(.5);transform: scaleY(.5);}
			
 
				+		.sp-details{border-bottom: 1px solid rgba(0,0,0,.1);    margin-bottom: 0px !important;}
			
 
				+		.mui-backdrop {
			
 
				+			position: fixed;
			
 
				+			z-index: 998;
			
 
				+			top: 0;
			
 
				+			right: 0;
			
 
				+			bottom: 0;
			
 
				+			left: 0;
			
 
				+			background:url(//s.iamberry.com/watero/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .8);
			
 
				+			background-size: 80%;
			
 
				+		}
			
 
				+		.mui-backdrop:after{content:'点键右上角分享，将水机送给好友吧。';position: absolute;left:0;top:0;width:100%; text-align: center;color:#fff;padding-top:50%;font-size:18px;}
			
 
				+	</style>
			
 
				 	<script>
			
 
				-		// 屏蔽分享
			
 
				-		window.hiddenAllWechatMenu = true;
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				 	</script>
			
 
				-	</head>
			
 
				+</head>
			
 
				 
			
 
				-	<body>
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body>
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content">
			
 
				-			<!--下拉刷新容器-->
			
 
				-		<div id="pullrefresh_lease_orderlist" class="mui-content mui-scroll-wrapper">
			
 
				-			<div class="mui-scroll">
			
 
				-				<!--数据列表-->
			
 
				-				<div class="lease-titie" id="countOrderNum">
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<!--下拉刷新容器-->
			
 
				+	<div id="pullrefresh_lease_orderlist" class="mui-content mui-scroll-wrapper">
			
 
				+		<div class="mui-scroll">
			
 
				+			<!--数据列表-->
			
 
				+			<div class="lease-titie" id="countOrderNum">
			
 
				 				您共有0个订单
			
 
				-				</div>
			
 
				-				<ul class="mui-table-view lease-order-list" style="margin-top: -10px;">
			
 
				+			</div>
			
 
				+			<ul class="mui-table-view lease-order-list" style="margin-top: -10px;">
			
 
				 
			
 
				-				</ul>
			
 
				-				<!--<ul class="mui-table-view mui-grid-view my-tab-view-pull">
			
 
				+			</ul>
			
 
				+			<!--<ul class="mui-table-view mui-grid-view my-tab-view-pull">
			
 
				 
			
 
				-				</ul> -->
			
 
				-			</div>
			
 
				-		</div>
			
 
				-			
			
 
				-				<!--<ul class="mui-table-view lease-order-list">
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						<span class="iconfont icon-lease3 cl-blue"></span>&nbsp;订单编号：15646231654321
			
 
				-						<ul class="mui-table-view order-noline">
			
 
				-							<li>订单状态：已发货<span class="mui-pull-right">已支付金额：<span class="cl-red">¥1000.00</span></span></li>
			
 
				-							<li>下单时间:   2017年2月01日 10:00:12</li>
			
 
				-							<li>收货人信息：何小刚   1599999999</li>
			
 
				-							<li>广东省-深圳市-福田区-莲花街道深南大道特区报业大厦12B 深圳爱贝源科技有限公司</li>
			
 
				-							<li>物流信息：顺丰快递 89411145413314<span class="cl-blue mui-pull-right">物流查询</span></li>
			
 
				-							<li class="mui-table-view-cell mui-media">
			
 
				-								<a href="javascript:;">
			
 
				-									<img class="mui-pull-left wh-60" src="images/cp-3.jpg">
			
 
				-									<div class="mui-media-body">
			
 
				-										美国watero高端净水专家
			
 
				-										<div>
			
 
				-											服务费：￥700.00设备押金：￥300.00
			
 
				-										</div>
			
 
				-										<div>
			
 
				-											<button type="button" class="mui-btn iconfont icon-lease8 btn-give"> 送人</button><button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation"> 激活</button>
			
 
				-										</div>
			
 
				-									</div>
			
 
				-								</a>
			
 
				-							</li>
			
 
				-							<li style="padding-top: 10px;">
			
 
				-								<button type="button" class="mui-btn iconfont icon-lease5 btn-tui"> 退押金</button><button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-shouhou"> 申请售后</button>
			
 
				-							</li>
			
 
				-						</ul>
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell">
			
 
				-						<span class="iconfont icon-lease3 cl-blue"></span>&nbsp;订单编号：15646231654321
			
 
				-						<ul class="mui-table-view order-noline">
			
 
				-							<li>订单状态：已发货<span class="mui-pull-right">已支付金额：<span class="cl-red">¥1000.00</span></span></li>
			
 
				-							<li>下单时间:   2017年2月01日 10:00:12</li>
			
 
				-							<li>收货人信息：何小刚   1599999999</li>
			
 
				-							<li>广东省-深圳市-福田区-莲花街道深南大道特区报业大厦12B 深圳爱贝源科技有限公司</li>
			
 
				-							<li>物流信息：顺丰快递 89411145413314<span class="cl-blue mui-pull-right">物流查询</span></li>
			
 
				-							<li class="mui-table-view-cell mui-media">
			
 
				-								<a href="javascript:;">
			
 
				-									<img class="mui-pull-left wh-60" src="images/cp-3.jpg">
			
 
				-									<div class="mui-media-body">
			
 
				-										美国watero高端净水专家
			
 
				-										<div>
			
 
				-											服务费：￥700.00设备押金：￥300.00
			
 
				-										</div>
			
 
				-										<div>
			
 
				-											<button type="button" class="mui-btn iconfont icon-lease8 btn-give"> 送人</button><button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation"> 激活</button>
			
 
				-										</div>
			
 
				-									</div>
			
 
				-								</a>
			
 
				-							</li>
			
 
				-							<li style="padding-top: 10px;">
			
 
				-								<button type="button" class="mui-btn iconfont icon-lease5 btn-tui"> 退押金</button><button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-shouhou"> 申请售后</button>
			
 
				-							</li>
			
 
				-						</ul>
			
 
				-					</li>
			
 
				-				</ul>-->
			
 
				+            </ul> -->
			
 
				 		</div>
			
 
				-		<div class="return">
			
 
				-        	<span onClick="gotoTop();return false;" class="mui-icon-extra mui-icon-extra-top"></span>
			
 
				-        </div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script>
			
 
				-		mui.init({
			
 
				-			pullRefresh: {
			
 
				-				container: '#pullrefresh_lease_orderlist',
			
 
				-				down: {
			
 
				-					//callback: pulldownRefresh
			
 
				-				},
			
 
				-				up: {
			
 
				-					contentrefresh: '正在加载...',
			
 
				-					callback: pullupRefresh
			
 
				-				}
			
 
				-			}
			
 
				-		});
			
 
				-		   	var count = 0;
			
 
				-		   	var proType=1;
			
 
				-		   	var pageNumber = 0,pagesize = 2;
			
 
				-		   	var rentStatus = -1;
			
 
				-		   	var userNickName = '';
			
 
				-			/**
			
 
				-			 * 上拉加载具体业务实现
			
 
				-			 */
			
 
				-			function pullupRefresh() {
			
 
				-				++pageNumber;
			
 
				-				$.ajax(base_path + '/rent_order/list?dates=' + new Date().getTime(), {
			
 
				-					data: {
			
 
				-						"pageSize": pagesize,
			
 
				-						"pageNO": pageNumber,
			
 
				-						"rentStatus":rentStatus
			
 
				-					},
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-					dataType: 'json',
			
 
				-					type: 'post',
			
 
				-					timeout: 15000,
			
 
				-					success: function(dt) {
			
 
				-						//console.log(dt);
			
 
				-						if(dt.isRedirect) {
			
 
				-							location.href = dt.redirectURL;
			
 
				-						}else{
			
 
				-							 if(dt.status) {
			
 
				-								var order_data = dt.data.list;
			
 
				-								var countOrderNum = dt.data.countOrder;
			
 
				-								$("#countOrderNum").text("您共有" + countOrderNum + "个订单");
			
 
				-								
			
 
				-								mui('#pullrefresh_lease_orderlist').pullRefresh().endPullupToRefresh(order_data.length < pagesize);//参数为true代表没有更多数据了。
			
 
				-								var table = document.body.querySelector('.lease-order-list');
			
 
				-								//var cells = document.body.querySelectorAll('.lease-order-list>li');
			
 
				-								mui(order_data).each(function(index) {
			
 
				-									if(userNickName == ''){
			
 
				-										userNickName = decodeURI(this.rentUserNickName);
			
 
				-									}
			
 
				-									var li = document.createElement('li');
			
 
				-									li.className = 'mui-table-view-cell';
			
 
				-									var productItem = '',presentItem = '';
			
 
				-									var rentYears = this.typeName;
			
 
				-									var orderStatus = this.rentStatus;
			
 
				-									var rentOrderId = this.rentOrderId;
			
 
				-									mui(this.orderItemList).each(function(n) {
			
 
				-										if(this.itemProductType == 1){
			
 
				-											var activateButton = '';
			
 
				-											var presentButton = '';
			
 
				-											if(orderStatus == 5 && this.itemCodeState == 1){
			
 
				-												activateButton = '<button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation toActivate" id="actIvateBtn_' + rentOrderId + '"> 激活</button>' 
			
 
				-												presentButton = '<button type="button" class="mui-btn iconfont icon-lease8 btn-give" onclick="presentOther('+ this.itemId +')" style="text-align: left;padding: 3px 10px 3px 0;"> 送人</button>'
			
 
				-											}
			
 
				-											productItem = '<li class="mui-table-view-cell mui-media">' 
			
 
				-															+ '<a class="sp-details">' 
			
 
				-															+ '<img class="mui-pull-left wh-60" src="/watero/wateroimages/cp-1.jpg">'
			
 
				-															+ '<div class="mui-media-body">' + this.itemProductName 
			
 
				-															+ activateButton
			
 
				-															+ '<div style="height:30px;">租期：<span>' + rentYears + '</span>'  
			
 
				-															+ '</div>' 
			
 
				-															+ '<div>' 
			
 
				-															+ '<button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-activation afterSale" id="'+rentOrderId+'" name="'+this.itemId+'" postStatus="'+orderStatus+'"> 售后</button>'
			
 
				-															+  presentButton
			
 
				-															+ '</div>' 
			
 
				-															+ '</div>' 
			
 
				-															+ '</a>'
			
 
				-															+ '</li>';
			
 
				-										}else if(this.itemProductType == 5){
			
 
				-											presentItem = '<li>精美礼品：' + this.itemProductName + '</li>';
			
 
				-										}
			
 
				-									});
			
 
				-									var postInfo = '';
			
 
				-									if(typeof(this.rentPostFirm) != 'undefined' && this.rentPostFirm != '' 
			
 
				-											&& typeof(this.rentPostNum) != 'undefined' && this.rentPostNum != ''){ 
			
 
				-										postInfo = '<li>物流信息：' + getPostFirm(this.rentPostFirm) + ' ' + this.rentPostNum
			
 
				-													+ '<span class="cl-blue mui-pull-right show_post_info" postNum="' + this.rentPostNum + '">'
			
 
				-													+ '物流查询</span>'
			
 
				-													+'</li>'
			
 
				-									}
			
 
				-									li.innerHTML = '<div class="ui">'
			
 
				-													+ '<span class="iconfont icon-lease3 cl-blue"></span>'
			
 
				-													+ '&nbsp;订单编号：' + this.rentOrderId
			
 
				-													+ '</div>' 
			
 
				-													+ '<ul class="mui-table-view order-noline">' 
			
 
				-													+ '<li>订单状态：' + getOrderStatus(this.rentStatus) + '<span class="mui-pull-right">订单合计：<span class="cl-red">¥' + accDiv(this.rentAmount,100) + '</span>元</span></li>' 
			
 
				-													+ '<li>抵扣金额：<span class="cl-red">¥' + accDiv(this.rentServiceMoney,100) + '</span>元<span class="mui-pull-right">支付金额：<span class="cl-red">¥' + accDiv(this.rentPayMoney,100) + '</span>元</span></li>' 
			
 
				-													+ '<li>订单时间:   ' + this.rentCreateDate + '</li>' 
			
 
				-													+ '<div class="line"></div><li>收货信息：</li>' 
			
 
				-													+ '<li>' + this.rentAddressName + '   ' + this.rentAddressTel + '</li>' 
			
 
				-													+ '<li>' + this.rentAddressInfo + '</li>' 
			
 
				-													+ postInfo
			
 
				-													+ productItem
			
 
				-													+ presentItem
			
 
				-													+ '</ul>';
			
 
				-									table.appendChild(li);	
			
 
				-									//激活
			
 
				-									$(".toActivate").each(function() {
			
 
				-										$('#actIvateBtn_' + rentOrderId).on("click", function() {
			
 
				-											wx.scanQRCode({
			
 
				-											    needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				-											    scanType: ["qrCode"], // 可以指定扫二维码还是一维码，默认二者都有
			
 
				-											    success: function (res) {
			
 
				-												    //console.log("result--->" + result);
			
 
				-												}
			
 
				-											});
			
 
				-										});
			
 
				-									});
			
 
				-								})
			
 
				-							} else {
			
 
				-								mui.alert("暂未查询到租用订单!请稍后重试!");
			
 
				-								mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				-							}
			
 
				-						}
			
 
				-					},
			
 
				-					error: function(xhr, type, errorThrown) {
			
 
				-						console.log(xhr)
			
 
				-						mui.alert("查询租用订单出错!请稍后重试!");
			
 
				-						mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				-					}
			
 
				-				})
			
 
				-			}
			
 
				-			mui.ready(function() {
			
 
				-				//console.log("页面加载完毕");
			
 
				-				rentStatus = getParam("rentStatus") == null ? '' : getParam("rentStatus");
			
 
				-				mui('#pullrefresh_lease_orderlist').pullRefresh().pullupLoading();
			
 
				-				document.querySelector('.loading-bg').style.display = 'none';
			
 
				-			});
			
 
				-			$(window).on("scroll", function() {
			
 
				-				if ($(window).scrollTop() > 120) {
			
 
				-					$(".return").show();
			
 
				-				} else {
			
 
				-					$(".return").hide();
			
 
				-				}
			
 
				-			});
			
 
				-			$(".ul_radio li").each(function() {
			
 
				-				$(this).on("click", function() {
			
 
				-					$(this).addClass("active");
			
 
				-					$(this).siblings().removeClass("active");
			
 
				-				});
			
 
				-			});
			
 
				-			function presentOther(itemId){
			
 
				-				$.ajax(base_path + '/machine/present_other?dates=' + new Date().getTime(), {
			
 
				-					data: {
			
 
				-						"orderItemId":itemId
			
 
				-					},
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-					dataType: 'json',
			
 
				-					type: 'post',
			
 
				-					timeout: 15000,
			
 
				-					success: function(dt) {
			
 
				-						//console.log(dt);						
			
 
				-						if(dt.status) {
			
 
				-							mask.show();//显示遮罩
			
 
				-							var url = encodeURI('http://' + window.location.host+'/watero/html/rent/lease_for_my_equipment.html?shareId=' + dt.data);
			
 
				-							var desc = userNickName + "送给你一台净水机，为你送上一份饮水健康。";
			
 
				-							window.repleFlag = false;
			
 
				-							window.hiddenAllWechatMenu = false;		//window.wxFriend window.repleWxData 
			
 
				-							window.wxFriend = {
			
 
				-								"appId": "",
			
 
				-								"imgUrl": '/watero/images/shop/share-lease.png',
			
 
				-								"link": url,
			
 
				-								"desc": desc,
			
 
				-								"title": "给你送净水机了，快来领取吧!",
			
 
				-								"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-								"shareTimeSuccess": "分享成功",
			
 
				-								"shareTimeCancel": "已取消分享",
			
 
				-								"shareAppSuccess": "分享成功!",
			
 
				-								"shareAppCancel": "已取消分享"
			
 
				-							};
			
 
				-							getConfig();
			
 
				-						} else {
			
 
				-							mui.alert(dt.message);
			
 
				-							//mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				-						}
			
 
				-					},
			
 
				-					error: function(xhr, type, errorThrown) {
			
 
				-						mui.alert("操作有误!该机器不可分享!");
			
 
				-						console.log(xhr)
			
 
				-					}
			
 
				-				})
			
 
				-			}
			
 
				-			
			
 
				-			//售后
			
 
				-			mui('body').on('tap', '.afterSale', function() {
			
 
				-	/*			mui.alert("请在公众号聊天窗口发送您的问题!");*/
			
 
				-	var th=this;
			
 
				-                mui.openWindow({
			
 
				-                    url: '/watero/view/order_service.html?orderId='+th.getAttribute("id")+'&itemId='+th.getAttribute("name")+'&postStatus='+th.getAttribute("postStatus")
			
 
				-                });
			
 
				-			});
			
 
				-			
			
 
				-			var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调；
			
 
				-			//mask.close();//关闭遮罩
			
 
				-			function getOrderStatus(status){
			
 
				-				switch (status){
			
 
				-				case 0:
			
 
				-		            return '取消订单';
			
 
				-				case 1:
			
 
				-		            return '待支付';
			
 
				-				case 2:
			
 
				-		            return '待发货';
			
 
				-				case 3:
			
 
				-		            return '退款申请中';
			
 
				-				case 4:
			
 
				-		            return '已退款';
			
 
				-				case 5:
			
 
				-		            return '已发货';
			
 
				-				case 6:
			
 
				-		            return '申请退货中';
			
 
				-				case 7:
			
 
				-		            return '退货中';
			
 
				-				case 8:
			
 
				-		            return '退货成功';
			
 
				-				case 9:
			
 
				-		            return '换货中';
			
 
				-				case 10:
			
 
				-		            return '换货完成';
			
 
				-				case 11:
			
 
				-		            return '申请换货中';
			
 
				-		        default:
			
 
				-		            break;
			
 
				-				}
			
 
				-			}
			
 
				-			
			
 
				-			function getPostFirm(firmCode){
			
 
				-				switch(firmCode){
			
 
				-				case 'sto':
			
 
				-					return '申通快递';
			
 
				-				break;
			
 
				-				case 'yto':
			
 
				-					return '圆通快递';
			
 
				-					break;
			
 
				-				case 'sf':
			
 
				-					return '顺丰快递';
			
 
				-					break;
			
 
				-				case 'ems':
			
 
				-					return '邮政EMS';
			
 
				-					break;
			
 
				-				case 'zto':
			
 
				-					return '中通快递';
			
 
				-					break;
			
 
				-				case 'zjs':
			
 
				-					return '宅急送';
			
 
				-					break;
			
 
				-				case 'yunda':
			
 
				-					return '韵达快递';
			
 
				-					break;
			
 
				-				case 'cces':
			
 
				-					return 'cces快递';
			
 
				-					break;
			
 
				-				case 'pick':
			
 
				-					return '上门提货';
			
 
				-					break;
			
 
				-				case 'htky':
			
 
				-					return '汇通快递';
			
 
				-					break;
			
 
				-				case 'ttkdex':
			
 
				-					return '天天快递';
			
 
				-					break;
			
 
				-				case 'stars':
			
 
				-					return '星晨急便';
			
 
				-					break;
			
 
				-				case 'jd':
			
 
				-					return '京东快递';
			
 
				-					break;
			
 
				-				case '01':
			
 
				-					return '其他';
			
 
				-					break;
			
 
				-				case '02':
			
 
				-					return '上门送货';
			
 
				-					break;
			
 
				-				}
			
 
				-			}
			
 
				-		</script>
			
 
				-	</body>
			
 
				+	</div>
			
 
				+
			
 
				+	<!--<ul class="mui-table-view lease-order-list">
			
 
				+        <li class="mui-table-view-cell">
			
 
				+            <span class="iconfont icon-lease3 cl-blue"></span>&nbsp;订单编号：15646231654321
			
 
				+            <ul class="mui-table-view order-noline">
			
 
				+                <li>订单状态：已发货<span class="mui-pull-right">已支付金额：<span class="cl-red">¥1000.00</span></span></li>
			
 
				+                <li>下单时间:   2017年2月01日 10:00:12</li>
			
 
				+                <li>收货人信息：何小刚   1599999999</li>
			
 
				+                <li>广东省-深圳市-福田区-莲花街道深南大道特区报业大厦12B 深圳爱贝源科技有限公司</li>
			
 
				+                <li>物流信息：顺丰快递 89411145413314<span class="cl-blue mui-pull-right">物流查询</span></li>
			
 
				+                <li class="mui-table-view-cell mui-media">
			
 
				+                    <a href="javascript:;">
			
 
				+                        <img class="mui-pull-left wh-60" src="images/cp-3.jpg">
			
 
				+                        <div class="mui-media-body">
			
 
				+                            美国watero高端净水专家
			
 
				+                            <div>
			
 
				+                                服务费：￥700.00设备押金：￥300.00
			
 
				+                            </div>
			
 
				+                            <div>
			
 
				+                                <button type="button" class="mui-btn iconfont icon-lease8 btn-give"> 送人</button><button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation"> 激活</button>
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+                    </a>
			
 
				+                </li>
			
 
				+                <li style="padding-top: 10px;">
			
 
				+                    <button type="button" class="mui-btn iconfont icon-lease5 btn-tui"> 退押金</button><button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-shouhou"> 申请售后</button>
			
 
				+                </li>
			
 
				+            </ul>
			
 
				+        </li>
			
 
				+        <li class="mui-table-view-cell">
			
 
				+            <span class="iconfont icon-lease3 cl-blue"></span>&nbsp;订单编号：15646231654321
			
 
				+            <ul class="mui-table-view order-noline">
			
 
				+                <li>订单状态：已发货<span class="mui-pull-right">已支付金额：<span class="cl-red">¥1000.00</span></span></li>
			
 
				+                <li>下单时间:   2017年2月01日 10:00:12</li>
			
 
				+                <li>收货人信息：何小刚   1599999999</li>
			
 
				+                <li>广东省-深圳市-福田区-莲花街道深南大道特区报业大厦12B 深圳爱贝源科技有限公司</li>
			
 
				+                <li>物流信息：顺丰快递 89411145413314<span class="cl-blue mui-pull-right">物流查询</span></li>
			
 
				+                <li class="mui-table-view-cell mui-media">
			
 
				+                    <a href="javascript:;">
			
 
				+                        <img class="mui-pull-left wh-60" src="images/cp-3.jpg">
			
 
				+                        <div class="mui-media-body">
			
 
				+                            美国watero高端净水专家
			
 
				+                            <div>
			
 
				+                                服务费：￥700.00设备押金：￥300.00
			
 
				+                            </div>
			
 
				+                            <div>
			
 
				+                                <button type="button" class="mui-btn iconfont icon-lease8 btn-give"> 送人</button><button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation"> 激活</button>
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+                    </a>
			
 
				+                </li>
			
 
				+                <li style="padding-top: 10px;">
			
 
				+                    <button type="button" class="mui-btn iconfont icon-lease5 btn-tui"> 退押金</button><button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-shouhou"> 申请售后</button>
			
 
				+                </li>
			
 
				+            </ul>
			
 
				+        </li>
			
 
				+    </ul>-->
			
 
				+</div>
			
 
				+<div class="return">
			
 
				+	<span onClick="gotoTop();return false;" class="mui-icon-extra mui-icon-extra-top"></span>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script>
			
 
				+    mui.init({
			
 
				+        pullRefresh: {
			
 
				+            container: '#pullrefresh_lease_orderlist',
			
 
				+            down: {
			
 
				+                //callback: pulldownRefresh
			
 
				+            },
			
 
				+            up: {
			
 
				+                contentrefresh: '正在加载...',
			
 
				+                callback: pullupRefresh
			
 
				+            }
			
 
				+        }
			
 
				+    });
			
 
				+    var count = 0;
			
 
				+    var proType=1;
			
 
				+    var pageNumber = 0,pagesize = 2;
			
 
				+    var rentStatus = -1;
			
 
				+    var userNickName = '';
			
 
				+    /**
			
 
				+     * 上拉加载具体业务实现
			
 
				+     */
			
 
				+    function pullupRefresh() {
			
 
				+        ++pageNumber;
			
 
				+        mui.ajax(base_path + '/rent_order/list?dates=' + new Date().getTime(), {
			
 
				+            data: {
			
 
				+                "pageSize": pagesize,
			
 
				+                "pageNO": pageNumber,
			
 
				+                "rentStatus":rentStatus
			
 
				+            },
			
 
				+            dataType: 'json',
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt);
			
 
				+                if(dt.isRedirect) {
			
 
				+                    location.href = dt.redirectURL;
			
 
				+                }else{
			
 
				+                    if(dt.status) {
			
 
				+                        var order_data = dt.data.list;
			
 
				+                        var countOrderNum = dt.data.countOrder;
			
 
				+                        $("#countOrderNum").text("您共有" + countOrderNum + "个订单");
			
 
				+
			
 
				+                        mui('#pullrefresh_lease_orderlist').pullRefresh().endPullupToRefresh(order_data.length < pagesize);//参数为true代表没有更多数据了。
			
 
				+                        var table = document.body.querySelector('.lease-order-list');
			
 
				+                        //var cells = document.body.querySelectorAll('.lease-order-list>li');
			
 
				+                        mui(order_data).each(function(index) {
			
 
				+                            if(userNickName == ''){
			
 
				+                                userNickName = decodeURI(this.rentUserNickName);
			
 
				+                            }
			
 
				+                            var li = document.createElement('li');
			
 
				+                            li.className = 'mui-table-view-cell';
			
 
				+                            var productItem = '',presentItem = '';
			
 
				+                            var rentYears = this.typeName;
			
 
				+                            var orderStatus = this.rentStatus;
			
 
				+                            var rentOrderId = this.rentOrderId;
			
 
				+                            mui(this.orderItemList).each(function(n) {
			
 
				+                                if(this.itemProductType == 1){
			
 
				+                                    var activateButton = '';
			
 
				+                                    var presentButton = '';
			
 
				+                                    if(orderStatus == 5 && this.itemCodeState == 1){
			
 
				+                                        activateButton = '<button type="button" class="mui-btn iconfont icon-erweima mui-pull-right btn-activation toActivate" id="actIvateBtn_' + rentOrderId + '"> 激活</button>'
			
 
				+                                        presentButton = '<button type="button" class="mui-btn iconfont icon-lease8 btn-give" onclick="presentOther('+ this.itemId +')" style="text-align: left;padding: 3px 10px 3px 0;"> 送人</button>'
			
 
				+                                    }
			
 
				+                                    productItem = '<li class="mui-table-view-cell mui-media">'
			
 
				+                                        + '<a class="sp-details">'
			
 
				+                                        + '<img class="mui-pull-left wh-60" src="//s.iamberry.com/watero/images/cp-1.jpg">'
			
 
				+                                        + '<div class="mui-media-body">' + this.itemProductName
			
 
				+                                        + activateButton
			
 
				+                                        + '<div style="height:30px;">租期：<span>' + rentYears + '</span>'
			
 
				+                                        + '</div>'
			
 
				+                                        + '<div>'
			
 
				+                                        + '<button type="button" class="mui-btn iconfont icon-lease6 mui-pull-right btn-activation afterSale" id="'+rentOrderId+'" name="'+this.itemId+'" postStatus="'+orderStatus+'"> 售后</button>'
			
 
				+                                        +  presentButton
			
 
				+                                        + '</div>'
			
 
				+                                        + '</div>'
			
 
				+                                        + '</a>'
			
 
				+                                        + '</li>';
			
 
				+                                }else if(this.itemProductType == 5){
			
 
				+                                    presentItem = '<li>精美礼品：' + this.itemProductName + '</li>';
			
 
				+                                }
			
 
				+                            });
			
 
				+                            var postInfo = '';
			
 
				+                            if(typeof(this.rentPostFirm) != 'undefined' && this.rentPostFirm != ''
			
 
				+                                && typeof(this.rentPostNum) != 'undefined' && this.rentPostNum != ''){
			
 
				+                                postInfo = '<li>物流信息：' + getPostFirm(this.rentPostFirm) + ' ' + this.rentPostNum
			
 
				+                                    + '<span class="cl-blue mui-pull-right show_post_info" postNum="' + this.rentPostNum + '">'
			
 
				+                                    + '物流查询</span>'
			
 
				+                                    +'</li>'
			
 
				+                            }
			
 
				+                            li.innerHTML = '<div class="ui">'
			
 
				+                                + '<span class="iconfont icon-lease3 cl-blue"></span>'
			
 
				+                                + '&nbsp;订单编号：' + this.rentOrderId
			
 
				+                                + '</div>'
			
 
				+                                + '<ul class="mui-table-view order-noline">'
			
 
				+                                + '<li>订单状态：' + getOrderStatus(this.rentStatus) + '<span class="mui-pull-right">订单合计：<span class="cl-red">¥' + accDiv(this.rentAmount,100) + '</span>元</span></li>'
			
 
				+                                + '<li>抵扣金额：<span class="cl-red">¥' + accDiv(this.rentServiceMoney,100) + '</span>元<span class="mui-pull-right">支付金额：<span class="cl-red">¥' + accDiv(this.rentPayMoney,100) + '</span>元</span></li>'
			
 
				+                                + '<li>订单时间:   ' + this.rentCreateDate + '</li>'
			
 
				+                                + '<div class="line"></div><li>收货信息：</li>'
			
 
				+                                + '<li>' + this.rentAddressName + '   ' + this.rentAddressTel + '</li>'
			
 
				+                                + '<li>' + this.rentAddressInfo + '</li>'
			
 
				+                                + postInfo
			
 
				+                                + productItem
			
 
				+                                + presentItem
			
 
				+                                + '</ul>';
			
 
				+                            table.appendChild(li);
			
 
				+                            //激活
			
 
				+                            $(".toActivate").each(function() {
			
 
				+                                $('#actIvateBtn_' + rentOrderId).on("click", function() {
			
 
				+                                    wx.scanQRCode({
			
 
				+                                        needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
			
 
				+                                        scanType: ["qrCode"], // 可以指定扫二维码还是一维码，默认二者都有
			
 
				+                                        success: function (res) {
			
 
				+                                            //console.log("result--->" + result);
			
 
				+                                        }
			
 
				+                                    });
			
 
				+                                });
			
 
				+                            });
			
 
				+                        })
			
 
				+                    } else {
			
 
				+                        mui.alert("暂未查询到租用订单!请稍后重试!");
			
 
				+                        mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				+                    }
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                console.log(xhr)
			
 
				+                mui.alert("查询租用订单出错!请稍后重试!");
			
 
				+                mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				+            }
			
 
				+        })
			
 
				+    }
			
 
				+    mui.ready(function() {
			
 
				+        //console.log("页面加载完毕");
			
 
				+        rentStatus = getParam("rentStatus") == null ? '' : getParam("rentStatus");
			
 
				+        mui('#pullrefresh_lease_orderlist').pullRefresh().pullupLoading();
			
 
				+        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+    });
			
 
				+    $(window).on("scroll", function() {
			
 
				+        if ($(window).scrollTop() > 120) {
			
 
				+            $(".return").show();
			
 
				+        } else {
			
 
				+            $(".return").hide();
			
 
				+        }
			
 
				+    });
			
 
				+    $(".ul_radio li").each(function() {
			
 
				+        $(this).on("click", function() {
			
 
				+            $(this).addClass("active");
			
 
				+            $(this).siblings().removeClass("active");
			
 
				+        });
			
 
				+    });
			
 
				+    function presentOther(itemId){
			
 
				+        mui.ajax(base_path + '/machine/present_other?dates=' + new Date().getTime(), {
			
 
				+            data: {
			
 
				+                "orderItemId":itemId
			
 
				+            },
			
 
				+            dataType: 'json',
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt);
			
 
				+                if(dt.status) {
			
 
				+                    mask.show();//显示遮罩
			
 
				+                    var url = encodeURI('//' + window.location.host+'/watero/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
			
 
				+                    var desc = userNickName + "送给你一台净水机，为你送上一份饮水健康。";
			
 
				+                    window.repleFlag = false;
			
 
				+                    window.hiddenAllWechatMenu = false;		//window.wxFriend window.repleWxData
			
 
				+                    window.wxFriend = {
			
 
				+                        "appId": "",
			
 
				+                        "imgUrl": '//s.iamberry.com/watero/images/shop/share-lease.png',
			
 
				+                        "link": url,
			
 
				+                        "desc": desc,
			
 
				+                        "title": "给你送净水机了，快来领取吧!",
			
 
				+                        "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+                        "shareTimeSuccess": "分享成功",
			
 
				+                        "shareTimeCancel": "已取消分享",
			
 
				+                        "shareAppSuccess": "分享成功!",
			
 
				+                        "shareAppCancel": "已取消分享"
			
 
				+                    };
			
 
				+                    getConfig();
			
 
				+                } else {
			
 
				+                    mui.alert(dt.message);
			
 
				+                    //mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                mui.alert("操作有误!该机器不可分享!");
			
 
				+                console.log(xhr)
			
 
				+            }
			
 
				+        })
			
 
				+    }
			
 
				+
			
 
				+    //售后
			
 
				+    mui('body').on('tap', '.afterSale', function() {
			
 
				+		/*			mui.alert("请在公众号聊天窗口发送您的问题!");*/
			
 
				+        var th=this;
			
 
				+        mui.openWindow({
			
 
				+            url: '/watero/view/order_service.html?orderId='+th.getAttribute("id")+'&itemId='+th.getAttribute("name")+'&postStatus='+th.getAttribute("postStatus")
			
 
				+        });
			
 
				+    });
			
 
				+
			
 
				+    var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调；
			
 
				+    //mask.close();//关闭遮罩
			
 
				+    function getOrderStatus(status){
			
 
				+        switch (status){
			
 
				+            case 0:
			
 
				+                return '取消订单';
			
 
				+            case 1:
			
 
				+                return '待支付';
			
 
				+            case 2:
			
 
				+                return '待发货';
			
 
				+            case 3:
			
 
				+                return '退款申请中';
			
 
				+            case 4:
			
 
				+                return '已退款';
			
 
				+            case 5:
			
 
				+                return '已发货';
			
 
				+            case 6:
			
 
				+                return '申请退货中';
			
 
				+            case 7:
			
 
				+                return '退货中';
			
 
				+            case 8:
			
 
				+                return '退货成功';
			
 
				+            case 9:
			
 
				+                return '换货中';
			
 
				+            case 10:
			
 
				+                return '换货完成';
			
 
				+            case 11:
			
 
				+                return '申请换货中';
			
 
				+            default:
			
 
				+                break;
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    function getPostFirm(firmCode){
			
 
				+        switch(firmCode){
			
 
				+            case 'sto':
			
 
				+                return '申通快递';
			
 
				+                break;
			
 
				+            case 'yto':
			
 
				+                return '圆通快递';
			
 
				+                break;
			
 
				+            case 'sf':
			
 
				+                return '顺丰快递';
			
 
				+                break;
			
 
				+            case 'ems':
			
 
				+                return '邮政EMS';
			
 
				+                break;
			
 
				+            case 'zto':
			
 
				+                return '中通快递';
			
 
				+                break;
			
 
				+            case 'zjs':
			
 
				+                return '宅急送';
			
 
				+                break;
			
 
				+            case 'yunda':
			
 
				+                return '韵达快递';
			
 
				+                break;
			
 
				+            case 'cces':
			
 
				+                return 'cces快递';
			
 
				+                break;
			
 
				+            case 'pick':
			
 
				+                return '上门提货';
			
 
				+                break;
			
 
				+            case 'htky':
			
 
				+                return '汇通快递';
			
 
				+                break;
			
 
				+            case 'ttkdex':
			
 
				+                return '天天快递';
			
 
				+                break;
			
 
				+            case 'stars':
			
 
				+                return '星晨急便';
			
 
				+                break;
			
 
				+            case 'jd':
			
 
				+                return '京东快递';
			
 
				+                break;
			
 
				+            case '01':
			
 
				+                return '其他';
			
 
				+                break;
			
 
				+            case '02':
			
 
				+                return '上门送货';
			
 
				+                break;
			
 
				+        }
			
 
				+    }
			
 
				+</script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/my_equipment.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/my_equipment.html
--- a/watero-wechat-web/src/main/webapp/view/rent/renew_logs.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/renew_logs.html
@@ -1,232 +1,229 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>	
			
 
				-			body{ text-align:center} 
			
 
				-			article, section, time, aside {
			
 
				-				display: block;
			
 
				-			}
			
 
				-			.point-time {
			
 
				-				content: "";
			
 
				-				position: absolute;
			
 
				-				width: 13px;
			
 
				-				height: 13px;
			
 
				-				top: 12px;
			
 
				-				left: 30%;
			
 
				-				background: #1c87bf;
			
 
				-				margin-left: -4px;
			
 
				-				border-radius: 50%;
			
 
				-				box-shadow: 0 0 0 2px #fff;
			
 
				-			}
			
 
				-
			
 
				-			.text-red {
			
 
				-				color: #f6393f;
			
 
				-			}
			
 
				-
			
 
				-			.text-blue {
			
 
				-				color: #1c87bf;
			
 
				-			}
			
 
				-
			
 
				-			.text-green {
			
 
				-				color: #95c91e;
			
 
				-			}
			
 
				-
			
 
				-			.text-yellow {
			
 
				-				color: #ffb902;
			
 
				-			}
			
 
				-
			
 
				-			.text-purple {
			
 
				-				color: #d32d93;
			
 
				-			}
			
 
				-
			
 
				-			.point-red {
			
 
				-				background-color: #f6393f;
			
 
				-			}
			
 
				-
			
 
				-			.point-blue {
			
 
				-				background-color: #38d1f7;
			
 
				-			}
			
 
				-
			
 
				-			.point-green {
			
 
				-				background-color: #95c91e;
			
 
				-			}
			
 
				-
			
 
				-			.point-yellow {
			
 
				-				background-color: #ffb902;
			
 
				-			}
			
 
				-
			
 
				-			.point-purple {
			
 
				-				background-color: #d32d93;
			
 
				-			}
			
 
				-
			
 
				-			.content {
			
 
				-				width: 100%;
			
 
				-				margin: 0 auto;
			
 
				-			}
			
 
				-			.content article {
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article > h3 {
			
 
				-				width: 100%;
			
 
				-				height: 20px;
			
 
				-				line-height: 20px;
			
 
				-				text-align: left;
			
 
				-				text-indent: 3%;
			
 
				-				font-size: 1.4em;
			
 
				-				color: #fff;
			
 
				-				padding: 10px 0 20px;
			
 
				-				background-color: #dd6d01;
			
 
				-			}
			
 
				-			.content article section {
			
 
				-				padding: 0 10px 17px;
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article section:before {
			
 
				-				content: "";
			
 
				-				width: 5px;
			
 
				-				top: 17px;
			
 
				-				bottom: -17px;
			
 
				-				left: 30%;
			
 
				-				background: #e6e6e6;
			
 
				-				position: absolute;
			
 
				-				-webkit-transform: scaleX(.5);
			
 
				-			}
			
 
				-			.content article section:last-child:before {
			
 
				-				display: none;
			
 
				-			}
			
 
				-			.content article section time {
			
 
				-				width: 25%;
			
 
				-				display: block;
			
 
				-				position: absolute;
			
 
				-				padding: 8px 0;
			
 
				-			}
			
 
				-			.content article section time > span {
			
 
				-				display: block;
			
 
				-				text-align: center;
			
 
				-			}
			
 
				-			.content article section aside {
			
 
				-				color: #3a3a38;
			
 
				-				margin-left: 42%;
			
 
				-				padding-bottom: 15px;
			
 
				-			}
			
 
				-			.content article section .brief {
			
 
				-				color: #9f9f9f;
			
 
				-			}
			
 
				-					
			
 
				-			.my-box-w{position: absolute;left: 50%;top: 50%;background: rgba(255,255,255,.1);width: 100px;height: 100px;border-radius: 50%;margin-left: -50px;margin-top: -60px;padding: 8px;}
			
 
				-			.my-box-n{background: rgba(255,255,255,.2);position: relative;height: 100%;width: 100%;border-radius: 50%;}
			
 
				-			.my-box-machine{position: absolute;left: 50%;top: 50%;width: auto;color: #fff;-webkit-transform:translateX(-50%) translateY(-20%);}
			
 
				-			.machine-num{position: absolute;left: 50%;top: 50%;margin-top:40px;-webkit-transform: translateX(-50%);color: #fff;}
			
 
				-		</style>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		body{ text-align:center}
			
 
				+		article, section, time, aside {
			
 
				+			display: block;
			
 
				+		}
			
 
				+		.point-time {
			
 
				+			content: "";
			
 
				+			position: absolute;
			
 
				+			width: 13px;
			
 
				+			height: 13px;
			
 
				+			top: 12px;
			
 
				+			left: 30%;
			
 
				+			background: #1c87bf;
			
 
				+			margin-left: -4px;
			
 
				+			border-radius: 50%;
			
 
				+			box-shadow: 0 0 0 2px #fff;
			
 
				+		}
			
 
				+
			
 
				+		.text-red {
			
 
				+			color: #f6393f;
			
 
				+		}
			
 
				+
			
 
				+		.text-blue {
			
 
				+			color: #1c87bf;
			
 
				+		}
			
 
				+
			
 
				+		.text-green {
			
 
				+			color: #95c91e;
			
 
				+		}
			
 
				+
			
 
				+		.text-yellow {
			
 
				+			color: #ffb902;
			
 
				+		}
			
 
				+
			
 
				+		.text-purple {
			
 
				+			color: #d32d93;
			
 
				+		}
			
 
				+
			
 
				+		.point-red {
			
 
				+			background-color: #f6393f;
			
 
				+		}
			
 
				+
			
 
				+		.point-blue {
			
 
				+			background-color: #38d1f7;
			
 
				+		}
			
 
				+
			
 
				+		.point-green {
			
 
				+			background-color: #95c91e;
			
 
				+		}
			
 
				+
			
 
				+		.point-yellow {
			
 
				+			background-color: #ffb902;
			
 
				+		}
			
 
				+
			
 
				+		.point-purple {
			
 
				+			background-color: #d32d93;
			
 
				+		}
			
 
				+
			
 
				+		.content {
			
 
				+			width: 100%;
			
 
				+			margin: 0 auto;
			
 
				+		}
			
 
				+		.content article {
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article > h3 {
			
 
				+			width: 100%;
			
 
				+			height: 20px;
			
 
				+			line-height: 20px;
			
 
				+			text-align: left;
			
 
				+			text-indent: 3%;
			
 
				+			font-size: 1.4em;
			
 
				+			color: #fff;
			
 
				+			padding: 10px 0 20px;
			
 
				+			background-color: #dd6d01;
			
 
				+		}
			
 
				+		.content article section {
			
 
				+			padding: 0 10px 17px;
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article section:before {
			
 
				+			content: "";
			
 
				+			width: 5px;
			
 
				+			top: 17px;
			
 
				+			bottom: -17px;
			
 
				+			left: 30%;
			
 
				+			background: #e6e6e6;
			
 
				+			position: absolute;
			
 
				+			-webkit-transform: scaleX(.5);
			
 
				+		}
			
 
				+		.content article section:last-child:before {
			
 
				+			display: none;
			
 
				+		}
			
 
				+		.content article section time {
			
 
				+			width: 25%;
			
 
				+			display: block;
			
 
				+			position: absolute;
			
 
				+			padding: 8px 0;
			
 
				+		}
			
 
				+		.content article section time > span {
			
 
				+			display: block;
			
 
				+			text-align: center;
			
 
				+		}
			
 
				+		.content article section aside {
			
 
				+			color: #3a3a38;
			
 
				+			margin-left: 42%;
			
 
				+			padding-bottom: 15px;
			
 
				+		}
			
 
				+		.content article section .brief {
			
 
				+			color: #9f9f9f;
			
 
				+		}
			
 
				+
			
 
				+		.my-box-w{position: absolute;left: 50%;top: 50%;background: rgba(255,255,255,.1);width: 100px;height: 100px;border-radius: 50%;margin-left: -50px;margin-top: -60px;padding: 8px;}
			
 
				+		.my-box-n{background: rgba(255,255,255,.2);position: relative;height: 100%;width: 100%;border-radius: 50%;}
			
 
				+		.my-box-machine{position: absolute;left: 50%;top: 50%;width: auto;color: #fff;-webkit-transform:translateX(-50%) translateY(-20%);}
			
 
				+		.machine-num{position: absolute;left: 50%;top: 50%;margin-top:40px;-webkit-transform: translateX(-50%);color: #fff;}
			
 
				+	</style>
			
 
				 	<script>
			
 
				-		// 屏蔽分享
			
 
				-		window.hiddenAllWechatMenu = true;
			
 
				+        // 屏蔽分享
			
 
				+        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> -->
			
 
				-	<div class="mui-content" style="background: #fff;">
			
 
				-		<div style="position: relative;">
			
 
				-		    <img width="100%" src="/watero/wateroimages/shop/renew_bg1.png">
			
 
				-		    <span class="my-box-w">
			
 
				+</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="position: relative;">
			
 
				+		<img width="100%" src="//s.iamberry.com/watero/images/shop/renew_bg1.png">
			
 
				+		<span class="my-box-w">
			
 
				 		    	<div class="my-box-n">
			
 
				 		    		<div class="my-box-machine">
			
 
				 		    			<span class="iconfont icon-shebeiliebiao" style="font-size: 70px;"></span>
			
 
				 		    		</div>
			
 
				 		    	</div>
			
 
				 		    </span>
			
 
				-		    <span class="machine-num" id="equipmentIdId">
			
 
				-		    	
			
 
				+		<span class="machine-num" id="equipmentIdId">
			
 
				+
			
 
				 		    </span>
			
 
				-		</div>
			
 
				-
			
 
				-				<div id="pullrefresh_lease_orderlist" class="content">
			
 
				-					<article class="my-tab-view-pull">
			
 
				-					</article>
			
 
				-				</div>
			
 
				-				<div id="orderlist" class="content" style="display:none;">
			
 
				-					暂无续费记录
			
 
				-				</div>
			
 
				 	</div>
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-<!-- <script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script> -->
			
 
				+
			
 
				+	<div id="pullrefresh_lease_orderlist" class="content">
			
 
				+		<article class="my-tab-view-pull">
			
 
				+		</article>
			
 
				+	</div>
			
 
				+	<div id="orderlist" class="content" style="display:none;">
			
 
				+		暂无续费记录
			
 
				+	</div>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<!-- <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script> -->
			
 
				 <script type="text/javascript">
			
 
				 
			
 
				 
			
 
				-function pullupRefresh() {
			
 
				-	var rechargeMachineId = getParam("machineId");
			
 
				-	$("#equipmentIdId").text("设备编号："+(10000+ parseInt(rechargeMachineId)));
			
 
				-	$.ajax(base_path + '/machine/recharge_list?dates=' + new Date().getTime(), {
			
 
				-		data: {
			
 
				-			"rechargeMachineId": rechargeMachineId
			
 
				-		},
			
 
				-        xhrFields: {
			
 
				-            withCredentials: true
			
 
				-        },
			
 
				-		dataType: 'json',
			
 
				-		type: 'post',
			
 
				-		timeout: 15000,
			
 
				-		success: function(dt) {
			
 
				-			//console.log(dt);	
			
 
				-			 if(dt.status) {
			
 
				-				 var renewal_data = [];
			
 
				-				 renewal_data = dt.data;	
			
 
				-				var table = document.body.querySelector('.my-tab-view-pull');
			
 
				-				mui(renewal_data).each(function(index) {
			
 
				-					var li = document.createElement('section');
			
 
				-					var renewal = this.rechargeTime;
			
 
				-					var dateLength = this.rechargeDuration / 12;
			
 
				-					var rechargeEndTime = this.rechargeEndTime;
			
 
				-					li.innerHTML = ' <span class="point-time point-blue"></span><time>'+format(renewal)+'</time><aside><p class="things">续租时长：'+dateLength+'年</p><p class="brief">续后到期时间：'+format(rechargeEndTime)+'</p></aside>';
			
 
				-					table.appendChild(li);	
			
 
				-					
			
 
				-				})
			
 
				-			}else{
			
 
				-				$("#pullrefresh_lease_orderlist").hide();
			
 
				-				$("#orderlist").show();
			
 
				-			}
			
 
				-		},
			
 
				-		error: function(xhr, type, errorThrown) {
			
 
				-			console.log(xhr)
			
 
				-		}
			
 
				-	})
			
 
				-}
			
 
				-	mui.ready(function(){
			
 
				-		//页面首次加载时拉取一次数据
			
 
				-		pullupRefresh();
			
 
				-	});
			
 
				-	function   format(now)   {     
			
 
				-		now = new Date(now);
			
 
				-	    var   year=now.getFullYear();     
			
 
				-	    var   month=now.getMonth()+1;     
			
 
				-	    var   date=now.getDate();     
			
 
				-	    var   hour=now.getHours();     
			
 
				-	    var   minute=now.getMinutes();     
			
 
				-	    var   second=now.getSeconds(); 
			
 
				-	    if(month <10 && month > 0){
			
 
				-	    	month = "0"+month;
			
 
				-	    }
			
 
				-	    if(date <10 && date > 0){
			
 
				-	    	date = "0"+date;
			
 
				-	    }
			
 
				-	    return   year+"-"+month+"-"+date;     
			
 
				-	 }
			
 
				-	</script>
			
 
				-	</body>
			
 
				+    function pullupRefresh() {
			
 
				+        var rechargeMachineId = getParam("machineId");
			
 
				+        $("#equipmentIdId").text("设备编号："+(10000+ parseInt(rechargeMachineId)));
			
 
				+        mui.ajax(base_path + '/machine/recharge_list?dates=' + new Date().getTime(), {
			
 
				+            data: {
			
 
				+                "rechargeMachineId": rechargeMachineId
			
 
				+            },
			
 
				+            dataType: 'json',
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt);
			
 
				+                if(dt.status) {
			
 
				+                    var renewal_data = [];
			
 
				+                    renewal_data = dt.data;
			
 
				+                    var table = document.body.querySelector('.my-tab-view-pull');
			
 
				+                    mui(renewal_data).each(function(index) {
			
 
				+                        var li = document.createElement('section');
			
 
				+                        var renewal = this.rechargeTime;
			
 
				+                        var dateLength = this.rechargeDuration / 12;
			
 
				+                        var rechargeEndTime = this.rechargeEndTime;
			
 
				+                        li.innerHTML = ' <span class="point-time point-blue"></span><time>'+format(renewal)+'</time><aside><p class="things">续租时长：'+dateLength+'年</p><p class="brief">续后到期时间：'+format(rechargeEndTime)+'</p></aside>';
			
 
				+                        table.appendChild(li);
			
 
				+
			
 
				+                    })
			
 
				+                }else{
			
 
				+                    $("#pullrefresh_lease_orderlist").hide();
			
 
				+                    $("#orderlist").show();
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                console.log(xhr)
			
 
				+            }
			
 
				+        })
			
 
				+    }
			
 
				+    mui.ready(function(){
			
 
				+        //页面首次加载时拉取一次数据
			
 
				+        pullupRefresh();
			
 
				+    });
			
 
				+    function   format(now)   {
			
 
				+        now = new Date(now);
			
 
				+        var   year=now.getFullYear();
			
 
				+        var   month=now.getMonth()+1;
			
 
				+        var   date=now.getDate();
			
 
				+        var   hour=now.getHours();
			
 
				+        var   minute=now.getMinutes();
			
 
				+        var   second=now.getSeconds();
			
 
				+        if(month <10 && month > 0){
			
 
				+            month = "0"+month;
			
 
				+        }
			
 
				+        if(date <10 && date > 0){
			
 
				+            date = "0"+date;
			
 
				+        }
			
 
				+        return   year+"-"+month+"-"+date;
			
 
				+    }
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/rent/try_xieyi.html
+++ b/watero-wechat-web/src/main/webapp/view/rent/try_xieyi.html
@@ -1,40 +1,40 @@
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				-	<head>
			
 
				-		<meta charset="UTF-8">
			
 
				-		<title>租用协议</title>
			
 
				-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.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>
			
 
				+<head>
			
 
				+	<meta charset="UTF-8">
			
 
				+	<title>租用协议</title>
			
 
				+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, 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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.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>
			
 
				 
			
 
				-			<div class="mui-content" style="background: #fff;">
			
 
				-				<img width="100%" src="/watero/wateroimages/shop/xieyi_lease1.jpg" />
			
 
				-			</div>
			
 
				-<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<img width="100%" src="//s.iamberry.com/watero/images/shop/xieyi_lease1.jpg" />
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				 <script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-		//$(".new-time").text(formatDate(new Date()));
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+    mui.ready(function(){
			
 
				+        //$(".new-time").text(formatDate(new Date()));
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				 </script>
			
 
				 </body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/replace_free_filter.html
+++ b/watero-wechat-web/src/main/webapp/view/replace_free_filter.html
@@ -1,232 +1,229 @@
 
				 <!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" href="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/icons-extra.css"/>
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/style.css" />
			
 
				-		<style type="text/css">
			
 
				-			.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;}
			
 
				-			.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;}
			
 
				-    .my-btn-hand{display:block;width: 100%;height: 55px;background-color: #1cc9f4;color: #fff;border: 0;border-radius: 0;}
			
 
				-    .my-btn-hand.active{background-color: #c5c5c5;}
			
 
				-    .cl-blue{color: #1cc9f4;}
			
 
				-    .iconfont{font-size: 20px;}
			
 
				-    .mui-content-madded{background: #fff;padding: 10px;}
			
 
				-    .lease-ul{font-size: 12px;color: #999;}
			
 
				-    .lease-ul li{padding: 5px 0;}
			
 
				-    .lease-left{display: inline-block;width: 25%;}
			
 
				-    .ul_radio{width: 73%;display: inline-block;}
			
 
				-	.ul_radio li{width:100%;height: 55px;margin: 0 1%;border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				-	.radio-cell .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				-	.lease-r-center{position: absolute;left: 70px;top: 20px;}
			
 
				-	.lease-color{padding: 10px 0;float: left;}
			
 
				-	.lease-select-box{padding: 12px 0;position: relative;}
			
 
				-	.lease-select{position: absolute;left: 0;top: 10px;}
			
 
				-	.mui-input-row{font-size: 13px;}
			
 
				-	.mui-input-row input{font-size: 13px;}
			
 
				-	.mui-input-group:before{display: none;}
			
 
				-	.btn-pull-code{position: absolute;right: 10px;top:3px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
			
 
				-	.btn-pull-code .active{background: #c8c8c8;}
			
 
				-	.icon-fuxuankuang a {color: #24cae9;}
			
 
				-	.icon-fuxuankuang{font-size: 13px;padding:5px 5px 5px 22px;}
			
 
				-	.icon-fuxuankuang:before{font-size: 13px;color:#e4004d;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				-	.icon-fuxuankuang.mui-active:before {color: #c8c8c8;}
			
 
				-	#xieyi-dalog{text-decoration:underline}
			
 
				-	.ul_noline{padding-bottom: 60px;}
			
 
				-	.ul_noline:before{display: none;}
			
 
				-	.ul_noline li:after{display: none;}
			
 
				-	.address_ul{color: #999;font-size: 12px;}
			
 
				-	.address_ul li{white-space:nowrap;overflow: hidden;text-overflow: ellipsis;}
			
 
				-	.my-select {border:0!important;color: #999;background-color: #f5f5f5;margin-bottom: 0;padding: 3px 14px;text-align: center;-webkit-appearance: menulist;height: 40px;}
			
 
				-	.my-view1:after,.my-view1 li:after{display: none;}
			
 
				-	.device_num{position: absolute;left: 0;top: 65%;width: 100%;color: #fff;text-align: center;}
			
 
				-	.mui-table-view:after{display: none;}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-            // 屏蔽分享
			
 
				-            window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+<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" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/icons-extra.css"/>
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style type="text/css">
			
 
				+		.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;}
			
 
				+		.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;}
			
 
				+		.my-btn-hand{display:block;width: 100%;height: 55px;background-color: #1cc9f4;color: #fff;border: 0;border-radius: 0;}
			
 
				+		.my-btn-hand.active{background-color: #c5c5c5;}
			
 
				+		.cl-blue{color: #1cc9f4;}
			
 
				+		.iconfont{font-size: 20px;}
			
 
				+		.mui-content-madded{background: #fff;padding: 10px;}
			
 
				+		.lease-ul{font-size: 12px;color: #999;}
			
 
				+		.lease-ul li{padding: 5px 0;}
			
 
				+		.lease-left{display: inline-block;width: 25%;}
			
 
				+		.ul_radio{width: 73%;display: inline-block;}
			
 
				+		.ul_radio li{width:100%;height: 55px;margin: 0 1%;border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
			
 
				+		.radio-cell .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
			
 
				+		.lease-r-center{position: absolute;left: 70px;top: 20px;}
			
 
				+		.lease-color{padding: 10px 0;float: left;}
			
 
				+		.lease-select-box{padding: 12px 0;position: relative;}
			
 
				+		.lease-select{position: absolute;left: 0;top: 10px;}
			
 
				+		.mui-input-row{font-size: 13px;}
			
 
				+		.mui-input-row input{font-size: 13px;}
			
 
				+		.mui-input-group:before{display: none;}
			
 
				+		.btn-pull-code{position: absolute;right: 10px;top:3px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
			
 
				+		.btn-pull-code .active{background: #c8c8c8;}
			
 
				+		.icon-fuxuankuang a {color: #24cae9;}
			
 
				+		.icon-fuxuankuang{font-size: 13px;padding:5px 5px 5px 22px;}
			
 
				+		.icon-fuxuankuang:before{font-size: 13px;color:#e4004d;position: absolute;left: 0;width: 20px;height: 18px;}
			
 
				+		.icon-fuxuankuang.mui-active:before {color: #c8c8c8;}
			
 
				+		#xieyi-dalog{text-decoration:underline}
			
 
				+		.ul_noline{padding-bottom: 60px;}
			
 
				+		.ul_noline:before{display: none;}
			
 
				+		.ul_noline li:after{display: none;}
			
 
				+		.address_ul{color: #999;font-size: 12px;}
			
 
				+		.address_ul li{white-space:nowrap;overflow: hidden;text-overflow: ellipsis;}
			
 
				+		.my-select {border:0!important;color: #999;background-color: #f5f5f5;margin-bottom: 0;padding: 3px 14px;text-align: center;-webkit-appearance: menulist;height: 40px;}
			
 
				+		.my-view1:after,.my-view1 li:after{display: none;}
			
 
				+		.device_num{position: absolute;left: 0;top: 65%;width: 100%;color: #fff;text-align: center;}
			
 
				+		.mui-table-view:after{display: none;}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body style="background-color: #fff;">
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body style="background-color: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content">
			
 
				-			<div style="position: relative;">
			
 
				-				<img src="/watero/wateroimages/shop/renew_bg1.png" width="100%" style="display: block;"/>
			
 
				-				<img src="/watero/wateroimages/shop/my_equipment.png" style="width:25%;left: 38%;top: 15%;position: absolute;"/>
			
 
				-				<div class="device_num">
			
 
				-					<!--no.3456--><span class="my_num"></span>
			
 
				-				<br />
			
 
				-					提示：<span class="lvxin_status"></span>滤芯失效
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			<div style="padding: 0 10px;background: #fff;">
			
 
				-				<ul class="mui-table-view">
			
 
				-					<li class="mui-table-view-cell" style="padding: 11px 0;">
			
 
				-						按机器反馈信息，将为您邮寄:   <span class="device_lvxin"></span>
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				<ul class="lease-ul">
			
 
				-					<li>感谢您的使用！</li>
			
 
				-				</ul>
			
 
				-					
			
 
				-				<ul class="mui-table-view ul_noline">
			
 
				-					<li class="mui-table-view-cell" style="padding: 11px 0 0 0;">
			
 
				-						<span class="iconfont icon-lease2 cl-blue"></span>&nbsp;选择邮寄信息
			
 
				-					</li>
			
 
				-					<li class="mui-table-view-cell"  style="padding: 11px 10px;">
			
 
				-					<a class="mui-navigate-right"  id="open-wechat-addres-a">
			
 
				-						<!--选择收货地址-->
			
 
				-						<ul class="address_ul">
			
 
				-							<li>
			
 
				-								<span class="mui-h5">收货信息: 请选择收货地址</span>
			
 
				-							</li>
			
 
				-							<!--<li>收  货  人：林林</li>
			
 
				-							<li>手 机 号：15999999999</li>
			
 
				-							<li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li>-->
			
 
				-						</ul>
			
 
				-					</a>
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-				</div>
			
 
				-			<div class="buy-footer">
			
 
				-				<button type="button" class="mui-btn my-btn-hand active" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="申请中..." id="btn_submit" disabled="disabled">确认申请</button>
			
 
				-			</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<div style="position: relative;">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/renew_bg1.png" width="100%" style="display: block;"/>
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/my_equipment.png" style="width:25%;left: 38%;top: 15%;position: absolute;"/>
			
 
				+		<div class="device_num">
			
 
				+			<!--no.3456--><span class="my_num"></span>
			
 
				+			<br />
			
 
				+			提示：<span class="lvxin_status"></span>滤芯失效
			
 
				 		</div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-		<script>
			
 
				-            var check = false;
			
 
				-            var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
			
 
				-            var t1=getParam("t1"),t2=getParam("t2"),t3=getParam("t3"),t4=getParam("t4"),deviceId=getParam("deviceId");
			
 
				-			mui.ready(function() {
			
 
				-			    $(".my_num").text("设备编号："+deviceId);
			
 
				-			    var str="";
			
 
				-			    var count=0;
			
 
				-			    if(t1!=1){str+="T1、";count++;}
			
 
				-                if(t2!=1){str+="T2、";count++;}
			
 
				-                if(t3!=1){str+="T3、";count++;}
			
 
				-                if(t4!=1){str+="T4、";count++;}
			
 
				-                console.log(str)
			
 
				-				if(count>1){
			
 
				-                    $(".lvxin_status").text(str);
			
 
				-                    $(".device_lvxin").text(str+"滤芯各一个");
			
 
				-				}else if(count==0){
			
 
				-                    $(".lvxin_status").text("暂无");
			
 
				-                    $(".device_lvxin").text("滤芯0个");
			
 
				-				}else{
			
 
				-                    $(".lvxin_status").text(str);
			
 
				-                    $(".device_lvxin").text(str+"滤芯一个");
			
 
				-				}
			
 
				-				document.querySelector('.loading-bg').style.display = 'none';
			
 
				-			});
			
 
				-            var address='',nickname='',ads_tel='';
			
 
				-            //获取微信共享地址
			
 
				-            mui('body').on('tap', '#open-wechat-addres-a', function() {
			
 
				-                editAddrV1(
			
 
				-                    function(res) {
			
 
				-                        // 用户成功拉出地址
			
 
				-                        address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
			
 
				-                        nickname=res.userName;
			
 
				-                        ads_tel= res.telNumber;
			
 
				-                        wechatAddr.status = true;
			
 
				-                        wechatAddr.detailInfo = address;
			
 
				-                        wechatAddr.postalCode = res.postalCode;
			
 
				-                        wechatAddr.userName = res.userName;
			
 
				-                        wechatAddr.userTel = res.telNumber;
			
 
				-                        wechatAddr.nationalCode = res.nationalCode;
			
 
				-                        $(".address_ul").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人：'+ wechatAddr.userName +'</li><li>手 机 号：' + wechatAddr.userTel + '</li><li>详细地址：'+ wechatAddr.detailInfo+'</li></ul>');
			
 
				+	</div>
			
 
				+	<div style="padding: 0 10px;background: #fff;">
			
 
				+		<ul class="mui-table-view">
			
 
				+			<li class="mui-table-view-cell" style="padding: 11px 0;">
			
 
				+				按机器反馈信息，将为您邮寄:   <span class="device_lvxin"></span>
			
 
				+			</li>
			
 
				+		</ul>
			
 
				+		<ul class="lease-ul">
			
 
				+			<li>感谢您的使用！</li>
			
 
				+		</ul>
			
 
				 
			
 
				-                        if(check){
			
 
				-                            $("#btn_submit").removeClass("active").removeAttr("disabled");
			
 
				-                        }
			
 
				-                    },
			
 
				-                    function() {
			
 
				-                        if($('.address_ul').html() != null && $('.address_ul').html() != '') {
			
 
				-                            wechatAddr.status = true;
			
 
				-                        } else {
			
 
				-                            wechatAddr.status = false;
			
 
				-                            // 用户取消拉出地址
			
 
				-                            $('.address_ul').html('收货地址<span class="mui-h5">请选择收货地址</span>');
			
 
				-                        }
			
 
				-                    }
			
 
				-                );
			
 
				+		<ul class="mui-table-view ul_noline">
			
 
				+			<li class="mui-table-view-cell" style="padding: 11px 0 0 0;">
			
 
				+				<span class="iconfont icon-lease2 cl-blue"></span>&nbsp;选择邮寄信息
			
 
				+			</li>
			
 
				+			<li class="mui-table-view-cell"  style="padding: 11px 10px;">
			
 
				+				<a class="mui-navigate-right"  id="open-wechat-addres-a">
			
 
				+					<!--选择收货地址-->
			
 
				+					<ul class="address_ul">
			
 
				+						<li>
			
 
				+							<span class="mui-h5">收货信息: 请选择收货地址</span>
			
 
				+						</li>
			
 
				+						<!--<li>收  货  人：林林</li>
			
 
				+                        <li>手 机 号：15999999999</li>
			
 
				+                        <li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li>-->
			
 
				+					</ul>
			
 
				+				</a>
			
 
				+			</li>
			
 
				+		</ul>
			
 
				+	</div>
			
 
				+	<div class="buy-footer">
			
 
				+		<button type="button" class="mui-btn my-btn-hand active" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="申请中..." id="btn_submit" disabled="disabled">确认申请</button>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script>
			
 
				+    var check = false;
			
 
				+    var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
			
 
				+    var t1=getParam("t1"),t2=getParam("t2"),t3=getParam("t3"),t4=getParam("t4"),deviceId=getParam("deviceId");
			
 
				+    mui.ready(function() {
			
 
				+        $(".my_num").text("设备编号："+deviceId);
			
 
				+        var str="";
			
 
				+        var count=0;
			
 
				+        if(t1!=1){str+="T1、";count++;}
			
 
				+        if(t2!=1){str+="T2、";count++;}
			
 
				+        if(t3!=1){str+="T3、";count++;}
			
 
				+        if(t4!=1){str+="T4、";count++;}
			
 
				+        console.log(str)
			
 
				+        if(count>1){
			
 
				+            $(".lvxin_status").text(str);
			
 
				+            $(".device_lvxin").text(str+"滤芯各一个");
			
 
				+        }else if(count==0){
			
 
				+            $(".lvxin_status").text("暂无");
			
 
				+            $(".device_lvxin").text("滤芯0个");
			
 
				+        }else{
			
 
				+            $(".lvxin_status").text(str);
			
 
				+            $(".device_lvxin").text(str+"滤芯一个");
			
 
				+        }
			
 
				+        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+    });
			
 
				+    var address='',nickname='',ads_tel='';
			
 
				+    //获取微信共享地址
			
 
				+    mui('body').on('tap', '#open-wechat-addres-a', function() {
			
 
				+        editAddrV1(
			
 
				+            function(res) {
			
 
				+                // 用户成功拉出地址
			
 
				+                address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
			
 
				+                nickname=res.userName;
			
 
				+                ads_tel= res.telNumber;
			
 
				+                wechatAddr.status = true;
			
 
				+                wechatAddr.detailInfo = address;
			
 
				+                wechatAddr.postalCode = res.postalCode;
			
 
				+                wechatAddr.userName = res.userName;
			
 
				+                wechatAddr.userTel = res.telNumber;
			
 
				+                wechatAddr.nationalCode = res.nationalCode;
			
 
				+                $(".address_ul").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人：'+ wechatAddr.userName +'</li><li>手 机 号：' + wechatAddr.userTel + '</li><li>详细地址：'+ wechatAddr.detailInfo+'</li></ul>');
			
 
				 
			
 
				-            });
			
 
				-
			
 
				-            mui('body').on('tap', '#btn_submit', function() {
			
 
				                 if(check){
			
 
				-                    if(isPay) {
			
 
				-                        isPay = false; // 锁定请求按钮
			
 
				-                        mui(this).button('loading');
			
 
				-                        var param = {
			
 
				-                            filterT1:t1,
			
 
				-                            filterT2:t2,
			
 
				-                            filterT3:t3,
			
 
				-                            filterT4:t4,
			
 
				-                            logsMachineDeviceId:deviceId,
			
 
				-                            logsAddressInfo:address,
			
 
				-                            logsAddressTel:ads_tel,
			
 
				-                            logsAddressName:nickname
			
 
				-                        };
			
 
				-                        $.ajax({
			
 
				-                            xhrFields: {
			
 
				-                                withCredentials: true
			
 
				-                            },
			
 
				-                            type: 'post',
			
 
				-                            url: '/watero/wechat/machine/save_change_filter?dates=' + new Date().getTime(),
			
 
				-                            data: param,
			
 
				-                            dataType: 'json',
			
 
				-                            timeout: 15000,
			
 
				-                            success: function(dt) {
			
 
				-                                //console.log(dt);
			
 
				-                                if(dt.isRedirect) {
			
 
				-                                    location.href = dt.redirectURL;
			
 
				-                                }else{
			
 
				-                                    if(dt.status) {
			
 
				-                                                isPay = true;
			
 
				-                                                mui(th).button('reset');
			
 
				-                                                mui.alert("申请成功!");
			
 
				-                                    } else {
			
 
				-                                        mui(th).button('reset');
			
 
				-                                        isPay = true;
			
 
				-                                        mui.alert('申请失败，请稍后重试或联系客服！');
			
 
				-                                    }
			
 
				-                                }
			
 
				-                            },
			
 
				-                            error: function(xhr, type, errorThrown) {
			
 
				-                                //异常处理；
			
 
				-                                console.log(xhr);
			
 
				+                    $("#btn_submit").removeClass("active").removeAttr("disabled");
			
 
				+                }
			
 
				+            },
			
 
				+            function() {
			
 
				+                if($('.address_ul').html() != null && $('.address_ul').html() != '') {
			
 
				+                    wechatAddr.status = true;
			
 
				+                } else {
			
 
				+                    wechatAddr.status = false;
			
 
				+                    // 用户取消拉出地址
			
 
				+                    $('.address_ul').html('收货地址<span class="mui-h5">请选择收货地址</span>');
			
 
				+                }
			
 
				+            }
			
 
				+        );
			
 
				+
			
 
				+    });
			
 
				+
			
 
				+    mui('body').on('tap', '#btn_submit', function() {
			
 
				+        if(check){
			
 
				+            if(isPay) {
			
 
				+                isPay = false; // 锁定请求按钮
			
 
				+                mui(this).button('loading');
			
 
				+                var param = {
			
 
				+                    filterT1:t1,
			
 
				+                    filterT2:t2,
			
 
				+                    filterT3:t3,
			
 
				+                    filterT4:t4,
			
 
				+                    logsMachineDeviceId:deviceId,
			
 
				+                    logsAddressInfo:address,
			
 
				+                    logsAddressTel:ads_tel,
			
 
				+                    logsAddressName:nickname
			
 
				+                };
			
 
				+                $.ajax({
			
 
				+                    type: 'post',
			
 
				+                    url: '/watero/wechat/machine/save_change_filter?dates=' + new Date().getTime(),
			
 
				+                    data: param,
			
 
				+                    dataType: 'json',
			
 
				+                    timeout: 15000,
			
 
				+                    success: function(dt) {
			
 
				+                        //console.log(dt);
			
 
				+                        if(dt.isRedirect) {
			
 
				+                            location.href = dt.redirectURL;
			
 
				+                        }else{
			
 
				+                            if(dt.status) {
			
 
				                                 isPay = true;
			
 
				-                                mui.alert("请检查网络或刷新页面重试！");
			
 
				                                 mui(th).button('reset');
			
 
				+                                mui.alert("申请成功!");
			
 
				+                            } else {
			
 
				+                                mui(th).button('reset');
			
 
				+                                isPay = true;
			
 
				+                                mui.alert('申请失败，请稍后重试或联系客服！');
			
 
				                             }
			
 
				-                        });
			
 
				-                    }else{
			
 
				-                        mui.alert("正在申请中~~请稍后!");
			
 
				-                        return;
			
 
				+                        }
			
 
				+                    },
			
 
				+                    error: function(xhr, type, errorThrown) {
			
 
				+                        //异常处理；
			
 
				+                        console.log(xhr);
			
 
				+                        isPay = true;
			
 
				+                        mui.alert("请检查网络或刷新页面重试！");
			
 
				+                        mui(th).button('reset');
			
 
				                     }
			
 
				-                }else{
			
 
				-                    mui.alert('请选择邮寄地址信息！');
			
 
				-                }
			
 
				-            });
			
 
				-		</script>
			
 
				-	</body>
			
 
				+                });
			
 
				+            }else{
			
 
				+                mui.alert("正在申请中~~请稍后!");
			
 
				+                return;
			
 
				+            }
			
 
				+        }else{
			
 
				+            mui.alert('请选择邮寄地址信息！');
			
 
				+        }
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/replace_free_filter_log.html
+++ b/watero-wechat-web/src/main/webapp/view/replace_free_filter_log.html
@@ -1,285 +1,282 @@
 
				 <!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" href="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/icons-extra.css"/>
			
 
				-		<link rel="stylesheet" href="/watero/waterocss/style.css" />
			
 
				-		<style type="text/css">
			
 
				-			.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;}
			
 
				-    .my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				-    .my-btn-hand.active{background-color: #1cc9f4;}
			
 
				-    .cl-blue{color: #1cc9f4;}
			
 
				-    .iconfont{font-size: 20px;}
			
 
				-    .mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				-    .lease-ul{font-size: 12px;color: #999;}
			
 
				-	.device_num{position: absolute;left: 0;top: 70%;width: 100%;color: #fff;text-align: center;}
			
 
				-    article, section, time, aside {
			
 
				-				display: block;
			
 
				-			}
			
 
				-			.point-time {
			
 
				-				content: "";
			
 
				-				position: absolute;
			
 
				-				width: 12px;
			
 
				-				height: 12px;
			
 
				-				top: 5px;
			
 
				-				left: 28%;
			
 
				-				background: #1c87bf;
			
 
				-				margin-left: -5px;
			
 
				-				border-radius: 50%;
			
 
				-			}
			
 
				+<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" href="//css.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/icons-extra.css"/>
			
 
				+	<link rel="stylesheet" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style type="text/css">
			
 
				+		.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;}
			
 
				+		.my-btn-hand{display:block;width: 100%;height: 55px;background-color: #c5c5c5;color: #fff;border: 0;border-radius: 0;}
			
 
				+		.my-btn-hand.active{background-color: #1cc9f4;}
			
 
				+		.cl-blue{color: #1cc9f4;}
			
 
				+		.iconfont{font-size: 20px;}
			
 
				+		.mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
			
 
				+		.lease-ul{font-size: 12px;color: #999;}
			
 
				+		.device_num{position: absolute;left: 0;top: 70%;width: 100%;color: #fff;text-align: center;}
			
 
				+		article, section, time, aside {
			
 
				+			display: block;
			
 
				+		}
			
 
				+		.point-time {
			
 
				+			content: "";
			
 
				+			position: absolute;
			
 
				+			width: 12px;
			
 
				+			height: 12px;
			
 
				+			top: 5px;
			
 
				+			left: 28%;
			
 
				+			background: #1c87bf;
			
 
				+			margin-left: -5px;
			
 
				+			border-radius: 50%;
			
 
				+		}
			
 
				 
			
 
				-			.text-red {
			
 
				-				color: #f6393f;
			
 
				-			}
			
 
				+		.text-red {
			
 
				+			color: #f6393f;
			
 
				+		}
			
 
				 
			
 
				-			.text-blue {
			
 
				-				color: #1c87bf;
			
 
				-			}
			
 
				-			.point-blue {
			
 
				-				background-color: #1cc9f4;
			
 
				-			}
			
 
				-			.content {
			
 
				-				width: 100%;
			
 
				-				margin: 0 auto;
			
 
				-				padding: 10px 0;
			
 
				-			}
			
 
				-			.content article {
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article > h3 {
			
 
				-				width: 100%;
			
 
				-				height: 20px;
			
 
				-				line-height: 20px;
			
 
				-				text-align: left;
			
 
				-				text-indent: 3%;
			
 
				-				font-size: 1.4em;
			
 
				-				color: #fff;
			
 
				-				padding: 10px 0 20px;
			
 
				-				background-color: #dd6d01;
			
 
				-			}
			
 
				-			.content article section {
			
 
				-				padding: 0 0 17px;
			
 
				-				position: relative;
			
 
				-			}
			
 
				-			.content article section:before {
			
 
				-				content: "";
			
 
				-				width: 2px;
			
 
				-				top: 5px;
			
 
				-				bottom:-30px;
			
 
				-				left: 28%;
			
 
				-				background: #1cc9f4;
			
 
				-				position: absolute;
			
 
				-			}
			
 
				-			.content article section:last-child:before {
			
 
				-				display: none;
			
 
				-			}
			
 
				-			.content article section time {
			
 
				-				width: 25%;
			
 
				-				display: block;
			
 
				-				position: absolute;
			
 
				-			}
			
 
				-			.content article section time > span {
			
 
				-				display: block;
			
 
				-				text-align: center;
			
 
				-				margin-left: 0;
			
 
				-				color: #999;
			
 
				-			}
			
 
				-			.content article section aside {
			
 
				-				color: #3a3a38;
			
 
				-				margin-left: 35%;
			
 
				-				padding-bottom: 15px;
			
 
				-			}
			
 
				-			.content article section .brief {
			
 
				-				color: #9f9f9f;
			
 
				-			}
			
 
				-			.content article section aside .things {
			
 
				-				color: #999;margin-top: 5px;
			
 
				-			}
			
 
				-		</style>
			
 
				-		<script>
			
 
				-            // 屏蔽分享
			
 
				-            window.hiddenAllWechatMenu = true;
			
 
				-		</script>
			
 
				-	</head>
			
 
				+		.text-blue {
			
 
				+			color: #1c87bf;
			
 
				+		}
			
 
				+		.point-blue {
			
 
				+			background-color: #1cc9f4;
			
 
				+		}
			
 
				+		.content {
			
 
				+			width: 100%;
			
 
				+			margin: 0 auto;
			
 
				+			padding: 10px 0;
			
 
				+		}
			
 
				+		.content article {
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article > h3 {
			
 
				+			width: 100%;
			
 
				+			height: 20px;
			
 
				+			line-height: 20px;
			
 
				+			text-align: left;
			
 
				+			text-indent: 3%;
			
 
				+			font-size: 1.4em;
			
 
				+			color: #fff;
			
 
				+			padding: 10px 0 20px;
			
 
				+			background-color: #dd6d01;
			
 
				+		}
			
 
				+		.content article section {
			
 
				+			padding: 0 0 17px;
			
 
				+			position: relative;
			
 
				+		}
			
 
				+		.content article section:before {
			
 
				+			content: "";
			
 
				+			width: 2px;
			
 
				+			top: 5px;
			
 
				+			bottom:-30px;
			
 
				+			left: 28%;
			
 
				+			background: #1cc9f4;
			
 
				+			position: absolute;
			
 
				+		}
			
 
				+		.content article section:last-child:before {
			
 
				+			display: none;
			
 
				+		}
			
 
				+		.content article section time {
			
 
				+			width: 25%;
			
 
				+			display: block;
			
 
				+			position: absolute;
			
 
				+		}
			
 
				+		.content article section time > span {
			
 
				+			display: block;
			
 
				+			text-align: center;
			
 
				+			margin-left: 0;
			
 
				+			color: #999;
			
 
				+		}
			
 
				+		.content article section aside {
			
 
				+			color: #3a3a38;
			
 
				+			margin-left: 35%;
			
 
				+			padding-bottom: 15px;
			
 
				+		}
			
 
				+		.content article section .brief {
			
 
				+			color: #9f9f9f;
			
 
				+		}
			
 
				+		.content article section aside .things {
			
 
				+			color: #999;margin-top: 5px;
			
 
				+		}
			
 
				+	</style>
			
 
				+	<script>
			
 
				+        // 屏蔽分享
			
 
				+        window.hiddenAllWechatMenu = true;
			
 
				+	</script>
			
 
				+</head>
			
 
				 
			
 
				-	<body style="background-color: #fff;">
			
 
				-		<div class="loading-bg">
			
 
				-			<div class="mui-loading">
			
 
				-				<div class="mui-spinner">
			
 
				-				</div>
			
 
				-				&nbsp;&nbsp;加载中...
			
 
				-			</div>
			
 
				+<body style="background-color: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				 		</div>
			
 
				-		<div class="mui-content">
			
 
				-			<div style="position: relative;">
			
 
				-				<img src="/watero/wateroimages/shop/renew_bg1.png" width="100%" style="display: block;"/>
			
 
				-				<img src="/watero/wateroimages/shop/my_equipment.png" style="width:25%;left: 38%;top:20%;position: absolute;"/>
			
 
				-				<div class="device_num">
			
 
				-					<!--no.3456-->
			
 
				-				</div>
			
 
				-			</div>
			
 
				-			
			
 
				-			
			
 
				-				<div class="mui-content-madded">
			
 
				-				
			
 
				-				<div class="content">
			
 
				-					<article>
			
 
				-	<!--					<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>2017-03-12</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									产品：T1x1、T2x1
			
 
				-								</p>
			
 
				-								<p class="things">
			
 
				-									状态：申请中<span class="mui-pull-right cl-blue">取消</span>
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>2017-03-12</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									产品：T1x1、T2x1
			
 
				-								</p>
			
 
				-								<p class="things">
			
 
				-									状态：申请中<span class="mui-pull-right cl-blue">查看物流</span>
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>
			
 
				-						<section>
			
 
				-							<span class="point-time point-blue"></span>
			
 
				-							<time>
			
 
				-								<span>2017-03-12</span>
			
 
				-							</time>
			
 
				-							<aside>
			
 
				-								<p class="things">
			
 
				-									产品：T1x1、T2x1
			
 
				-								</p>
			
 
				-								<p class="things">
			
 
				-									状态：已完成
			
 
				-								</p>
			
 
				-							</aside>
			
 
				-						</section>-->
			
 
				-					</article>
			
 
				-				</div>
			
 
				-			</div>	
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				+	</div>
			
 
				+</div>
			
 
				+<div class="mui-content">
			
 
				+	<div style="position: relative;">
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/renew_bg1.png" width="100%" style="display: block;"/>
			
 
				+		<img src="//s.iamberry.com/watero/images/shop/my_equipment.png" style="width:25%;left: 38%;top:20%;position: absolute;"/>
			
 
				+		<div class="device_num">
			
 
				+			<!--no.3456-->
			
 
				 		</div>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script>
			
 
				-			var deviceId=getParam("deviceId");
			
 
				-			mui.ready(function() {
			
 
				-                $.ajax('/watero/wechat/machine/select_change_filter_list', {
			
 
				-                    data: {
			
 
				-                        deviceId: deviceId
			
 
				-                    },
			
 
				-                    xhrFields: {
			
 
				-                        withCredentials: true
			
 
				-                    },
			
 
				-                    type: 'post',
			
 
				-                    timeout: 15000,
			
 
				-                    success: function(dt) {
			
 
				-						//console.log(dt)
			
 
				-                        if(dt.isRedirect) {
			
 
				-                            location.href = dt.redirectURL;
			
 
				-                        }else{
			
 
				-                            if(dt.status) {
			
 
				-                                $(".device_num").text("设备编号："+dt.data[0].logsMachineDeviceId);
			
 
				-                                var logs_data = [];
			
 
				-                                logs_data = dt.data;
			
 
				-                                var table = $('.content>article');
			
 
				-                                var html_str='';
			
 
				-                                var lvxin='';
			
 
				-                                mui(logs_data).each(function(index) {
			
 
				-                                   // var section = document.createElement('section');
			
 
				+	</div>
			
 
				 
			
 
				-                                    var status='';
			
 
				-                                    var btn_str='<span class="mui-pull-right cl-blue">取消</span>';
			
 
				-                                    switch (this.logsStatus){
			
 
				-                                        case 0:
			
 
				-                                            status='取消';
			
 
				-                                            btn_str='';
			
 
				-                                            break;
			
 
				-                                        case 1:
			
 
				-                                            status='申请中';
			
 
				-                                            break;
			
 
				-                                        case 2:
			
 
				-                                            status='更换中';
			
 
				-                                            break;
			
 
				-                                        case 3:
			
 
				-                                            status='驳回';
			
 
				-                                            btn_str='';
			
 
				-                                            break;
			
 
				-                                        case 4:
			
 
				-                                            status='已发货';
			
 
				-                                            btn_str='<span class="mui-pull-right cl-blue show_post_info" postfirm="' + this.logsPostFirm + '" postnum="' + this.logsPostNum + '" gourl="/watero/view/replace_free_filter_log.html?deviceId="'+deviceId+'">查看物流</span>';
			
 
				-                                            break;
			
 
				-                                        case 5:
			
 
				-                                            status='已完成';
			
 
				-                                            btn_str='';
			
 
				-                                            break;
			
 
				-                                        default:
			
 
				-                                            break;
			
 
				-                                    }
			
 
				-                                    if(index<(logs_data.length-1)){
			
 
				-                                        console.log(logs_data[index+1].logsCreateTime)
			
 
				 
			
 
				-                                        console.log(formatDate(this.logsCreateTime)==formatDate(logs_data[index+1].logsCreateTime) && this.logsStatus==logs_data[index+1].logsStatus)
			
 
				-                                    if(formatDate(this.logsCreateTime)==formatDate(logs_data[index+1].logsCreateTime) && this.logsStatus==logs_data[index+1].logsStatus){
			
 
				-                                        lvxin+='T'+this.logsFilterType+'滤芯 ';
			
 
				-                                        console.log(lvxin)
			
 
				-									}else{
			
 
				-                                        html_str='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：T'+this.logsFilterType+'滤芯 '+lvxin+'</p><p class="things">状态：'+status+btn_str+'</p></aside></section> ';
			
 
				-                                        lvxin='';
			
 
				-                                       // console.log(lvxin)
			
 
				-                                        table.append(html_str);
			
 
				-									}
			
 
				-                                    }else{
			
 
				-                                        html_str='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：'+lvxin+'T'+this.logsFilterType+'滤芯 '+'</p><p class="things">状态：'+status+btn_str+'</p></aside></section> ';
			
 
				-                                        table.append(html_str);
			
 
				-									}
			
 
				-                                    /*section.innerHTML='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：T1x1、T2x1</p><p class="things">状态：'+status+'<span class="mui-pull-right cl-blue">取消</span></p></aside></section>';
			
 
				-                                    table.appendChild(section);*/
			
 
				-								});
			
 
				+	<div class="mui-content-madded">
			
 
				+
			
 
				+		<div class="content">
			
 
				+			<article>
			
 
				+				<!--					<section>
			
 
				+                                        <span class="point-time point-blue"></span>
			
 
				+                                        <time>
			
 
				+                                            <span>2017-03-12</span>
			
 
				+                                        </time>
			
 
				+                                        <aside>
			
 
				+                                            <p class="things">
			
 
				+                                                产品：T1x1、T2x1
			
 
				+                                            </p>
			
 
				+                                            <p class="things">
			
 
				+                                                状态：申请中<span class="mui-pull-right cl-blue">取消</span>
			
 
				+                                            </p>
			
 
				+                                        </aside>
			
 
				+                                    </section>
			
 
				+                                    <section>
			
 
				+                                        <span class="point-time point-blue"></span>
			
 
				+                                        <time>
			
 
				+                                            <span>2017-03-12</span>
			
 
				+                                        </time>
			
 
				+                                        <aside>
			
 
				+                                            <p class="things">
			
 
				+                                                产品：T1x1、T2x1
			
 
				+                                            </p>
			
 
				+                                            <p class="things">
			
 
				+                                                状态：申请中<span class="mui-pull-right cl-blue">查看物流</span>
			
 
				+                                            </p>
			
 
				+                                        </aside>
			
 
				+                                    </section>
			
 
				+                                    <section>
			
 
				+                                        <span class="point-time point-blue"></span>
			
 
				+                                        <time>
			
 
				+                                            <span>2017-03-12</span>
			
 
				+                                        </time>
			
 
				+                                        <aside>
			
 
				+                                            <p class="things">
			
 
				+                                                产品：T1x1、T2x1
			
 
				+                                            </p>
			
 
				+                                            <p class="things">
			
 
				+                                                状态：已完成
			
 
				+                                            </p>
			
 
				+                                        </aside>
			
 
				+                                    </section>-->
			
 
				+			</article>
			
 
				+		</div>
			
 
				+	</div>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+<script>
			
 
				+    var deviceId=getParam("deviceId");
			
 
				+    mui.ready(function() {
			
 
				+        mui.ajax('/watero/wechat/machine/select_change_filter_list', {
			
 
				+            data: {
			
 
				+                deviceId: deviceId
			
 
				+            },
			
 
				+            type: 'post',
			
 
				+            timeout: 15000,
			
 
				+            success: function(dt) {
			
 
				+                //console.log(dt)
			
 
				+                if(dt.isRedirect) {
			
 
				+                    location.href = dt.redirectURL;
			
 
				+                }else{
			
 
				+                    if(dt.status) {
			
 
				+                        $(".device_num").text("设备编号："+dt.data[0].logsMachineDeviceId);
			
 
				+                        var logs_data = [];
			
 
				+                        logs_data = dt.data;
			
 
				+                        var table = $('.content>article');
			
 
				+                        var html_str='';
			
 
				+                        var lvxin='';
			
 
				+                        mui(logs_data).each(function(index) {
			
 
				+                            // var section = document.createElement('section');
			
 
				+
			
 
				+                            var status='';
			
 
				+                            var btn_str='<span class="mui-pull-right cl-blue">取消</span>';
			
 
				+                            switch (this.logsStatus){
			
 
				+                                case 0:
			
 
				+                                    status='取消';
			
 
				+                                    btn_str='';
			
 
				+                                    break;
			
 
				+                                case 1:
			
 
				+                                    status='申请中';
			
 
				+                                    break;
			
 
				+                                case 2:
			
 
				+                                    status='更换中';
			
 
				+                                    break;
			
 
				+                                case 3:
			
 
				+                                    status='驳回';
			
 
				+                                    btn_str='';
			
 
				+                                    break;
			
 
				+                                case 4:
			
 
				+                                    status='已发货';
			
 
				+                                    btn_str='<span class="mui-pull-right cl-blue show_post_info" postfirm="' + this.logsPostFirm + '" postnum="' + this.logsPostNum + '" gourl="/watero/view/replace_free_filter_log.html?deviceId="'+deviceId+'">查看物流</span>';
			
 
				+                                    break;
			
 
				+                                case 5:
			
 
				+                                    status='已完成';
			
 
				+                                    btn_str='';
			
 
				+                                    break;
			
 
				+                                default:
			
 
				+                                    break;
			
 
				+                            }
			
 
				+                            if(index<(logs_data.length-1)){
			
 
				+                                console.log(logs_data[index+1].logsCreateTime)
			
 
				+
			
 
				+                                console.log(formatDate(this.logsCreateTime)==formatDate(logs_data[index+1].logsCreateTime) && this.logsStatus==logs_data[index+1].logsStatus)
			
 
				+                                if(formatDate(this.logsCreateTime)==formatDate(logs_data[index+1].logsCreateTime) && this.logsStatus==logs_data[index+1].logsStatus){
			
 
				+                                    lvxin+='T'+this.logsFilterType+'滤芯 ';
			
 
				+                                    console.log(lvxin)
			
 
				+                                }else{
			
 
				+                                    html_str='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：T'+this.logsFilterType+'滤芯 '+lvxin+'</p><p class="things">状态：'+status+btn_str+'</p></aside></section> ';
			
 
				+                                    lvxin='';
			
 
				+                                    // console.log(lvxin)
			
 
				+                                    table.append(html_str);
			
 
				+                                }
			
 
				+                            }else{
			
 
				+                                html_str='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：'+lvxin+'T'+this.logsFilterType+'滤芯 '+'</p><p class="things">状态：'+status+btn_str+'</p></aside></section> ';
			
 
				+                                table.append(html_str);
			
 
				                             }
			
 
				-                        }
			
 
				-                    },
			
 
				-                    error: function(xhr, type, errorThrown) {
			
 
				-                        console.log(xhr)
			
 
				+							/*section.innerHTML='<section><span class="point-time point-blue"></span><time><span>'+formatDate(this.logsCreateTime)+'</span></time><aside><p class="things">产品：T1x1、T2x1</p><p class="things">状态：'+status+'<span class="mui-pull-right cl-blue">取消</span></p></aside></section>';
			
 
				+							 table.appendChild(section);*/
			
 
				+                        });
			
 
				                     }
			
 
				-                });
			
 
				-				document.querySelector('.loading-bg').style.display = 'none';
			
 
				-			});
			
 
				+                }
			
 
				+            },
			
 
				+            error: function(xhr, type, errorThrown) {
			
 
				+                console.log(xhr)
			
 
				+            }
			
 
				+        });
			
 
				+        document.querySelector('.loading-bg').style.display = 'none';
			
 
				+    });
			
 
				 
			
 
				-            function formatDate(now) {
			
 
				-                now = new Date(now);
			
 
				-                var year = now.getFullYear();
			
 
				-                var month = now.getMonth() + 1;
			
 
				-                var date = now.getDate();
			
 
				-                return year + "-" + month + "-" + date
			
 
				-            };
			
 
				-		</script>
			
 
				-	</body>
			
 
				+    function formatDate(now) {
			
 
				+        now = new Date(now);
			
 
				+        var year = now.getFullYear();
			
 
				+        var month = now.getMonth() + 1;
			
 
				+        var date = now.getDate();
			
 
				+        return year + "-" + month + "-" + date
			
 
				+    };
			
 
				+</script>
			
 
				+</body>
			
 
				 
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/water_competition.html
+++ b/watero-wechat-web/src/main/webapp/view/water_competition.html
@@ -1,95 +1,92 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.my-bar-nav {top: 0;-webkit-box-shadow: 0 0 0 #ccc;box-shadow: 0 0 0 #ccc;background: #fff;}
			
 
				-			.my-bar-nav  .mui-btn-link{color: #1cc9f4;font-size: 14px;}
			
 
				-			
			
 
				-			.my-btn-bluetooth{color: #1cc9f4;padding:2px 18px;font-size: 15px;border-color: #1cc9f4;}
			
 
				-			.my-table-noline:after,.my-table-noline:before,.my-table-noline li:after,.my-table-noline:before{display: none;}
			
 
				-			.mui-btn-link{color: #1cc9f4;}
			
 
				-			.my-btn-water-quality{padding:6px 38px;font-size: 15px;}
			
 
				-			.my-btn-water-quality.active{border: 1px solid rgba(78,215,249,.5);color: #1cc9f4;}
			
 
				-		</style>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script>
			
 
				-            var shareId=getParam("shareId");
			
 
				-            // 屏蔽分享
			
 
				-            //window.hiddenAllWechatMenu = true;
			
 
				-            var url = 'http://'+document.domain+'/watero/view/water_competition.html?shareId='+shareId;
			
 
				-            window.repleFlag = true;
			
 
				-            window.repleWxData = {
			
 
				-                "appId": "",
			
 
				-                "imgUrl": '/watero/images/shop/share-lease.png',
			
 
				-                "link": url,
			
 
				-                "desc": "快来围观吧，美国watero一款可移动的净水机。",
			
 
				-                "title": "净水机可以租啦！",
			
 
				-                "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				-                "shareTimeSuccess": "分享成功",
			
 
				-                "shareTimeCancel": "已取消分享",
			
 
				-                "shareAppSuccess": "分享成功!",
			
 
				-                "shareAppCancel": "已取消分享"
			
 
				-            };
			
 
				-		</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;">
			
 
				-			<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<img id="wechat_tx" src="/watero/wateroimages/shop/image-12.jpg" width="60px"  style="border-radius: 50%;border: 3px solid #afedfc;"/><br/>
			
 
				-					<span class="mui-h6 wechat_name"></span>
			
 
				-					<div><a class="mui-btn mui-btn-link">快来围观吧，我家净水管家，本领强，颜值高！</a></div>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<img src="/watero/wateroimages/shop/my_equipment.png" width="45%" />
			
 
				-				</li>
			
 
				-	
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					总净饮水量：<span class="count_l">0</span> L
			
 
				-					<br/>
			
 
				-					<span class="mui-h6">相当于<span class="tong_l">0</span>桶传统18.9 L的桶装水</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<span class="mui-h5 my_shuizhi">我家水质（tds）：未知</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<img src="/watero/wateroimages/shop/szbp_2wm.png" width="30%" />
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell mui-h6">
			
 
				-					长按识别，马上租用<br/>甚至不要押金哦！
			
 
				-				</li>
			
 
				-			</ul>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.my-bar-nav {top: 0;-webkit-box-shadow: 0 0 0 #ccc;box-shadow: 0 0 0 #ccc;background: #fff;}
			
 
				+		.my-bar-nav  .mui-btn-link{color: #1cc9f4;font-size: 14px;}
			
 
				+
			
 
				+		.my-btn-bluetooth{color: #1cc9f4;padding:2px 18px;font-size: 15px;border-color: #1cc9f4;}
			
 
				+		.my-table-noline:after,.my-table-noline:before,.my-table-noline li:after,.my-table-noline:before{display: none;}
			
 
				+		.mui-btn-link{color: #1cc9f4;}
			
 
				+		.my-btn-water-quality{padding:6px 38px;font-size: 15px;}
			
 
				+		.my-btn-water-quality.active{border: 1px solid rgba(78,215,249,.5);color: #1cc9f4;}
			
 
				+	</style>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+	<script>
			
 
				+        var shareId=getParam("shareId");
			
 
				+        // 屏蔽分享
			
 
				+        //window.hiddenAllWechatMenu = true;
			
 
				+        var url = '//'+document.domain+'/watero/view/water_competition.html?shareId='+shareId;
			
 
				+        window.repleFlag = true;
			
 
				+        window.repleWxData = {
			
 
				+            "appId": "",
			
 
				+            "imgUrl": '//s.iamberry.com/watero/images/shop/share-lease.png',
			
 
				+            "link": url,
			
 
				+            "desc": "快来围观吧，美国watero一款可移动的净水机。",
			
 
				+            "title": "净水机可以租啦！",
			
 
				+            "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
			
 
				+            "shareTimeSuccess": "分享成功",
			
 
				+            "shareTimeCancel": "已取消分享",
			
 
				+            "shareAppSuccess": "分享成功!",
			
 
				+            "shareAppCancel": "已取消分享"
			
 
				+        };
			
 
				+	</script>
			
 
				+</head>
			
 
				+<body style="background: #fff;">
			
 
				+<div class="loading-bg">
			
 
				+	<div class="mui-loading">
			
 
				+		<div class="mui-spinner">
			
 
				+		</div>
			
 
				+		&nbsp;&nbsp;加载中...
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-        $.ajax(base_path + '/machine/selectCompeteWater', {
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<img id="wechat_tx" src="//s.iamberry.com/watero/images/shop/image-12.jpg" width="60px"  style="border-radius: 50%;border: 3px solid #afedfc;"/><br/>
			
 
				+			<span class="mui-h6 wechat_name"></span>
			
 
				+			<div><a class="mui-btn mui-btn-link">快来围观吧，我家净水管家，本领强，颜值高！</a></div>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<img src="//s.iamberry.com/watero/images/shop/my_equipment.png" width="45%" />
			
 
				+		</li>
			
 
				+
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			总净饮水量：<span class="count_l">0</span> L
			
 
				+			<br/>
			
 
				+			<span class="mui-h6">相当于<span class="tong_l">0</span>桶传统18.9 L的桶装水</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<span class="mui-h5 my_shuizhi">我家水质（tds）：未知</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<img src="//s.iamberry.com/watero/images/shop/szbp_2wm.png" width="30%" />
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell mui-h6">
			
 
				+			长按识别，马上租用<br/>甚至不要押金哦！
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        mui.ajax(base_path + '/machine/selectCompeteWater', {
			
 
				             data: {
			
 
				                 shareId: shareId
			
 
				             },
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				-            },
			
 
				             type: 'post',
			
 
				             timeout: 15000,
			
 
				             success: function(dt) {
			
@@ -112,8 +109,8 @@
 
				                 console.log(xhr)
			
 
				             }
			
 
				         });
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				-	</script>
			
 
				-	</body>
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>
			
--- a/watero-wechat-web/src/main/webapp/view/water_competition_for_me.html
+++ b/watero-wechat-web/src/main/webapp/view/water_competition_for_me.html
@@ -1,89 +1,86 @@
 
				 <!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="/watero/waterocss/mui.min.css">
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
			
 
				-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
			
 
				-		<style>
			
 
				-			.my-btn-blue{border: 0 !important;background-color: #1cc9f4 !important;color: #fff;width:150px;}
			
 
				-			.cl-blue{color: #1cc9f4;}
			
 
				-			.iconfont{font-size: 20px;}
			
 
				-			.mui-table-view:before,.mui-table-view:after,.mui-table-view .mui-table-view-cell:after,.mui-table-view .mui-table-view-cell:before{display: none;}
			
 
				-			.mui-backdrop {position: fixed;z-index: 998;top: 0;right: 0;bottom: 0;left: 0;background: url(/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .4);background-size: 100%;}
			
 
				-		</style>
			
 
				-		<script src="/watero/waterojs/mui.min.js"></script>
			
 
				-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
			
 
				-		<script src="/watero/waterojs/shop/main.js"></script>
			
 
				-		<script>
			
 
				-            var deviceId=getParam("deviceId");
			
 
				-            // 屏蔽分享
			
 
				-           // 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>
			
 
				+<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.iamberry.com/watero/css/mui.min.css">
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
			
 
				+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
			
 
				+	<style>
			
 
				+		.my-btn-blue{border: 0 !important;background-color: #1cc9f4 !important;color: #fff;width:150px;}
			
 
				+		.cl-blue{color: #1cc9f4;}
			
 
				+		.iconfont{font-size: 20px;}
			
 
				+		.mui-table-view:before,.mui-table-view:after,.mui-table-view .mui-table-view-cell:after,.mui-table-view .mui-table-view-cell:before{display: none;}
			
 
				+		.mui-backdrop {position: fixed;z-index: 998;top: 0;right: 0;bottom: 0;left: 0;background: url(//s.iamberry.com/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .4);background-size: 100%;}
			
 
				+	</style>
			
 
				+	<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
			
 
				+	<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
			
 
				+	<script>
			
 
				+        var deviceId=getParam("deviceId");
			
 
				+        // 屏蔽分享
			
 
				+        // 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 class="mui-content" style="background: #fff;">
			
 
				-			<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<div><a class="mui-btn mui-btn-link">快来围观吧，我家净水管家，本领强，颜值高！</a></div>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<img src="/watero/wateroimages/shop/my_equipment.png" width="45%" />
			
 
				-				</li>
			
 
				-	
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					总净饮水量：<span class="count_l">0</span>L
			
 
				-					<br/>
			
 
				-					<span class="mui-h6">相当于0桶传统18.9l的桶装水</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<span class="mui-h5 my_shuizhi">我家水质（tds）：未知</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<div>
			
 
				-					<button type="button" class="mui-btn my-btn-blue share_wechat">分享</button>
			
 
				-					</div>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-			<div class="mui-content-padded">
			
 
				-			<ul class="mui-table-view">
			
 
				-				<li class="mui-table-view-cell" style="padding: 11px 0;">
			
 
				-					<span class="iconfont icon-lease cl-blue"></span>&nbsp;TIPS<span class="mui-h6">（仅您可见）</span>
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell mui-h6">
			
 
				-					如果有朋友喜欢，成功租用，我们将赠送您押金提取券、现金、 服务费抵扣券哦！规则如下：<br />
			
 
				-					押金提取券：可提前提取押金（第一位朋友租用）<br />
			
 
				-					现金300元：直接发300元现金（第二位朋友租用）<br />
			
 
				-					现金300元：直接发300元现金（第三位朋友租用）<br />
			
 
				-					服务费抵扣券：400元（第四位朋友租用）
			
 
				-				</li>
			
 
				-				<li class="mui-table-view-cell">
			
 
				-					<span class="mui-pull-right mui-h6">（活动截止时间：20xx年-xx月-xx日）</span>
			
 
				-				</li>
			
 
				-			</ul>
			
 
				+</div>
			
 
				+<div class="mui-content" style="background: #fff;">
			
 
				+	<ul class="mui-table-view mui-text-center my-table-noline">
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<div><a class="mui-btn mui-btn-link">快来围观吧，我家净水管家，本领强，颜值高！</a></div>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<img src="//s.iamberry.com/watero/images/shop/my_equipment.png" width="45%" />
			
 
				+		</li>
			
 
				+
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			总净饮水量：<span class="count_l">0</span>L
			
 
				+			<br/>
			
 
				+			<span class="mui-h6">相当于0桶传统18.9l的桶装水</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<span class="mui-h5 my_shuizhi">我家水质（tds）：未知</span>
			
 
				+		</li>
			
 
				+		<li class="mui-table-view-cell">
			
 
				+			<div>
			
 
				+				<button type="button" class="mui-btn my-btn-blue share_wechat">分享</button>
			
 
				 			</div>
			
 
				+		</li>
			
 
				+	</ul>
			
 
				+	<div class="mui-content-padded">
			
 
				+		<ul class="mui-table-view">
			
 
				+			<li class="mui-table-view-cell" style="padding: 11px 0;">
			
 
				+				<span class="iconfont icon-lease cl-blue"></span>&nbsp;TIPS<span class="mui-h6">（仅您可见）</span>
			
 
				+			</li>
			
 
				+			<li class="mui-table-view-cell mui-h6">
			
 
				+				如果有朋友喜欢，成功租用，我们将赠送您押金提取券、现金、 服务费抵扣券哦！规则如下：<br />
			
 
				+				押金提取券：可提前提取押金（第一位朋友租用）<br />
			
 
				+				现金300元：直接发300元现金（第二位朋友租用）<br />
			
 
				+				现金300元：直接发300元现金（第三位朋友租用）<br />
			
 
				+				服务费抵扣券：400元（第四位朋友租用）
			
 
				+			</li>
			
 
				+			<li class="mui-table-view-cell">
			
 
				+				<span class="mui-pull-right mui-h6">（活动截止时间：20xx年-xx月-xx日）</span>
			
 
				+			</li>
			
 
				+		</ul>
			
 
				 	</div>
			
 
				-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
			
 
				-	<script type="text/javascript">
			
 
				-	mui.ready(function(){
			
 
				-        $.ajax(base_path + '/machine/waterCompete', {
			
 
				+</div>
			
 
				+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
			
 
				+<script type="text/javascript">
			
 
				+    mui.ready(function(){
			
 
				+        mui.ajax(base_path + '/machine/waterCompete', {
			
 
				             data: {
			
 
				                 deviceId: deviceId
			
 
				             },
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				-            },
			
 
				             type: 'post',
			
 
				             timeout: 15000,
			
 
				             success: function(dt) {
			
@@ -102,20 +99,17 @@
 
				                 console.log(xhr)
			
 
				             }
			
 
				         });
			
 
				-		document.querySelector('.loading-bg').style.display='none';
			
 
				-	});
			
 
				+        document.querySelector('.loading-bg').style.display='none';
			
 
				+    });
			
 
				     var mask = mui.createMask(function() {});
			
 
				     mui('body').on('tap', '.share_wechat', function() {
			
 
				         mask.show();
			
 
				         window.hiddenAllWechatMenu = false;
			
 
				 
			
 
				-        $.ajax(base_path + '/machine/addCompetingRecords', {
			
 
				+        mui.ajax(base_path + '/machine/addCompetingRecords', {
			
 
				             data: {
			
 
				                 deviceId: deviceId
			
 
				             },
			
 
				-            xhrFields: {
			
 
				-                withCredentials: true
			
 
				-            },
			
 
				             type: 'post',
			
 
				             timeout: 15000,
			
 
				             success: function(dt) {
			
@@ -125,17 +119,17 @@
 
				                 }else{
			
 
				                     console.log(dt);
			
 
				                     if(dt.status) {
			
 
				-                        var url = 'http://'+document.domain+'/watero/view/water_competition.html?shareId='+dt.data;
			
 
				+                        var url = '//'+document.domain+'/watero/view/water_competition.html?shareId='+dt.data;
			
 
				                         window.wxData = {
			
 
				                             "appId": "", // 服务号可以填写appId
			
 
				-                            "imgUrl":'/watero/images/shop/share-lease.png',
			
 
				+                            "imgUrl":'//s.iamberry.com/watero/images/shop/share-lease.png',
			
 
				                             "link":url,
			
 
				                             "desc":"快来围观吧，美国watero一款可移动的净水机!",
			
 
				                             "title":"净水机可以租啦！"
			
 
				                         };
			
 
				                         window.wxFriend = {
			
 
				                             "appId": "", // 服务号可以填写appId
			
 
				-                            "imgUrl":'/watero/images/shop/share-lease.png',
			
 
				+                            "imgUrl":'//s.iamberry.com/watero/images/shop/share-lease.png',
			
 
				                             "link":url,
			
 
				                             "desc":"快来围观吧，美国watero一款可移动的净水机！",
			
 
				                             "title":"净水机可以租啦！"
			
@@ -150,6 +144,6 @@
 
				             }
			
 
				         });
			
 
				     });
			
 
				-	</script>
			
 
				-	</body>
			
 
				+</script>
			
 
				+</body>
			
 
				 </html>