Forráskód Böngészése

修改了watero页面

liuzhiwei 7 éve
szülő
commit
09fbe1a8a9
76 módosított fájl, 9553 hozzáadás és 9776 törlés
  1. 73 73
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/add_information.html
  2. 65 65
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/cash_log.html
  3. 102 102
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_details.html
  4. 79 79
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html
  5. 90 90
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/clearing.html
  6. 51 51
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon.html
  7. 69 69
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon_list.html
  8. 47 47
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_2wm.html
  9. 61 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_order_list.html
  10. 61 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_rebackOrder_list.html
  11. 74 74
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_2wm.html
  12. 63 63
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_apply_submitSuccess.html
  13. 114 114
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center.html
  14. 124 124
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center2.html
  15. 63 63
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_mendian_next_user_list.html
  16. 50 50
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list.html
  17. 64 64
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list2.html
  18. 61 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_order_list.html
  19. 68 68
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_pay_win.html
  20. 70 70
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_tixian_apply.html
  21. 62 62
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_tixian_log.html
  22. 62 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list.html
  23. 61 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list2.html
  24. 61 61
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_transfer_accounts_list.html
  25. 62 62
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_up.html
  26. 275 281
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_agent_center.html
  27. 158 161
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_exchange_list.html
  28. 60 60
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video.html
  29. 60 60
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video_list.html
  30. 2 2
      watero-wechat-web/src/main/webapp/common/shop/iamberry_video_list.html
  31. 38 50
      watero-wechat-web/src/main/webapp/common/shop/js/page/add_information.js
  32. 266 266
      watero-wechat-web/src/main/webapp/common/shop/js/page/awardRotate.js
  33. 2 5
      watero-wechat-web/src/main/webapp/common/shop/js/page/cash_log.js
  34. 193 205
      watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js
  35. 162 165
      watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_list.js
  36. 542 554
      watero-wechat-web/src/main/webapp/common/shop/js/page/clearing.js
  37. 3 9
      watero-wechat-web/src/main/webapp/common/shop/js/page/coupon.js
  38. 2 6
      watero-wechat-web/src/main/webapp/common/shop/js/page/coupon_list.js
  39. 4 7
      watero-wechat-web/src/main/webapp/common/shop/js/page/daili_2wm.js
  40. 1 4
      watero-wechat-web/src/main/webapp/common/shop/js/page/daili_order_list.js
  41. 1 4
      watero-wechat-web/src/main/webapp/common/shop/js/page/daili_rebackOrder_list.js
  42. 2 5
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_2wm.js
  43. 274 283
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js
  44. 199 208
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js
  45. 3 7
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_mendian_next_user_list.js
  46. 7 12
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list.js
  47. 4 8
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list2.js
  48. 2 6
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_order_list.js
  49. 0 9
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_apply.js
  50. 2 6
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_log.js
  51. 2 6
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list.js
  52. 9 12
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list2.js
  53. 2 6
      watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_transfer_accounts_list.js
  54. 418 417
      watero-wechat-web/src/main/webapp/common/shop/js/page/httphijack1.0.0.js
  55. 2 5
      watero-wechat-web/src/main/webapp/common/shop/js/page/iamberry_video.js
  56. 50 50
      watero-wechat-web/src/main/webapp/view/2017_51.html
  57. 252 258
      watero-wechat-web/src/main/webapp/view/apply_replacement.html
  58. 227 233
      watero-wechat-web/src/main/webapp/view/apply_returns.html
  59. 186 189
      watero-wechat-web/src/main/webapp/view/coupon_bag.html
  60. 108 114
      watero-wechat-web/src/main/webapp/view/deposit_coupon.html
  61. 520 520
      watero-wechat-web/src/main/webapp/view/faq.html
  62. 67 67
      watero-wechat-web/src/main/webapp/view/gift_card_agent_explain.html
  63. 111 114
      watero-wechat-web/src/main/webapp/view/gift_card_agent_xiaxian_list.html
  64. 197 203
      watero-wechat-web/src/main/webapp/view/gift_card_exchange_details.html
  65. 69 69
      watero-wechat-web/src/main/webapp/view/gift_card_exchange_win.html
  66. 236 242
      watero-wechat-web/src/main/webapp/view/gift_card_get_give.html
  67. 161 164
      watero-wechat-web/src/main/webapp/view/gift_card_give_order_list.html
  68. 75 75
      watero-wechat-web/src/main/webapp/view/gift_card_go_agent.html
  69. 470 479
      watero-wechat-web/src/main/webapp/view/gift_card_renew_agent.html
  70. 469 478
      watero-wechat-web/src/main/webapp/view/gift_card_to_agent.html
  71. 263 269
      watero-wechat-web/src/main/webapp/view/gift_card_user_exchange.html
  72. 406 415
      watero-wechat-web/src/main/webapp/view/i_want_lease_pay.html
  73. 393 399
      watero-wechat-web/src/main/webapp/view/i_want_lease_test.html
  74. 346 355
      watero-wechat-web/src/main/webapp/view/i_want_to_renew.html
  75. 74 74
      watero-wechat-web/src/main/webapp/view/product/certificate.html
  76. 421 424
      watero-wechat-web/src/main/webapp/view/rent/i_want_lease.html

+ 73 - 73
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/add_information.html

@@ -1,83 +1,83 @@
 <!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/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/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/add_information.css" />
-		<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;加载中...
+<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/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/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/add_information.css?v=2016101701" />
+	<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 class="mui-content">
-				<!-- 遮罩层 start -->
-				<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
-					<img style="margin-top:40%;margin-left: 5%;" width="90%" src="/watero/wateroimages/shop/place_show_eg.png?v=2016102001" />
-				</div>
-				<!-- 遮罩层end -->
-				
-				<div class="tips more">
-					
-				</div>
-				<div class="tips-title" style="height: 100%;width: 100%;text-align: center;line-height: 31px;"><span>请您完善以下信息,并确保真实!</span><a href="#guize-picture" style="font-size: 14px;">查看示例</a></div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>联系人姓名</label>
-						<input type="text" class="mui-input-clear" placeholder="请输入您的联系人姓名" id="ipt-name" maxlength="10">
-					</div>
-					<div class="mui-input-row">
-						<label>手机号码</label>
-						<input type="tel" class="mui-input-clear" placeholder="请输入您的真实号码" id="ipt-phone" maxlength="12">
-					</div>
-					<div class="mui-input-row">
-						<label style='width:35%'>店铺/代理名称</label>
-						<input style='width:65%' type="text" class="mui-input-clear" placeholder="请输入您的店铺/代理名称" id="ipt-shop-name" maxlength="30">
-					</div>
-					<div class="mui-input-row">
+</div>
+<div class="mui-content">
+	<!-- 遮罩层 start -->
+	<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
+		<img style="margin-top:40%;margin-left: 5%;" width="90%" src="//s.iamberry.com/watero/images/shop/place_show_eg.png?v=2016102001" />
+	</div>
+	<!-- 遮罩层end -->
+
+	<div class="tips more">
+
+	</div>
+	<div class="tips-title" style="height: 100%;width: 100%;text-align: center;line-height: 31px;"><span>请您完善以下信息,并确保真实!</span><a href="#guize-picture" style="font-size: 14px;">查看示例</a></div>
+	<form class="mui-input-group">
+		<div class="mui-input-row">
+			<label>联系人姓名</label>
+			<input type="text" class="mui-input-clear" placeholder="请输入您的联系人姓名" id="ipt-name" maxlength="10">
+		</div>
+		<div class="mui-input-row">
+			<label>手机号码</label>
+			<input type="tel" class="mui-input-clear" placeholder="请输入您的真实号码" id="ipt-phone" maxlength="12">
+		</div>
+		<div class="mui-input-row">
+			<label style='width:35%'>店铺/代理名称</label>
+			<input style='width:65%' type="text" class="mui-input-clear" placeholder="请输入您的店铺/代理名称" id="ipt-shop-name" maxlength="30">
+		</div>
+		<div class="mui-input-row">
 						<span class="my-arrowright">
 								<span class="triangle-down"></span>
 						</span>
-						<label>所在区域</label>
-						<input type="text" readonly="readonly" placeholder="请选择您的所在区域" id='showCityPicker3'>
-					</div>
-					<div class="mui-input-row">
-						<label>详细地址</label>
-						<input type="text" class="mui-input-clear" placeholder="请输入您的详细地址" id="ipt-address" maxlength="30">
-					</div>
-				</form>
-				<br />
-				<div class="mui-content-padded">
-					<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="btn_submit" >提交,进入分销中心>></button>
-				</div>
+			<label>所在区域</label>
+			<input type="text" readonly="readonly" placeholder="请选择您的所在区域" id='showCityPicker3'>
+		</div>
+		<div class="mui-input-row">
+			<label>详细地址</label>
+			<input type="text" class="mui-input-clear" placeholder="请输入您的详细地址" id="ipt-address" maxlength="30">
 		</div>
-	<div id='cityResult3' class="ui-alert"></div>
-	<div id="popover" class="mui-popover">
-		<div class="yes-dalog"><div><div class="content-yes"><span><span class="mui-icon mui-icon-checkmarkempty"></span></span></div><h4>已提交审核!</h4><h5>信息将进入后台审核,请耐心等候</h5><div class="btn-yes">确认</div></div></div>
+	</form>
+	<br />
+	<div class="mui-content-padded">
+		<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="btn_submit" >提交,进入分销中心>></button>
 	</div>
-	<script src="/watero/waterojs/mui.min.js?v=2016101701"></script>
-	<script src="/watero/waterojs/mui.picker.min.js?v=2016101701"></script>
-	<script src="/watero/waterojs/mui.poppicker.js?v=2016101701"></script>
-	<script src="/watero/waterojs/city.data.js?v=2016101701" charset="utf-8"></script>
-	<script src="/watero/waterojs/city.data-3.js?v=2016101701" charset="utf-8"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js?v=2016101701"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/add_information.js?v=2016101200301001sdf"></script>
-	</body>
+</div>
+<div id='cityResult3' class="ui-alert"></div>
+<div id="popover" class="mui-popover">
+	<div class="yes-dalog"><div><div class="content-yes"><span><span class="mui-icon mui-icon-checkmarkempty"></span></span></div><h4>已提交审核!</h4><h5>信息将进入后台审核,请耐心等候</h5><div class="btn-yes">确认</div></div></div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/mui.picker.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/mui.poppicker.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/city.data.js?v=2016101701" charset="utf-8"></script>
+<script src="//s.iamberry.com/watero/js/city.data-3.js?v=2016101701" charset="utf-8"></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/add_information.js?v=2016101200301001sdf"></script>
+</body>
 </html>

+ 65 - 65
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/cash_log.html

@@ -1,71 +1,71 @@
 <!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/cash_log.css" />
-		<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>
+<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/cash_log.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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="cash-header">
-			<div>
-				用户总余额(元)
-				<div class="box-child">
-					<div id="userIncome">0.00</div>
-					<div><span class="my-btn-tx go_tixian_cash">提现</span></div>
-				</div>
-			</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">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		用户总余额(元)
+		<div class="box-child">
+			<div id="userIncome">0.00</div>
+			<div><span class="my-btn-tx go_tixian_cash">提现</span></div>
 		</div>
+	</div>
+</div>
 
-		<!--下拉刷新容器开始-->
-		<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/cash_log.js"></script>
-	</body>
+<!--下拉刷新容器开始-->
+<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?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/cash_log.js?v=2016101701"></script>
+</body>
 </html>

+ 102 - 102
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_details.html

@@ -1,114 +1,114 @@
 <!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/icons-extra.css"/>
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/chanpin_details.css" />
-		<style type="text/css">
-			.chanpin-ditails-dic img{width:100%;height:100%;}
-			.return{position: fixed;
-    right: 30px;
-    bottom: 80px;
-    background: rgba(0,0,0,.2);
-    padding: 12px;
-    border-radius: 50%;
-    text-align: center;
-    opacity: .9;color: #333;display: none;}
-		</style>
-		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></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=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/icons-extra.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/chanpin_details.css?v=2016111701" />
+	<style type="text/css">
+		.chanpin-ditails-dic img{width:100%;height:100%;}
+		.return{position: fixed;
+			right: 30px;
+			bottom: 80px;
+			background: rgba(0,0,0,.2);
+			padding: 12px;
+			border-radius: 50%;
+			text-align: center;
+			opacity: .9;color: #333;display: none;}
+	</style>
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></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>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div id="tabbar-chanpin-details" class="mui-segmented-control">
+		<a class="mui-control-item mui-active" href="#item1">
+			商品信息
+		</a>
+		<!-- 					<a class="mui-control-item" id="click-product-desc" href="#item2">
+                                商品详情
+                            </a> -->
+	</div>
+	<div id="item1" class="mui-control-content mui-active">
+		<div id="detail-slider" class="mui-slider">
+			<!-- 产品轮播图 -->
+			<div class="mui-slider-group mui-slider-loop" id="group-images-div"></div>
+			<!-- 轮播图数量 -->
+			<div class="mui-slider-indicator" id="active-div"></div>
 		</div>
-		<div class="mui-content">
-				<div id="tabbar-chanpin-details" class="mui-segmented-control">
-					<a class="mui-control-item mui-active" href="#item1">
-						商品信息
-					</a>
-<!-- 					<a class="mui-control-item" id="click-product-desc" href="#item2">
-						商品详情
-					</a> -->
-				</div>	
-			<div id="item1" class="mui-control-content mui-active">
-			<div id="detail-slider" class="mui-slider">
-				<!-- 产品轮播图 -->
-				<div class="mui-slider-group mui-slider-loop" id="group-images-div"></div>
-				<!-- 轮播图数量 -->
-				<div class="mui-slider-indicator" id="active-div"></div>
-			</div>
 
-			<div class="food-tt">
-				<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
-				</div>
-				<div class="share_wechat">
-					<span class="iconfont icon-fenxiang ft-18"></span>
-					<div class="ft-12">分享</div>
-				</div>
-			</div>
-			<div class="price-box">
-				<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="del-s" id="product-access-span">1W人已购买</span></div>
-			</div>
-			
-				<div class="chanpin-ditails-dic">
-					<ul>
-						<!-- 产品参数图 -->
-						<li id="product-param-img"></li>    
-					</ul>
-				</div>
-			</div>
-			<!-- 产品图文简介 -->	
-			<div id="item2" class="mui-control-content">
-				<div class="mui-loading">
-						<div class="mui-spinner">
-						</div>
-						&nbsp;&nbsp;加载中...
-				</div>
+		<div class="food-tt">
+			<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
 			</div>
-					
-				
-		<div class="buy-footer" id="add_cart_div_back">
-			<div class="go_index">
-				<img id="add_cart_logo_div" src="/watero/wateroimages/shop/logo.png" />
+			<div class="share_wechat">
+				<span class="iconfont icon-fenxiang ft-18"></span>
+				<div class="ft-12">分享</div>
 			</div>
-			<div id="add-cart-div" >加入购物车</div>
-			<div id="shopp-div" >立即购买</div>
 		</div>
+		<div class="price-box">
+			<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="del-s" id="product-access-span">1W人已购买</span></div>
 		</div>
-		<div class="cart_fixed go_gwc">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">1</span></div>
+
+		<div class="chanpin-ditails-dic">
+			<ul>
+				<!-- 产品参数图 -->
+				<li id="product-param-img"></li>
+			</ul>
+		</div>
+	</div>
+	<!-- 产品图文简介 -->
+	<div id="item2" class="mui-control-content">
+		<div class="mui-loading">
+			<div class="mui-spinner">
+			</div>
+			&nbsp;&nbsp;加载中...
+		</div>
+	</div>
+
+
+	<div class="buy-footer" id="add_cart_div_back">
+		<div class="go_index">
+			<img id="add_cart_logo_div" src="//s.iamberry.com/watero/images/shop/logo.png" />
 		</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/shop/main.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/chanpin_details.js"></script>
-		<script type="text/javascript">
-			var url = window.location.href;
-			if (url.indexOf("isDisplay") != -1)
-			{
-				$("#product-price-span").hide();
-				$("#product-price-s").hide();
-				$("#add-cart-div").hide();
-				$("#shopp-div").hide();
-				$("#add_cart_logo_div").css("width", "30%");
-			}
-		</script>
-	</body>
+		<div id="add-cart-div" >加入购物车</div>
+		<div id="shopp-div" >立即购买</div>
+	</div>
+</div>
+<div class="cart_fixed go_gwc">
+	<div class="iconfont icon-gouwuche"><span class="mui-badge">1</span></div>
+</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?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.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/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/chanpin_details.js?v=2016111701"></script>
+<script type="text/javascript">
+    var url = window.location.href;
+    if (url.indexOf("isDisplay") != -1)
+    {
+        $("#product-price-span").hide();
+        $("#product-price-s").hide();
+        $("#add-cart-div").hide();
+        $("#shopp-div").hide();
+        $("#add_cart_logo_div").css("width", "30%");
+    }
+</script>
+</body>
 </html>

+ 79 - 79
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -1,85 +1,85 @@
 <!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 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>
+<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=2017042701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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>
-		<header class="mui-bar mui-bar-nav header">
-			<div class="go-index go_index">
-				<img src="/watero/wateroimages/shop/logo.png" />
-			</div>
-			<div class="mui-input-row mui-search my-search">
-				<input id="chanpin-search" type="search" class="mui-input-clear" placeholder="">
-			</div>
-			<div class="box-list-card">
-				<span class="iconfont icon-list"></span>
-			</div>
-		</header>
-		<div class="mui-segmented-control tab-with-chanpin-list">
-			<a class="mui-control-item mui-active">
-				<span class="iconfont icon-machine"></span>
-				<span class="mui-tab-label">水机</span>
-			</a>
-			<a class="mui-control-item">
-				<span class="iconfont icon-dingzhi"></span>
-				<span class="mui-tab-label">定制</span>
-			</a>
-			<a class="mui-control-item">
-				<span class="iconfont icon-filter"></span>
-				<span class="mui-tab-label">滤芯</span>
-			</a>
-		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh_chanpin_list" 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>
+<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>
+	<div class="mui-input-row mui-search my-search">
+		<input id="chanpin-search" type="search" class="mui-input-clear" placeholder="">
+	</div>
+	<div class="box-list-card">
+		<span class="iconfont icon-list"></span>
+	</div>
+</header>
+<div class="mui-segmented-control tab-with-chanpin-list">
+	<a class="mui-control-item mui-active">
+		<span class="iconfont icon-machine"></span>
+		<span class="mui-tab-label">水机</span>
+	</a>
+	<a class="mui-control-item">
+		<span class="iconfont icon-dingzhi"></span>
+		<span class="mui-tab-label">定制</span>
+	</a>
+	<a class="mui-control-item">
+		<span class="iconfont icon-filter"></span>
+		<span class="mui-tab-label">配件</span>
+	</a>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh_chanpin_list" 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/validate.js"></script>
-		<script src="/watero/waterojs/shop/chanpin_list.js"></script>
-	</body>
+		</ul>
+	</div>
+</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=2017030601"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/chanpin_list.js?v=2017042701"></script>
+</body>
 </html>

+ 90 - 90
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/clearing.html

@@ -1,97 +1,97 @@
 <!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" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/clearing.css" />
-		<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>
+<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" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/clearing.css?v=2016111701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<ul class="mui-table-view more">
-				<li class="mui-table-view-cell line-color" style="padding:20px 10px;">
-					<div style="display: none;" id="user-address-div"></div>
-					<a class="check_address" id="open-wechat-addres-a">
-						<span>请选择收货地址!</span><span class="mui-icon mui-icon-forward icon-r-c"></span>
-					</a>
-				</li>
-			</ul>
-			<ul class="mui-table-view mui-table-view-chevron" id="products-list-ul">
-				<li class="mui-table-view-cell mui-media" id="load-li">
-					&nbsp;&nbsp;加载产品信息中...
-				</li>
-			</ul>
-			<ul class="mui-table-view my-yhq-tab">
-				<li class="mui-table-view-cell forward">
-					<a href="#forward" class="mui-navigate-right">
-						<div class="mui-media-body">
-							我的优惠券<span class="yhq-right"><span class="cl-red" id="yhq_count">0</span>张可使用</span>
-						</div>
-					</a>
-				</li>
-				<div style="padding: 10px 15px 0 15px;">可用余额:<span class="cl-red" id="used_balance">¥0.00</span></div>
-				<li class="mui-table-view-cell pay_ipt_box" style="padding: 0;">
-					<div class="mui-input-group">
-						<div class="mui-input-row">
-							<label>输入使用金额:</label>
-							<input id="pay_ipt" type="number" placeholder="(如699)">
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell" style="padding: 0;">
-					<div class="mui-input-group">
-						<div class="mui-input-row">
-							<label>订单备注:</label>
-							<input type="text" placeholder="(可选填)" id="textarea">
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell" id="accSub">
-					<div>优惠券:<span class="mui-pull-right cl-red">- ¥<span id="yhq_price">0</span></span></div>
-					<div>账户余额:<span class="mui-pull-right cl-red">- ¥<span id="used_buy">0</span></span></div>
-				</li>
-			</ul>
-			<div class="clearing-count">还需支付:<font class="cl-red">¥</font><span class="cl-red" id="user-pay-money-span">加载中...</span></div>
-			<div class="pay_weixin">
-				<button type="button" class="mui-btn mui-btn-success mui-btn-block btn-weixin-pay" id="btn-weixin-pay">微信支付</button>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<ul class="mui-table-view more">
+		<li class="mui-table-view-cell line-color" style="padding:20px 10px;">
+			<div style="display: none;" id="user-address-div"></div>
+			<a class="check_address" id="open-wechat-addres-a">
+				<span>请选择收货地址!</span><span class="mui-icon mui-icon-forward icon-r-c"></span>
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view mui-table-view-chevron" id="products-list-ul">
+		<li class="mui-table-view-cell mui-media" id="load-li">
+			&nbsp;&nbsp;加载产品信息中...
+		</li>
+	</ul>
+	<ul class="mui-table-view my-yhq-tab">
+		<li class="mui-table-view-cell forward">
+			<a href="#forward" class="mui-navigate-right">
+				<div class="mui-media-body">
+					我的优惠券<span class="yhq-right"><span class="cl-red" id="yhq_count">0</span>张可使用</span>
+				</div>
+			</a>
+		</li>
+		<div style="padding: 10px 15px 0 15px;">可用余额:<span class="cl-red" id="used_balance">¥0.00</span></div>
+		<li class="mui-table-view-cell pay_ipt_box" style="padding: 0;">
+			<div class="mui-input-group">
+				<div class="mui-input-row">
+					<label>输入使用金额:</label>
+					<input id="pay_ipt" type="number" placeholder="(如699)">
+				</div>
 			</div>
-		</div>
-		<div id="forward" class="mui-popover mui-popover-action mui-popover-bottom">
-			<div class="mui-input-group mui-table-view-radio my-popover ">
-				
+		</li>
+		<li class="mui-table-view-cell" style="padding: 0;">
+			<div class="mui-input-group">
+				<div class="mui-input-row">
+					<label>订单备注:</label>
+					<input type="text" placeholder="(可选填)" id="textarea">
+				</div>
 			</div>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<a href="#forward"><b>确定</b></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 src="/watero/waterojs/shop/layer.js"></script>
-		<script src="/watero/waterojs/shop/clearing.js"></script>
-	</body>
+		</li>
+		<li class="mui-table-view-cell" id="accSub">
+			<div>优惠券:<span class="mui-pull-right cl-red">- ¥<span id="yhq_price">0</span></span></div>
+			<div>账户余额:<span class="mui-pull-right cl-red">- ¥<span id="used_buy">0</span></span></div>
+		</li>
+	</ul>
+	<div class="clearing-count">还需支付:<font class="cl-red">¥</font><span class="cl-red" id="user-pay-money-span">加载中...</span></div>
+	<div class="pay_weixin">
+		<button type="button" class="mui-btn mui-btn-success mui-btn-block btn-weixin-pay" id="btn-weixin-pay">微信支付</button>
+	</div>
+</div>
+<div id="forward" class="mui-popover mui-popover-action mui-popover-bottom">
+	<div class="mui-input-group mui-table-view-radio my-popover ">
+
+	</div>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<a href="#forward"><b>确定</b></a>
+		</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=20170622"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js?v=201706001"></script>
+<script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/clearing.js?v=201706001"></script>
+</body>
 </html>

+ 51 - 51
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon.html

@@ -1,56 +1,56 @@
 <!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/coupon.css" />
-		<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>
+<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/coupon.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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">
-		<ul class="mui-table-view my-yhq">
-			
-		</ul>
-		<div class="no_yhq"><img src="/watero/wateroimages/shop/no_yhq.png" /></div>
+		&nbsp;&nbsp;加载中...
 	</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/coupon.js"></script>
-	</body>
+</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-yhq">
+
+	</ul>
+	<div class="no_yhq"><img src="//s.iamberry.com/watero/images/shop/no_yhq.png" /></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/coupon.js?v=2016101701"></script>
+</body>
 </html>

+ 69 - 69
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon_list.html

@@ -1,79 +1,79 @@
 <!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/coupon_list.css" />
-		<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>
+<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/coupon_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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>
+		&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 class="mui-segmented-control tab-yhq-list">
+		<a class="mui-control-item icon-all mui-active" tabindex="1">
+			<span class="mui-icon"></span>
+			<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 class="mui-control-item icon-noused" tabindex="2">
+			<span class="mui-icon"></span>
+			<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 class="mui-control-item icon-used" tabindex="3">
+			<span class="mui-icon"></span>
+			<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 class="mui-control-item icon-overdue" tabindex="4">
+			<span class="mui-icon"></span>
+			<span class="mui-tab-label">过期</span>
 		</a>
-	</nav>
-	<div class="mui-content">
-		<div class="mui-segmented-control tab-yhq-list">
-				<a class="mui-control-item icon-all mui-active" tabindex="1">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">全部</span>
-				</a>
-				<a class="mui-control-item icon-noused" tabindex="2">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">未使用</span>
-				</a>
-				<a class="mui-control-item icon-used" tabindex="3">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">已使用</span>
-				</a>
-				<a class="mui-control-item icon-overdue" tabindex="4">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">过期</span>
-				</a>
-		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="my-yhq-list">
-						
-				</ul>
-			</div>
+	</div>
+	<!--下拉刷新容器-->
+	<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper">
+		<div class="mui-scroll">
+			<!--数据列表-->
+			<ul class="my-yhq-list">
+
+			</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/coupon_list.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=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/coupon_list.js?v=2016101701"></script>
+</body>
 </html>

+ 47 - 47
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_2wm.html

@@ -1,52 +1,52 @@
 <!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/daili_2wm.css" />
-	</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="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/daili_2wm.css?v=2016101701" />
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<div class="user-head-box">
-				<img width="100%" src="/watero/wateroimages/shop/member_photo-bg_3.jpg" />
-				<div id="user-head" class="user-head">
-					<img src="/watero/wateroimages/shop/image-12.jpg" />
-				</div>
-			</div>
-			<div class="mui-content-padded mui-text-center">
-				<span id="user-nickname" class='ft-18'>加载中...</span>
-				<p>无论去哪,什么天气,记得带上自己的阳光</p>
-				
-				<div id="qrcode-div" class="qrcode-div">
-		
-				</div>
-				<ul class="mui-text-left my-ol">
-					<li class='mui-text-center'>
-						<div class='ft-18'>长按二维码关注"watero水时代"</div>
-						<p class="my-p">温馨提醒:该二维码有效期为30天,过期会自动重新生成!</p>
-					</li>
-				</ul>
-				
-				<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger my-btn-block share_wechat">立即分享</button> </div>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div class="user-head-box">
+		<img width="100%" src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg" />
+		<div id="user-head" class="user-head">
+			<img src="//s.iamberry.com/watero/images/shop/image-12.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>
-	<script src="/watero/waterojs/shop/daili_2wm.js"></script>
-	</body>
+	</div>
+	<div class="mui-content-padded mui-text-center">
+		<span id="user-nickname" class='ft-18'>加载中...</span>
+		<p>无论去哪,什么天气,记得带上自己的阳光</p>
+
+		<div id="qrcode-div" class="qrcode-div">
+
+		</div>
+		<ul class="mui-text-left my-ol">
+			<li class='mui-text-center'>
+				<div class='ft-18'>长按二维码关注"watero水时代"</div>
+				<p class="my-p">温馨提醒:该二维码有效期为30天,过期会自动重新生成!</p>
+			</li>
+		</ul>
+
+		<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger my-btn-block share_wechat">立即分享</button> </div>
+	</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/daili_2wm.js?v=2016101701"></script>
+</body>
 </html>

+ 61 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_order_list.html

@@ -1,66 +1,66 @@
 <!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/daili_order_list.css" />
-		<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>
+<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/daili_order_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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="cash-header">
-			<div>
-				<div class="box-child">
-					<div>用户返利记录详情<span class="go_daili_rebackOrder_list my-btn-tx">已返利记录</span></div>
-				</div>
-			</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">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		<div class="box-child">
+			<div>用户返利记录详情<span class="go_daili_rebackOrder_list my-btn-tx">已返利记录</span></div>
 		</div>
-		<!--下拉刷新容器-->
-		<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/daili_order_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器-->
+<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?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/daili_order_list.js?v=2016101701"></script>
+</body>
 </html>

+ 61 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_rebackOrder_list.html

@@ -1,66 +1,66 @@
 <!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/daili_order_list.css" />
-		<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>
+<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/daili_order_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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="cash-header">
-			<div>
-				<div class="box-child">
-					<div>用户待返利记录详情</div>
-				</div>
-			</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">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		<div class="box-child">
+			<div>用户待返利记录详情</div>
 		</div>
-		<!--下拉刷新容器-->
-		<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/daili_rebackOrder_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器-->
+<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?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/daili_rebackOrder_list.js?v=2016101701"></script>
+</body>
 </html>

+ 74 - 74
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_2wm.html

@@ -1,81 +1,81 @@
 <!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 type="text/css">
+<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 type="text/css">
 		html,body{height: 100%;background: #fff;}
-			.mui-content{min-height: 100%;background: #fff;padding-bottom: 50px;}
-			.btn-share-box {width: 55%;}
-			.btn-share-box .my-btn-danger{padding: 10px 0;}
-			#qrcode-div img{width: 60%;}
-			.user-head{position: absolute;left: 50%;bottom:0 ;width:28%;overflow: hidden;border:2px solid #fff;border-radius: 50%;font-size:0px;line-height: 0; -webkit-transform: translateX(-50%);}
-			.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, .4);
-				background-size: 100%;
-			}
-		</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>
+		.mui-content{min-height: 100%;background: #fff;padding-bottom: 50px;}
+		.btn-share-box {width: 55%;}
+		.btn-share-box .my-btn-danger{padding: 10px 0;}
+		#qrcode-div img{width: 60%;}
+		.user-head{position: absolute;left: 50%;bottom:0 ;width:28%;overflow: hidden;border:2px solid #fff;border-radius: 50%;font-size:0px;line-height: 0; -webkit-transform: translateX(-50%);}
+		.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, .4);
+			background-size: 100%;
+		}
+	</style>
+	<script type="text/javascript">
+        // 屏蔽分享
+        //window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</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">
-				<div style="position: relative;padding-bottom:6%;">
-					<img width="100%" src="/watero/wateroimages/shop/member_photo-bg_3.jpg" />
-					<div id="user-head" class="user-head">
-						<img width="100%" style="border-radius: 50%;" src="/watero/wateroimages/shop/image-12.jpg" />
-					</div>
-				</div>
-				<div class="mui-content-padded mui-text-center">
-					<span id="user-nickname">加载中...</span>
-					<p>无论去哪,什么天气,记得带上自己的阳光</p>
-					
-					<div style="padding: 20px 0;" id="qrcode-div">
-						<!-- <img width="40%" src="images/daili-2wm.png" /> -->
-					</div>
-					<ul class="mui-text-left my-ol">
-						<li>
-							<div class="mui-text-center">关注美国watero:
-							<p>
+		&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">
+	<div style="position: relative;padding-bottom:6%;">
+		<img width="100%" src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg" />
+		<div id="user-head" class="user-head">
+			<img width="100%" style="border-radius: 50%;" src="//s.iamberry.com/watero/images/shop/image-12.jpg" />
+		</div>
+	</div>
+	<div class="mui-content-padded mui-text-center">
+		<span id="user-nickname">加载中...</span>
+		<p>无论去哪,什么天气,记得带上自己的阳光</p>
+
+		<div style="padding: 20px 0;" id="qrcode-div">
+			<!-- <img width="40%" src="images/daili-2wm.png" /> -->
+		</div>
+		<ul class="mui-text-left my-ol">
+			<li>
+				<div class="mui-text-center">关注美国watero:
+					<p>
 						小伙伴,扫我扫我!
-						</p>
-							</div>
-						</li>
-					</ul>
-					
-					<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger mui-btn-block share_wechat">分享页面</button> </div>
+					</p>
 				</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/fenxiao_2wm.js"></script>
-	</body>
+			</li>
+		</ul>
+
+		<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger mui-btn-block share_wechat">分享页面</button> </div>
+	</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/fenxiao_2wm.js?v=2016101701"></script>
+</body>
 </html>

+ 63 - 63
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_apply_submitSuccess.html

@@ -1,69 +1,69 @@
 <!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>
+		&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;">
+	<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>
+			<button type="button" class="mui-btn my-btn-green" onclick="returnAgency();">返回代理中心</button>
 		</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;">
-				<div class="pl-win-tt">
-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 分销提现已提交,请等待处理!</span>
-				<div>
-					<button type="button" class="mui-btn my-btn-green" onclick="returnAgency();">返回代理中心</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>
+	</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?v=2016101701"></script>
 	<script>
-		window.onload=function(){
-			getCartNum();
-			document.querySelector('.loading-bg').style.display='none';
-		}
-		function returnAgency() {
-			window.location.href = "/watero/wechat/drp/indexPage";
-		}
+        window.onload=function(){
+            getCartNum();
+            document.querySelector('.loading-bg').style.display='none';
+        }
+        function returnAgency() {
+            window.location.href = "/watero/wechat/drp/indexPage";
+        }
 	</script>
-	</body>
+</body>
 </html>

+ 114 - 114
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center.html

@@ -1,121 +1,121 @@
 <!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/fenxiao_center.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner"></div>
-				&nbsp;&nbsp;加载中...
-		</div>
+<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/fenxiao_center.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>
-	<div class="mui-content">
-		<div class="vip-tt fenxiao_info">
-			<img src="/watero/wateroimages/shop/member_photo-bg_3.jpg">
-			<div class="tx bg-orange">
-				<img class="wechat_tx" src="/watero/wateroimages/shop/image-12.jpg">
-			</div>
-			<div class="nikname">
-				<div class="wechat_name" style="position: relative;"></div>
-				<div>姓名:<span class="user_name"></span></div>
-				<div>身份:<span class="role_name"></span> 
-				</div>
-			</div>
-			<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
+</div>
+<div class="mui-content">
+	<div class="vip-tt fenxiao_info">
+		<img src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg">
+		<div class="tx bg-orange">
+			<img class="wechat_tx" src="//s.iamberry.com/watero/images/shop/image-12.jpg">
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_qrcode.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">分销二维码</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="shareH5();">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">我要分享</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" id="balanceLi">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_balance.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14 total_money">0元</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()" id="waitAccounts">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_bill.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14" id="to_accounts">0元</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<ul class="mui-table-view" id="guanli">
-		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="/watero/wateroimages/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
-		</ul>
-		<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
-			<a class="mui-control-item mui-active">
-					最近7天
-				</a>
-			<a class="mui-control-item">
-					最近半年
-				</a>
-			<a class="mui-control-item">
-					最近1年
-				</a>
-		</div>
-		<div id="item1" class="mui-control-content mui-active more">
-			<div class="chart" id="barChart"></div>
+		<div class="nikname">
+			<div class="wechat_name" style="position: relative;"></div>
+			<div>姓名:<span class="user_name"></span></div>
+			<div>身份:<span class="role_name"></span>
+			</div>
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
-				<a id="user_Management">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_cooperativebusiness.png" />
-					<div class="mui-media-body">
-						<div class="hz_cell my-cell" id = "salesName" value="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
-				<a class="go_publicity"  userType="2" isDrp="true">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_video.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">水机视频</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<br>
+		<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_qrcode.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">分销二维码</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="shareH5();">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">我要分享</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" id="balanceLi">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_balance.png" />
+				<div class="mui-media-body">
+					<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
+					<div class="ft-14 total_money">0元</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()" id="waitAccounts">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_bill.png" />
+				<div class="mui-media-body">
+					<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
+					<div class="ft-14" id="to_accounts">0元</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view" id="guanli">
+		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="//s.iamberry.com/watero/images/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
+	</ul>
+	<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
+		<a class="mui-control-item mui-active">
+			最近7天
+		</a>
+		<a class="mui-control-item">
+			最近半年
+		</a>
+		<a class="mui-control-item">
+			最近1年
+		</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/echarts.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_center.js"></script>
-	</body>
+	<div id="item1" class="mui-control-content mui-active more">
+		<div class="chart" id="barChart"></div>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
+			<a id="user_Management">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_cooperativebusiness.png" />
+				<div class="mui-media-body">
+					<div class="hz_cell my-cell" id = "salesName" value="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
+			<a class="go_publicity"  userType="2" isDrp="true">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_video.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">水机视频</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<br>
+</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/echarts.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_center.js?v=2016102701"></script>
+</body>
 </html>

+ 124 - 124
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center2.html

@@ -1,131 +1,131 @@
 <!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/fenxiao_center.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner"></div>
-				&nbsp;&nbsp;加载中...
-		</div>
+<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/fenxiao_center.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>
-	<div class="mui-content">
-		<div class="vip-tt fenxiao_info">
-			<img src="/watero/wateroimages/shop/member_photo-bg_3.jpg">
-			<div class="tx bg-orange">
-				<img class="wechat_tx" src="/watero/wateroimages/shop/image-12.jpg">
-			</div>
-			<div class="nikname">
-				<div class="wechat_name" style="position: relative;"></div>
-				<div>姓名:<span class="user_name"></span></div>
-				<div>身份:<span class="role_name"></span> 
-				</div>
-			</div>
-			<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
-		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_qrcode.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">分销二维码</div>
-					</div>
-				</a>
-			</li>
-			
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="salesNumbers()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">已销售台数</div>
-					</div>
-				</a>
-			</li> 
-			
-			<!-- <li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">我要分享</div>
-					</div>
-				</a>
-			</li> 
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" >
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_balance.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14 total_money">0元</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_bill.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14" id="to_accounts">0元</div>
-					</div>
-				</a>
-			</li>-->
-		</ul>
-		<ul class="mui-table-view" id="guanli">
-		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="/watero/wateroimages/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
-		</ul>
-		<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
-			<a class="mui-control-item mui-active">
-					最近7天
-				</a>
-			<a class="mui-control-item">
-					最近半年
-				</a>
-			<a class="mui-control-item">
-					最近1年
-				</a>
+</div>
+<div class="mui-content">
+	<div class="vip-tt fenxiao_info">
+		<img src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg">
+		<div class="tx bg-orange">
+			<img class="wechat_tx" src="//s.iamberry.com/watero/images/shop/image-12.jpg">
 		</div>
-		<div id="item1" class="mui-control-content mui-active more">
-			<div class="chart" id="barChart"></div>
+		<div class="nikname">
+			<div class="wechat_name" style="position: relative;"></div>
+			<div>姓名:<span class="user_name"></span></div>
+			<div>身份:<span class="role_name"></span>
+			</div>
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
-				<a id="user_Management">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_cooperativebusiness.png" />
-					<div class="mui-media-body">
-						<div class="hz_cell my-cell">下线 · 销量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
-				<a class="go_publicity"  userType="2" isDrp="true">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_video.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">水机视频</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<br>
+		<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></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/echarts.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_center2.js"></script>
-	</body>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_qrcode.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">分销二维码</div>
+				</div>
+			</a>
+		</li>
+
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="salesNumbers()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">已销售台数</div>
+				</div>
+			</a>
+		</li>
+
+		<!-- <li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share">
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+                <div class="mui-media-body">
+                    <div class="my-cell">我要分享</div>
+                </div>
+            </a>
+        </li> 
+        <li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" >
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_balance.png" />
+                <div class="mui-media-body">
+                    <div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
+                    <div class="ft-14 total_money">0元</div>
+                </div>
+            </a>
+        </li>
+        <li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()">
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_bill.png" />
+                <div class="mui-media-body">
+                    <div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
+                    <div class="ft-14" id="to_accounts">0元</div>
+                </div>
+            </a>
+        </li>-->
+	</ul>
+	<ul class="mui-table-view" id="guanli">
+		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="//s.iamberry.com/watero/images/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
+	</ul>
+	<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
+		<a class="mui-control-item mui-active">
+			最近7天
+		</a>
+		<a class="mui-control-item">
+			最近半年
+		</a>
+		<a class="mui-control-item">
+			最近1年
+		</a>
+	</div>
+	<div id="item1" class="mui-control-content mui-active more">
+		<div class="chart" id="barChart"></div>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
+			<a id="user_Management">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_cooperativebusiness.png" />
+				<div class="mui-media-body">
+					<div class="hz_cell my-cell">下线 · 销量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
+			<a class="go_publicity"  userType="2" isDrp="true">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_video.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">水机视频</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<br>
+</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/echarts.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_center2.js?v=2016102702"></script>
+</body>
 </html>

+ 63 - 63
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_mendian_next_user_list.html

@@ -1,67 +1,67 @@
 <!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-chevron .mui-table-view-cell{padding-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>
+<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-chevron .mui-table-view-cell{padding-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>
-	<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">合作商 <span class="cl-red" id="b_accounts">0</span>个
-				<!-- <span class="mui-pull-right" >总贡献:<span id="accounts">0</span>元</span> -->
-				</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/fenxiao_mendian_next_user_list.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>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
+		<!-- <span class="mui-pull-right" >总贡献:<span id="accounts">0</span>元</span> -->
+	</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="//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/fenxiao_mendian_next_user_list.js?v=2016101701"></script>
+</body>
 </html>

+ 50 - 50
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list.html

@@ -1,55 +1,55 @@
 <!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-chevron .mui-table-view-cell{padding-right:10px;}
-			.mui-bar-tab~.mui-content {margin-top:88px;}
-			.tab-with-user{border-radius: 0; border: 1px solid #e4004d;background-color: #fff;}
-			.mui-segmented-control .mui-control-item.mui-active {color: #fff;background-color: #e4004d;}
-			.tab-with-user .mui-control-item{    color: #e4004d;border-color: #e4004d;border-left: 1px solid #e4004d;}
-			.mui-scroll-wrapper{top:85px;}
-		</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="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-chevron .mui-table-view-cell{padding-right:10px;}
+		.mui-bar-tab~.mui-content {margin-top:88px;}
+		.tab-with-user{border-radius: 0; border: 1px solid #e4004d;background-color: #fff;}
+		.mui-segmented-control .mui-control-item.mui-active {color: #fff;background-color: #e4004d;}
+		.tab-with-user .mui-control-item{    color: #e4004d;border-color: #e4004d;border-left: 1px solid #e4004d;}
+		.mui-scroll-wrapper{top:85px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<ul class="mui-table-view">
-				<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
-				</li>
-		</ul>
-		<div class="mui-segmented-control tab-with-user">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<ul class="mui-table-view">
+	<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
+	</li>
+</ul>
+<div class="mui-segmented-control tab-with-user">
 
-		</div>
-		<!--下拉刷新容器-->
-		<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/fenxiao_next_user_list.js"></script>
-	</body>
+</div>
+<!--下拉刷新容器-->
+<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?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/fenxiao_next_user_list.js?v=2016101701"></script>
+</body>
 </html>

+ 64 - 64
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list2.html

@@ -1,68 +1,68 @@
 <!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-chevron .mui-table-view-cell{padding-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>
+<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-chevron .mui-table-view-cell{padding-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>
-	<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">客户 <span class="cl-red" id="b_accounts">0</span>个
-				<span class="mui-pull-right" id="itemLi">总销售量<span class="cl-red" id="itemSum"></span>台</span>
-				</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/fenxiao_next_user_list2.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>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">客户 <span class="cl-red" id="b_accounts">0</span>个
+		<span class="mui-pull-right" id="itemLi">总销售量<span class="cl-red" id="itemSum"></span>台</span>
+	</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="//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/fenxiao_next_user_list2.js?v=2016101701"></script>
+</body>
 </html>

+ 61 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_order_list.html

@@ -1,69 +1,69 @@
 <!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" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-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">
+	<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" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-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">订单列表 <span class="text-center">可提金额:<span class="cl-red">¥<span class="price_to"></span></span>
+		&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">订单列表 <span class="text-center">可提金额:<span class="cl-red">¥<span class="price_to"></span></span>
 				</span><span class="mui-badge mui-badge-inverted go_fenxiao_tixian_apply">提现>></span></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 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/fenxiao_order_list.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/fenxiao_order_list.js?v=2016101701"></script>
+</body>
 </html>

+ 68 - 68
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_pay_win.html

@@ -1,73 +1,73 @@
 <!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>
-	</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;">
-				<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" id="payMoney">¥0.00元+0.0积分</span></div>
-				</div>
-				<ul class="pay_win_list">
-					<li>订单编号:<span class="cl-0" id="orderId"></span></li>
-					<li>收货人:<span id="userName"></span></li>
-					<li>手机号码:<span id="tel"></span></li>
-					<li>订单金额:<span class="cl-0" id="amount"></span></li>
-					<li>支付方式:在线支付</li>
-					<li>订单时间:<span id="createDate"></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>
+<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>
-	mui.ready(function(){
-		var orderId=getParam("orderId")==""?"1":getParam("orderId");
-		 $.ajax({
-			 "type":"post",
-           "url":base_path+"/placeOrder/successOrder",
-           "dataType":"json",
-           "data" :{
-          	   "openid":"",//"openid":"230"
-          	   "id":orderId
-           },
-           "success" : function(res) {
-               $("#payMoney").text(res.data.yetAmount);
-               $("#orderId").text(res.data.id);
-               $("#userName").text(res.data.contactName);
-               $("#payMoney").text("¥"+accDiv(res.data.yetAmount,100));
-               $("#tel").html(res.data.tel);
-               $("#amount").text("¥"+accDiv(res.data.yetAmount,100));
-               $("#createDate").text(res.data.createDate);
-       		document.querySelector('.loading-bg').style.display='none';
-           }
-		});	
-	});
+        // 屏蔽分享
+        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>
+<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;">
+	<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" id="payMoney">¥0.00元+0.0积分</span></div>
+	</div>
+	<ul class="pay_win_list">
+		<li>订单编号:<span class="cl-0" id="orderId"></span></li>
+		<li>收货人:<span id="userName"></span></li>
+		<li>手机号码:<span id="tel"></span></li>
+		<li>订单金额:<span class="cl-0" id="amount"></span></li>
+		<li>支付方式:在线支付</li>
+		<li>订单时间:<span id="createDate"></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>
+    mui.ready(function(){
+        var orderId=getParam("orderId")==""?"1":getParam("orderId");
+        $.ajax({
+            "type":"post",
+            "url":base_path+"/placeOrder/successOrder",
+            "dataType":"json",
+            "data" :{
+                "openid":"",//"openid":"230"
+                "id":orderId
+            },
+            "success" : function(res) {
+                $("#payMoney").text(res.data.yetAmount);
+                $("#orderId").text(res.data.id);
+                $("#userName").text(res.data.contactName);
+                $("#payMoney").text("¥"+accDiv(res.data.yetAmount,100));
+                $("#tel").html(res.data.tel);
+                $("#amount").text("¥"+accDiv(res.data.yetAmount,100));
+                $("#createDate").text(res.data.createDate);
+                document.querySelector('.loading-bg').style.display='none';
+            }
+        });
+    });
+</script>
+</body>
 </html>

+ 70 - 70
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_tixian_apply.html

@@ -1,80 +1,80 @@
 <!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 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_fenxiao_tixian_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"><span class='cl-red'>温馨提示:</span>提现金额每次不能低于<span class="cl-red" id="lessMoney">100</span>元!每月允许提现<span class="cl-red" id="withdrawalsCount">2</span>次。以每月15日为分界线,在15日之前申请提现的,将会于15-20日到账;若当月15日后申请提现的,将会于下月的15日-20日到账,如遇法定假期将顺延。</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="tel"  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="amount" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link">当前可提现金额:<span class="cl-red" id="allowMoney">0</span>&nbsp;元</span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="tel" id="bankCount" 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="text" id="bankLocal" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link cl-red">本次提现结果,将在提现记录里查看。</span></li>
-				<li style="text-align: center;padding: 10px 0;"><button type="button" class="mui-btn my-btn-green" onclick="submitOrder()"  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/validate.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_tixian_apply.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 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_fenxiao_tixian_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"><span class='cl-red'>温馨提示:</span>提现金额每次不能低于<span class="cl-red" id="lessMoney">100</span>元!每月允许提现<span class="cl-red" id="withdrawalsCount">2</span>次。以每月15日为分界线,在15日之前申请提现的,将会于15-20日到账;若当月15日后申请提现的,将会于下月的15日-20日到账,如遇法定假期将顺延。</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="tel"  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="amount" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link">当前可提现金额:<span class="cl-red" id="allowMoney">0</span>&nbsp;元</span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="tel" id="bankCount" 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="text" id="bankLocal" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link cl-red">本次提现结果,将在提现记录里查看。</span></li>
+		<li style="text-align: center;padding: 10px 0;"><button type="button" class="mui-btn my-btn-green" onclick="submitOrder()"  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/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/fenxiao_tixian_apply.js?v=2016101901"></script>
 </html>

+ 62 - 62
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_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" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-right: 35px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-			.mui-btn-link {position: absolute;left: 50%;top: 5px;-webkit-transform: translateX(-50%);transform: translateX(-50%);}
-		</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?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>
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-right: 35px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+		.mui-btn-link {position: absolute;left: 50%;top: 5px;-webkit-transform: translateX(-50%);transform: translateX(-50%);}
+	</style>
+</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" style="visibility: hidden;">
-			<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">账户余额:<span class="cl-red" id="amount">¥0</span>元<button type="button" class="mui-btn mui-btn-success go_fenxiao_tixian_apply" onclick="getMoney()">我要提现</button></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" style="visibility: hidden;">
+	<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">账户余额:<span class="cl-red" id="amount">¥0</span>元<button type="button" class="mui-btn mui-btn-success go_fenxiao_tixian_apply" onclick="getMoney()">我要提现</button></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/fenxiao_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/fenxiao_tixian_log.js?v=2016101701"></script>
+</body>
 
 </html>

+ 62 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list.html

@@ -1,66 +1,67 @@
 <!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-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</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="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="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-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+		&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">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view 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/fenxiao_to_accounts_list.js"></script>
-	</body>
+	</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/fenxiao_to_accounts_list.js?v=2016101701"></script>
+</body>
 </html>

+ 61 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list2.html

@@ -1,66 +1,66 @@
 <!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-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</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="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-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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">已销售台数:<span class="cl-red" id="accounts">0</span>台 </li>
+		&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">已销售台数:<span class="cl-red" id="accounts">0</span>台 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view 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/fenxiao_to_accounts_list2.js"></script>
-	</body>
+	</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/fenxiao_to_accounts_list2.js?v=2016101701"></script>
+</body>
 </html>

+ 61 - 61
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_transfer_accounts_list.html

@@ -1,66 +1,66 @@
 <!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-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</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="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-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<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">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+		&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">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view 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/fenxiao_to_transfer_accounts_list.js"></script>
-	</body>
+	</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/fenxiao_to_transfer_accounts_list.js?v=2016101701"></script>
+</body>
 </html>

+ 62 - 62
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_up.html

@@ -1,68 +1,68 @@
 <!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/fenxiao_up.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="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/fenxiao_up.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
 <body>
-	<div class="mui-content">
- 		<form id="uploadForm" action="/watero/wechat/placeInfo/sendImg2Share" method="post" enctype="multipart/form-data">
-                    <div class="upload_box">
-                        <div class="upload_main">
-                            <div class="upload_choose">   
-                            </div>
-                            <div id="preview" class="upload_preview">
-                            	 
-                            </div>
-                            <input id="fileImage" type="file" size="30" name="fileselect[]" />
-                        </div>
-                    
-                    <div class="mui-content-padded">
-                    <div class="mui-input-row mui-radio mui-left">
-						<label>选项1</label>
-						<input name="radio1" type="radio" checked="checked">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项2</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项3</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项4</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项5</label>
-						<input name="radio1" type="radio">
-					</div>
-					</div>
-                        <div class="upload_submit">
-                            <button type="button" id="fileSubmit" class="mui-btn upload_submit_btn mui-btn-warning">上传到服务器</button>&nbsp;&nbsp;&nbsp;&nbsp;<button id="i_want_share" type="button" class="mui-btn mui-btn-grey" >我要分享</button>
-                        </div>
-                        <div id="uploadInf" class="upload_inf"></div>
-                    </div>
-	 	</form>
-	 </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/zxxFile.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_up.js"></script>
+<div class="mui-content">
+	<form id="uploadForm" action="/watero/wechat/placeInfo/sendImg2Share" method="post" enctype="multipart/form-data">
+		<div class="upload_box">
+			<div class="upload_main">
+				<div class="upload_choose">
+				</div>
+				<div id="preview" class="upload_preview">
+
+				</div>
+				<input id="fileImage" type="file" size="30" name="fileselect[]" />
+			</div>
+
+			<div class="mui-content-padded">
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项1</label>
+					<input name="radio1" type="radio" checked="checked">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项2</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项3</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项4</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项5</label>
+					<input name="radio1" type="radio">
+				</div>
+			</div>
+			<div class="upload_submit">
+				<button type="button" id="fileSubmit" class="mui-btn upload_submit_btn mui-btn-warning">上传到服务器</button>&nbsp;&nbsp;&nbsp;&nbsp;<button id="i_want_share" type="button" class="mui-btn mui-btn-grey" >我要分享</button>
+			</div>
+			<div id="uploadInf" class="upload_inf"></div>
+		</div>
+	</form>
+</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/zxxFile.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/fenxiao_up.js?v=2016101701"></script>
 </body>
 </html>

+ 275 - 281
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_agent_center.html

@@ -1,16 +1,16 @@
 <!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>
-		.vip-tt {position: relative;width:100%;height:150px;background:url(/watero/images/shop/gift-card-tit-bg3.png) center center /100% 100% no-repeat;}
+<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>
+		.vip-tt {position: relative;width:100%;height:150px;background:url(//s.iamberry.com/watero/images/shop/gift-card-tit-bg3.png) center center /100% 100% no-repeat;}
 		.vip-tt>img {width: 100%;}
 		.tx {position: absolute;left:1em;top: 50%;width: 4.5em;height: 4.5em;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color: #88d9eb;padding: 3px;}
 		.tx>img {width: 100%;border-radius: 50%;}
@@ -19,284 +19,278 @@
 		.nikname>div:first-child{position: relative;width: 100%;overflow: hidden;text-overflow: ellipsis;}
 		.mui-table-view-chevron .mui-badge{display:none;}
 		.btn_share{background: #fff;border-radius:6px;padding:3px 10px;float: right;margin-right: 10px;color: #e9004c;font-size: 13px;}
- .center-middle{font-size: 12px;    position: absolute;
-    left: 90px;
-    top: 50%;
-    -webkit-transform: translateY(-50%);}
-    .my-btn-line{border: 1px solid #fff; background: transparent;color: #fff;padding: 3px 10px;margin-right:8px;}
-    .icon-daifahuo{font-size: 15px;padding-left:30px;}
-    .icon-daifahuo:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-    .my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
-    .mui-table-view.mui-grid-view .mui-table-view-cell {
-    font-size: 17px;
-    display: inline-block;
-    margin-right: -3px;
-    padding: 0 0 0 8px;
-    text-align: center;
-    vertical-align: middle;
-    background: 0 0;
-}
-.mui-table-view.mui-grid-view {
-    font-size: 0;
-    display: block;
-    width: 100%;
-    padding: 0 8px 8px 0;
-    white-space: normal;
-}
-.mui-card-link{color: #70d8eb;}
-.mui-card-link.active{color: #e2e2e2;}
-.mui-card-footer:after{content: '';position: absolute;left: 50%;top: 20%;width: 1px;height: 60%;background: #70D8EB;-webkit-transform: scaleX(.5);}
-.mui-card-footer, .mui-card-header {min-height: 30px;padding: 6px 6px;}
-.mui-card {
-    box-shadow: 0 0 0 rgba(1,1,1,0);
-    border: 1px solid rgba(110,214,235,.5);
-}
-.mui-card{font-size: 12px;}
-.mui-card-footer .mui-card-link, .mui-card-header .mui-card-link {
-    line-height: 34px;
-    height: 34px;
-    }
-.bgcolor-1{height:32vw;background:url(/watero/images/shop/gift-card-list-1.jpg) top center no-repeat;background-size: 100% 100%;}
-.bgcolor-2{height:32vw;background:url(/watero/images/shop/gift-card-list-2.jpg) top center no-repeat;background-size: 100% 100%;}
-.h6-vip{font-size: 12px;color: #F0F0F0;text-align: left;}
-.mui-btn-link{font-size: 12px;color: #fff;position: absolute;right: 10px;bottom: 0;}
-.card-password{padding: 5px 0;
-    font-size: 26px;
-    -webkit-user-select: text;
-    position: absolute;
-    left: 0;
-    width: 100%;
-    top: 50%;-webkit-transform: translateY(-50%);}
-.mui-col-xs-6 .mui-card-header{-webkit-user-select:text !important;}
-.ul-desc{padding:10px 10px 10px 15px;background: #fff;color: #666;font-size: 12px;}
-.icon-gift.active:before{content: '\e71e';}
-.my-card-list{padding:8px 8px 8px 0 !important;}
-.more-view{padding: 0 0 10px 0;}
-.more-view:before,.my-card-list:after{display:none;}
-.mui-icon-info{font-size:20px;}
-.my-select {border: 1px solid #6fd7eb !important;
-    color: #6fd7eb;
-    width: auto;
-    margin-bottom: 0;
-    padding: 3px 4px;
-    text-align: center;
-    position: absolute;
-    -webkit-appearance: menulist;
-    right: 10px;
-    top: 8px;}
-    .time-card{position:absolute;left:10px;bottom:5px;font-size: 14px;}
-    .cl-gray{color:#8794a7;}
-		</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>
+		.center-middle{font-size: 12px;    position: absolute;
+			left: 90px;
+			top: 50%;
+			-webkit-transform: translateY(-50%);}
+		.my-btn-line{border: 1px solid #fff; background: transparent;color: #fff;padding: 3px 10px;margin-right:8px;}
+		.icon-daifahuo{font-size: 15px;padding-left:30px;}
+		.icon-daifahuo:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
+		.mui-table-view.mui-grid-view .mui-table-view-cell {
+			font-size: 17px;
+			display: inline-block;
+			margin-right: -3px;
+			padding: 0 0 0 8px;
+			text-align: center;
+			vertical-align: middle;
+			background: 0 0;
+		}
+		.mui-table-view.mui-grid-view {
+			font-size: 0;
+			display: block;
+			width: 100%;
+			padding: 0 8px 8px 0;
+			white-space: normal;
+		}
+		.mui-card-link{color: #70d8eb;}
+		.mui-card-link.active{color: #e2e2e2;}
+		.mui-card-footer:after{content: '';position: absolute;left: 50%;top: 20%;width: 1px;height: 60%;background: #70D8EB;-webkit-transform: scaleX(.5);}
+		.mui-card-footer, .mui-card-header {min-height: 30px;padding: 6px 6px;}
+		.mui-card {
+			box-shadow: 0 0 0 rgba(1,1,1,0);
+			border: 1px solid rgba(110,214,235,.5);
+		}
+		.mui-card{font-size: 12px;}
+		.mui-card-footer .mui-card-link, .mui-card-header .mui-card-link {
+			line-height: 34px;
+			height: 34px;
+		}
+		.bgcolor-1{height:32vw;background:url(//s.iamberry.com/watero/images/shop/gift-card-list-1.jpg) top center no-repeat;background-size: 100% 100%;}
+		.bgcolor-2{height:32vw;background:url(//s.iamberry.com/watero/images/shop/gift-card-list-2.jpg) top center no-repeat;background-size: 100% 100%;}
+		.h6-vip{font-size: 12px;color: #F0F0F0;text-align: left;}
+		.mui-btn-link{font-size: 12px;color: #fff;position: absolute;right: 10px;bottom: 0;}
+		.card-password{padding: 5px 0;
+			font-size: 26px;
+			-webkit-user-select: text;
+			position: absolute;
+			left: 0;
+			width: 100%;
+			top: 50%;-webkit-transform: translateY(-50%);}
+		.mui-col-xs-6 .mui-card-header{-webkit-user-select:text !important;}
+		.ul-desc{padding:10px 10px 10px 15px;background: #fff;color: #666;font-size: 12px;}
+		.icon-gift.active:before{content: '\e71e';}
+		.my-card-list{padding:8px 8px 8px 0 !important;}
+		.more-view{padding: 0 0 10px 0;}
+		.more-view:before,.my-card-list:after{display:none;}
+		.mui-icon-info{font-size:20px;}
+		.my-select {border: 1px solid #6fd7eb !important;
+			color: #6fd7eb;
+			width: auto;
+			margin-bottom: 0;
+			padding: 3px 4px;
+			text-align: center;
+			position: absolute;
+			-webkit-appearance: menulist;
+			right: 10px;
+			top: 8px;}
+		.time-card{position:absolute;left:10px;bottom:5px;font-size: 14px;}
+		.cl-gray{color:#8794a7;}
+	</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">
-				<div class="vip-tt">
-				<div class="tx bg-orange" id="headDiv">
-					<img src="/watero/wateroimages/image-12.jpg" id="userHead">
-				</div>
-				<div class="nikname">
-					<div>
-						<span id="userNickname">水时代watero</span>&nbsp;&nbsp;&nbsp;&nbsp;<span>代理商<span class="mui-icon mui-icon-info" id="btn_go_explain"></span></span>
-					</div>
-					<div>
-						<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button><button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>
-					</div>
-				</div>
+</div>
+<div class="mui-content">
+	<div class="vip-tt">
+		<div class="tx bg-orange" id="headDiv">
+			<img src="//s.iamberry.com/watero/images/image-12.jpg" id="userHead">
+		</div>
+		<div class="nikname">
+			<div>
+				<span id="userNickname">水时代watero</span>&nbsp;&nbsp;&nbsp;&nbsp;<span>代理商<span class="mui-icon mui-icon-info" id="btn_go_explain"></span></span>
 			</div>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<span class="iconfont icon-daifahuo">提货卡</span><select class="my-select">
-					<option value="4" id="btn-all">全部</option>
-					<option value="1" id="btn-sales">待提货</option>
-					<option value="2" id="btn-waitExchange">已提货</option>
-					<option value="3" id="btn-exchange">已兑现</option>
-				</select>
-				</li>
-			</ul>
-			<ul class="mui-table-view mui-grid-view my-card-list">	
-			</ul>
-			<div class="mui-content-padded">
-				<ul class="mui-pager">
-					<li class="mui-disabled">
-						<!-- <span class="my_prev">上一页 </span> -->
-					</li>
-					<li>
-						<a class="my_next">
-							下一页
-						</a>
-					</li>
-				</ul>
+			<div>
+				<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button><button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>
 			</div>
-<!-- 			<ul class="mui-table-view more-view">
-			<li class="mui-text-center">
-					<span class="iconfont icon-gift" id="gift-more" style="padding: 3px 15px;"></span>
-				</li>
-			</ul> -->
-			<ul class="ul-desc">
-				<li>使用说明:</li>
-				<li>1、提货卡在获取一年后方可兑现,每张提货卡兑现1250元;</li>
-				<li>2、每次销售完8张提货卡以后,系统自动赠送一台净水机。</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">
-	 var pageNumber = 0,pageSize=10;
-	 mui.ready(function(){
-		$.ajax(base_path + '/agent_pay/agent_info?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
+	</div>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-daifahuo">提货卡</span><select class="my-select">
+			<option value="4" id="btn-all">全部</option>
+			<option value="1" id="btn-sales">待提货</option>
+			<option value="2" id="btn-waitExchange">已提货</option>
+			<option value="3" id="btn-exchange">已兑现</option>
+		</select>
+		</li>
+	</ul>
+	<ul class="mui-table-view mui-grid-view my-card-list">
+	</ul>
+	<div class="mui-content-padded">
+		<ul class="mui-pager">
+			<li class="mui-disabled">
+				<!-- <span class="my_prev">上一页 </span> -->
+			</li>
+			<li>
+				<a class="my_next">
+					下一页
+				</a>
+			</li>
+		</ul>
+	</div>
+	<!-- 			<ul class="mui-table-view more-view">
+                <li class="mui-text-center">
+                        <span class="iconfont icon-gift" id="gift-more" style="padding: 3px 15px;"></span>
+                    </li>
+                </ul> -->
+	<ul class="ul-desc">
+		<li>使用说明:</li>
+		<li>1、提货卡在获取一年后方可兑现,每张提货卡兑现1250元;</li>
+		<li>2、每次销售完8张提货卡以后,系统自动赠送一台净水机。</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"></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.ready(function(){
+        mui.ajax(base_path + '/agent_pay/agent_info?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.status){
+                        if(dt.data.agentHead != null && typeof(dt.data.agentHead) != "undefined" && dt.data.agentHead != '') {
+                            $("#userHead").prop('src',dt.data.agentHead);
+                        }
+                        if(dt.data.agentNickname != null && typeof(dt.data.agentNickname) != "undefined" && dt.data.agentNickname != '') {
+                            var name=decodeURI(dt.data.agentNickname);
+                            if(name.length>9){
+                                name=name.substring(0,8)+"..."
+                            }
+                            $("#userNickname").html(name);
+                        }
+                        document.querySelector('.loading-bg').style.display='none';
+                    }else{
+                        mui.alert(dt.message,'',function(){
+                            mui.openWindow({url:'/watero/view/gift_card_to_agent.html'});
+                        });
+                    }
+                }
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-					if(dt.status){
-						if(dt.data.agentHead != null && typeof(dt.data.agentHead) != "undefined" && dt.data.agentHead != '') {
-							$("#userHead").prop('src',dt.data.agentHead);
-						}
-						if(dt.data.agentNickname != null && typeof(dt.data.agentNickname) != "undefined" && dt.data.agentNickname != '') {
-							var name=decodeURI(dt.data.agentNickname);
-							if(name.length>9){
-								name=name.substring(0,8)+"..."
-							}
-							$("#userNickname").html(name);
-						}
-						document.querySelector('.loading-bg').style.display='none';
-					}else{
-						mui.alert(dt.message,'',function(){
-							mui.openWindow({url:'/watero/view/gift_card_to_agent.html'});
-						});
-					}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理;
-				console.log(xhr);
-			}
-		});
-		getGiftList(4);
-		//$(".hide").addClass('mui-hidden');
-	});
-	function getGiftList(obj){
-		
-		++pageNumber;
-		$.ajax(base_path + '/giftCard/card/selectCardList?dates=' + new Date().getTime(), {
-			data: {
-				"status":obj,"pageNO":pageNumber,"pageSize":pageSize
-			},
-            xhrFields: {
-                withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                //异常处理;
+                console.log(xhr);
+            }
+        });
+        getGiftList(4);
+        //$(".hide").addClass('mui-hidden');
+    });
+    function getGiftList(obj){
+
+        ++pageNumber;
+        mui.ajax(base_path + '/giftCard/card/selectCardList?dates=' + new Date().getTime(), {
+            data: {
+                "status":obj,"pageNO":pageNumber,"pageSize":pageSize
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				console.log(dt)
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-					if(dt.status) {
-						var table = document.body.querySelector('.my-card-list');
-						//table.innerHTML='';
-						var gift_data = [];
-						gift_data = dt.data.list;
-						$("#btn-all").text("全部"+dt.data.count+"张");
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                console.log(dt)
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.status) {
+                        var table = document.body.querySelector('.my-card-list');
+                        //table.innerHTML='';
+                        var gift_data = [];
+                        gift_data = dt.data.list;
+                        $("#btn-all").text("全部"+dt.data.count+"张");
                         $("#btn-sales").text("待提货"+dt.data.salesNum+"张");
                         $("#btn-waitExchange").text("已提货"+dt.data.waitExchangeNum+"张");
                         $("#btn-exchange").text("已兑现"+dt.data.exchangeNum+"张");
 
-						mui(gift_data).each(function(index) {
-							var status='',salesStatus='',cl='',ft_cl='';
-							if (this.cardStatus == 2) {
-								status='已提货';cl='bgcolor-2';ft_cl='cl-gray';
-							} else if (this.cardStatus == 1) {
-								status='待提货';cl='bgcolor-1';
-							} else if (this.cardStatus == 3){
-								status='已兑';cl='bgcolor-2';ft_cl='cl-gray';
-							}
-						/* if(this.cardSalesStatus==1 || (this.cardSalesStatus==2 && this.cardStatus == 3)){
-							salesStatus='<a class="mui-card-link btn-details" name="'+this.cardPassword+'" id="'+this.cardId+'">查看详情</a>';
-						} else if (this.cardSalesStatus==2 && this.cardStatus == 1) {
-							salesStatus='<a class="mui-card-link myactive"  name="'+this.cardPassword+'" id="'+this.cardId+'">待售/赠</a>';
-						} */
-						var li = document.createElement('li');
-						li.className = 'mui-table-view-cell mui-media mui-col-xs-12 btn-details';
-						li.setAttribute('name',this.cardPassword);
-						li.setAttribute('id',this.cardId);
-						li.innerHTML = '<div class="mui-card"><div class="mui-card-header mui-card-media '+cl+'"><div class="ft-12 mui-text-left"></div><div class="card-password '+ft_cl+'" name="'+this.cardPassword+'">'+this.cardPassword+'</div><span class="time-card">'+formatDate(this.cardCreateDate)+'</span><a class="mui-btn-link my-link">'+status+'</a></div></div>';
-						table.appendChild(li);
-						});
-					} else {
-						mui.alert(dt.message);
-					}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理;
-				console.log(xhr);
-			}
-		});
-	}
-	$(document).on('tap', '.my_next', function() {
-		getGiftList($(".my-select").find("option:selected").val());
-	});
-	mui('body').on('tap', '#btn_go_explain', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_agent_explain.html'
-		});
-	});
-	mui('body').on('tap', '#my-zeng', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_give_order_list.html'
-		});
-	});
-	mui('body').on('tap', '#my-xiaxian', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_renew_agent.html'
-		});
-	});
-	mui('body').on('tap', '#gift-more', function() {
-		getGiftList();
-	});
-/* 	$(document).on('tap', '.see', function() {
-		if($(this).hasClass('icon-biyan')){
-			$(this).parent().next().text($(this).parent().next().attr('name'));
-			$(this).removeClass('icon-biyan').addClass('icon-yanjing');
-		}else{
-			$(this).removeClass('icon-yanjing').addClass('icon-biyan');
-			$(this).parent().next().prop('name',$(this).parent().next().text());
-			$(this).parent().next().text("*******");
-		}
-	}); */
-	$(document).on('change', '.my-select', function() {
-		$(".my-card-list").empty();
-		pageNumber=0;
-		getGiftList($(this).val());
-	});
-	mui('body').on('tap', '.btn-details', function() {
-		var th=this;
-		mui.openWindow({
-			url: '/watero/view/gift_card_exchange_details.html?name='+th.getAttribute("id")+'&psw='+th.getAttribute("name")
-		});
-	});
-	</script>
-	</body>
+                        mui(gift_data).each(function(index) {
+                            var status='',salesStatus='',cl='',ft_cl='';
+                            if (this.cardStatus == 2) {
+                                status='已提货';cl='bgcolor-2';ft_cl='cl-gray';
+                            } else if (this.cardStatus == 1) {
+                                status='待提货';cl='bgcolor-1';
+                            } else if (this.cardStatus == 3){
+                                status='已兑';cl='bgcolor-2';ft_cl='cl-gray';
+                            }
+							/* if(this.cardSalesStatus==1 || (this.cardSalesStatus==2 && this.cardStatus == 3)){
+							 salesStatus='<a class="mui-card-link btn-details" name="'+this.cardPassword+'" id="'+this.cardId+'">查看详情</a>';
+							 } else if (this.cardSalesStatus==2 && this.cardStatus == 1) {
+							 salesStatus='<a class="mui-card-link myactive"  name="'+this.cardPassword+'" id="'+this.cardId+'">待售/赠</a>';
+							 } */
+                            var li = document.createElement('li');
+                            li.className = 'mui-table-view-cell mui-media mui-col-xs-12 btn-details';
+                            li.setAttribute('name',this.cardPassword);
+                            li.setAttribute('id',this.cardId);
+                            li.innerHTML = '<div class="mui-card"><div class="mui-card-header mui-card-media '+cl+'"><div class="ft-12 mui-text-left"></div><div class="card-password '+ft_cl+'" name="'+this.cardPassword+'">'+this.cardPassword+'</div><span class="time-card">'+formatDate(this.cardCreateDate)+'</span><a class="mui-btn-link my-link">'+status+'</a></div></div>';
+                            table.appendChild(li);
+                        });
+                    } else {
+                        mui.alert(dt.message);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                //异常处理;
+                console.log(xhr);
+            }
+        });
+    }
+    $(document).on('tap', '.my_next', function() {
+        getGiftList($(".my-select").find("option:selected").val());
+    });
+    mui('body').on('tap', '#btn_go_explain', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_agent_explain.html'
+        });
+    });
+    mui('body').on('tap', '#my-zeng', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_give_order_list.html'
+        });
+    });
+    mui('body').on('tap', '#my-xiaxian', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_renew_agent.html'
+        });
+    });
+    mui('body').on('tap', '#gift-more', function() {
+        getGiftList();
+    });
+	/* 	$(document).on('tap', '.see', function() {
+	 if($(this).hasClass('icon-biyan')){
+	 $(this).parent().next().text($(this).parent().next().attr('name'));
+	 $(this).removeClass('icon-biyan').addClass('icon-yanjing');
+	 }else{
+	 $(this).removeClass('icon-yanjing').addClass('icon-biyan');
+	 $(this).parent().next().prop('name',$(this).parent().next().text());
+	 $(this).parent().next().text("*******");
+	 }
+	 }); */
+    $(document).on('change', '.my-select', function() {
+        $(".my-card-list").empty();
+        pageNumber=0;
+        getGiftList($(this).val());
+    });
+    mui('body').on('tap', '.btn-details', function() {
+        var th=this;
+        mui.openWindow({
+            url: '/watero/view/gift_card_exchange_details.html?name='+th.getAttribute("id")+'&psw='+th.getAttribute("name")
+        });
+    });
+</script>
+</body>
 </html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 158 - 161
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_exchange_list.html


+ 60 - 60
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video.html

@@ -1,66 +1,66 @@
 <!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 type="text/css">
+<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 type="text/css">
 		.my_iframe{width:100%;min-height: 250px;}
-		</style>
-	</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">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-	<div class="mui-content">
-		<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		<div class="mui-content-padded">
-			<ul>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今,现有水源被检测出有2221种有机污染物,其中自来水中发现65种,20种能致癌,56种能致突变。我们每喝一口的自来水,氯气净化下,烧开后残留的余氯会生成致癌物三氯甲烷,长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择,对自来水进行再净化已是普遍健康共识。</li><br/>
-				<li><b>Watero,美国标准 高端净水专家</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;通过美国NSF协会认证/美国FDA资质认证/美国美国密歇根州指定签约品牌在全球最大的科技博客,有“美国互联网产业风向标”之称的科技创意项目TechCrunch大赛上,荣获亚军。<br /></li>
-				<li><b>4级净化 至真至纯</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采用美国进口4级滤芯,RO反渗透膜, 3秒即热即饮滤除99%的各种重金属污染物,10秒完成净化<br /></li>
-				<li><b>5档水温 好生活DNA</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;25°C-直饮,40°C-奶粉、60°C-蜂蜜、85°C-咖啡、100°C-泡茶让品茶更品水,让咖啡浪漫续杯,让一汤好水煨出一盅靓汤,让清粥成珍酿...<br /></li>
-				<li><b>废水比3:1 航空科技净水</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;运用航天科技净水理念,高效节水,减少66%的废水纯废水比3:1,过滤4杯水,只有1杯是废水,实现水的高效环保<br /></li>
-				<li><b>免除安装 TDS智能显示</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;创新一体式设计,告别繁琐安装,卧室、客厅、厨房均可自由移动放置控制面板TDS智能显示,进出水质值一目了然,纯净度看的见,喝的放心<br /></li>
-			</ul>
+	</style>
+</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">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+	<div class="mui-content-padded">
+		<ul>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今,现有水源被检测出有2221种有机污染物,其中自来水中发现65种,20种能致癌,56种能致突变。我们每喝一口的自来水,氯气净化下,烧开后残留的余氯会生成致癌物三氯甲烷,长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择,对自来水进行再净化已是普遍健康共识。</li><br/>
+			<li><b>Watero,美国标准 高端净水专家</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;通过美国NSF协会认证/美国FDA资质认证/美国美国密歇根州指定签约品牌在全球最大的科技博客,有“美国互联网产业风向标”之称的科技创意项目TechCrunch大赛上,荣获亚军。<br /></li>
+			<li><b>4级净化 至真至纯</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采用美国进口4级滤芯,RO反渗透膜, 3秒即热即饮滤除99%的各种重金属污染物,10秒完成净化<br /></li>
+			<li><b>5档水温 好生活DNA</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;25°C-直饮,40°C-奶粉、60°C-蜂蜜、85°C-咖啡、100°C-泡茶让品茶更品水,让咖啡浪漫续杯,让一汤好水煨出一盅靓汤,让清粥成珍酿...<br /></li>
+			<li><b>废水比3:1 航空科技净水</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;运用航天科技净水理念,高效节水,减少66%的废水纯废水比3:1,过滤4杯水,只有1杯是废水,实现水的高效环保<br /></li>
+			<li><b>免除安装 TDS智能显示</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;创新一体式设计,告别繁琐安装,卧室、客厅、厨房均可自由移动放置控制面板TDS智能显示,进出水质值一目了然,纯净度看的见,喝的放心<br /></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/iamberry_video.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=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/iamberry_video.js?v=2016101701"></script>
+</body>
 </html>

+ 60 - 60
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video_list.html

@@ -1,65 +1,65 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="css/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="css/shop/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="css/shop/style.css" />
-		<style>
-			.mui-grid-view:before,.mui-grid-view:after{display: none;}
-			.icon-hot{color: #e90b54;font-size: 20px;}
-		</style>
-	</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="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">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css" />
+	<style>
+		.mui-grid-view:before,.mui-grid-view:after{display: none;}
+		.icon-hot{color: #e90b54;font-size: 20px;}
+	</style>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
 
-		<div class="mui-content" style="background: #fff;">
-			<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-			<div style="margin: 0 10px;">
-				<ul>
-					<li>爱贝源智能冲奶机</li>
-					<li><p class="cl-9">正确操作篇</p></li>
-					<li></li>
-					<li><span class="iconfont icon-hot"></span>热门视频</li>
-				</ul>
-			</div>
-			<ul class="mui-table-view mui-grid-view">
-				
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
-		        </li>
-		    </ul>  
-		</div>
-	<script type="text/javascript" src="js/mui.min.js"></script>
-	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
-	<script type="text/javascript" src="js/shop/main.js"></script>
-	<script type="text/javascript">
-	mui.ready(function(){
-		document.querySelector('.loading-bg').style.display='none';
-	});	
-		</script>
-	</body>
+<div class="mui-content" style="background: #fff;">
+	<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+	<div style="margin: 0 10px;">
+		<ul>
+			<li>爱贝源智能冲奶机</li>
+			<li><p class="cl-9">正确操作篇</p></li>
+			<li></li>
+			<li><span class="iconfont icon-hot"></span>热门视频</li>
+		</ul>
+	</div>
+	<ul class="mui-table-view mui-grid-view">
+
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
+		</li>
+	</ul>
+</div>
+<script type="text/javascript" src="//s.iamberry.com/js/mui.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/js/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/js/shop/main.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
 </html>

+ 2 - 2
watero-wechat-web/src/main/webapp/common/shop/iamberry_video_list.html

@@ -29,7 +29,7 @@
 					<li style="color: #5FC6DB;">WaterO - 首次使用指南</li>
 				</ul>
 			</div>
-		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=t05318hcew4&tiny=0&auto=0" allowfullscreen></iframe>
+		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="//v.qq.com/iframe/player.html?vid=t05318hcew4&tiny=0&auto=0" allowfullscreen></iframe>
 		</div>
 		<div class="mui-content" style="background: #fff;margin-top: 20px;">
 			<div style="margin: 0 10px;padding-top: 5px;">
@@ -37,7 +37,7 @@
 					<li style="color: #5FC6DB;">WaterO - 清洗指南</li>
 				</ul>
 			</div>
-		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=m0531um9ev2&tiny=0&auto=0" allowfullscreen></iframe>
+		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="//v.qq.com/iframe/player.html?vid=m0531um9ev2&tiny=0&auto=0" allowfullscreen></iframe>
 		</div>
 	<script type="text/javascript" src="js/mui.min.js"></script>
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>

+ 38 - 50
watero-wechat-web/src/main/webapp/common/shop/js/page/add_information.js

@@ -1,4 +1,4 @@
-var domanUrl = "http://" + window.location.host, base_path = "http://test.iamberry.com/watero/wechat/watero/wechat", 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) {
@@ -6,13 +6,13 @@ mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function (index
                 mui.openWindow({url: base_path + '/index'});
                 break;
             case 1:
-                mui.openWindow({url: '/watero/wechat/shopping_cart.html'});
+                mui.openWindow({url: base_path + '/wxCart/goCart'});
                 break;
             case 2:
-                mui.openWindow({url: '/watero/wechat/order_list.html'});
+                mui.openWindow({url: '/watero/pay/goOrderList'});
                 break;
             case 3:
-                mui.openWindow({url: '/watero/wechat/vip_center.html'});
+                mui.openWindow({url: base_path + '/agentWechat/member'});
                 break;
             default:
                 break
@@ -20,10 +20,7 @@ mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function (index
     }, false)
 });
 function getCartNum() {
-    $.ajax(base_path + '/cart/getCartNumByCartOpenId', {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/getCartNumByCartOpenId', {
         data: {openid: '230'},
         dataType: 'json',
         type: 'post',
@@ -47,23 +44,20 @@ function getCartNum() {
     mui.openWindow({url: base_path + '/index'})
 });
 mui('body').on('tap', '.go_gwc', function () {
-    mui.openWindow({url: '/watero/wechat/shopping_cart.html'})
+    mui.openWindow({url: base_path + '/wxCart/goCart'})
 });
 mui('body').on('tap', '.go_web_shop', function () {
-    mui.openWindow({url: '/watero/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")})
 });
 mui('body').on('tap', '.go_couponList', function () {
-    mui.openWindow({url: '/watero/wechat/coupon_list.html'})
+    mui.openWindow({url: base_path + '/couponWechat/couponList'})
 });
 mui('body').on('tap', '.go-clearing', function () {
     var param = "productId=" + this.getAttribute("proid");
-    $.ajax(base_path + '/cart/addProductToCart?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/addProductToCart?' + param, {
         dataType: 'json',
         type: 'GET',
         timeout: 15000,
@@ -81,10 +75,7 @@ mui('body').on('tap', '.go-clearing', function () {
 });
 mui('body').on('tap', '.go_gwc_pro', function () {
     var param = "productId=" + this.getAttribute("proid");
-    $.ajax(base_path + '/cart/addProductToCart?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/addProductToCart?' + param, {
         dataType: 'json',
         type: 'GET',
         timeout: 15000,
@@ -101,10 +92,7 @@ mui('body').on('tap', '.go_gwc_pro', function () {
     })
 });
 function marquee_Show() {
-    $.ajax(base_path + '/coupon/checkCurrentPreferential', {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/coupon/checkCurrentPreferential', {
         dataType: 'json',
         type: 'POST',
         async: false,
@@ -121,89 +109,89 @@ function marquee_Show() {
         }
     })
 };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('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;
-    mui.openWindow({url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()})
+    mui.openWindow({url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()})
 });
 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) {

+ 266 - 266
watero-wechat-web/src/main/webapp/common/shop/js/page/awardRotate.js

@@ -1,22 +1,22 @@
 (function($) {
-var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
-for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
+    var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
+    for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
 // Bad eval to preven google closure to remove it from code o_O
 // After compresion replace it back to var IE = 'v' == '\v'
-var IE = eval('"v"=="\v"');
+    var IE = eval('"v"=="\v"');
 
-jQuery.fn.extend({
-    rotate:function(parameters)
-    {
-        if (this.length===0||typeof parameters=="undefined") return;
+    jQuery.fn.extend({
+        rotate:function(parameters)
+        {
+            if (this.length===0||typeof parameters=="undefined") return;
             if (typeof parameters=="number") parameters={angle:parameters};
-        var returned=[];
-        for (var i=0,i0=this.length;i<i0;i++)
+            var returned=[];
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (!element.Wilq32 || !element.Wilq32.PhotoEffect) {
 
-                    var paramClone = $.extend(true, {}, parameters); 
+                    var paramClone = $.extend(true, {}, parameters);
                     var newRotObject = new Wilq32.PhotoEffect(element,paramClone)._rootObj;
 
                     returned.push($(newRotObject));
@@ -26,277 +26,277 @@ jQuery.fn.extend({
                 }
             }
             return returned;
-    },
-    getRotateAngle: function(){
-        var ret = [];
-        for (var i=0,i0=this.length;i<i0;i++)
+        },
+        getRotateAngle: function(){
+            var ret = [];
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (element.Wilq32 && element.Wilq32.PhotoEffect) {
                     ret[i] = element.Wilq32.PhotoEffect._angle;
                 }
             }
             return ret;
-    },
-    stopRotate: function(){
-        for (var i=0,i0=this.length;i<i0;i++)
+        },
+        stopRotate: function(){
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (element.Wilq32 && element.Wilq32.PhotoEffect) {
                     clearTimeout(element.Wilq32.PhotoEffect._timer);
                 }
             }
-    }
-});
+        }
+    });
 
 // Library agnostic interface
 
-Wilq32=window.Wilq32||{};
-Wilq32.PhotoEffect=(function(){
-
-	if (supportedCSS) {
-		return function(img,parameters){
-			img.Wilq32 = {
-				PhotoEffect: this
-			};
-            
-            this._img = this._rootObj = this._eventObj = img;
-            this._handleRotation(parameters);
-		}
-	} else {
-		return function(img,parameters) {
-			// Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
-            this._img = img;
-
-			this._rootObj=document.createElement('span');
-			this._rootObj.style.display="inline-block";
-			this._rootObj.Wilq32 = 
-				{
-					PhotoEffect: this
-				};
-			img.parentNode.insertBefore(this._rootObj,img);
-			
-			if (img.complete) {
-				this._Loader(parameters);
-			} else {
-				var self=this;
-				// TODO: Remove jQuery dependency
-				jQuery(this._img).bind("load", function()
-				{
-					self._Loader(parameters);
-				});
-			}
-		}
-	}
-})();
-
-Wilq32.PhotoEffect.prototype={
-    _setupParameters : function (parameters){
-		this._parameters = this._parameters || {};
-        if (typeof this._angle !== "number") this._angle = 0 ;
-        if (typeof parameters.angle==="number") this._angle = parameters.angle;
-        this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle); 
-
-        this._parameters.step = parameters.step || this._parameters.step || null;
-		this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
-		this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
-        this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
-        if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind); 
-	},
-	_handleRotation : function(parameters){
-          this._setupParameters(parameters);
-          if (this._angle==this._parameters.animateTo) {
-              this._rotate(this._angle);
-          }
-          else { 
-              this._animateStart();          
-          }
-	},
-
-	_BindEvents:function(events){
-		if (events && this._eventObj) 
-		{
-            // Unbinding previous Events
-            if (this._parameters.bind){
-                var oldEvents = this._parameters.bind;
-                for (var a in oldEvents) if (oldEvents.hasOwnProperty(a)) 
-                        // TODO: Remove jQuery dependency
+    Wilq32=window.Wilq32||{};
+    Wilq32.PhotoEffect=(function(){
+
+        if (supportedCSS) {
+            return function(img,parameters){
+                img.Wilq32 = {
+                    PhotoEffect: this
+                };
+
+                this._img = this._rootObj = this._eventObj = img;
+                this._handleRotation(parameters);
+            }
+        } else {
+            return function(img,parameters) {
+                // Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
+                this._img = img;
+
+                this._rootObj=document.createElement('span');
+                this._rootObj.style.display="inline-block";
+                this._rootObj.Wilq32 =
+                    {
+                        PhotoEffect: this
+                    };
+                img.parentNode.insertBefore(this._rootObj,img);
+
+                if (img.complete) {
+                    this._Loader(parameters);
+                } else {
+                    var self=this;
+                    // TODO: Remove jQuery dependency
+                    jQuery(this._img).bind("load", function()
+                    {
+                        self._Loader(parameters);
+                    });
+                }
+            }
+        }
+    })();
+
+    Wilq32.PhotoEffect.prototype={
+        _setupParameters : function (parameters){
+            this._parameters = this._parameters || {};
+            if (typeof this._angle !== "number") this._angle = 0 ;
+            if (typeof parameters.angle==="number") this._angle = parameters.angle;
+            this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle);
+
+            this._parameters.step = parameters.step || this._parameters.step || null;
+            this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
+            this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
+            this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
+            if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind);
+        },
+        _handleRotation : function(parameters){
+            this._setupParameters(parameters);
+            if (this._angle==this._parameters.animateTo) {
+                this._rotate(this._angle);
+            }
+            else {
+                this._animateStart();
+            }
+        },
+
+        _BindEvents:function(events){
+            if (events && this._eventObj)
+            {
+                // Unbinding previous Events
+                if (this._parameters.bind){
+                    var oldEvents = this._parameters.bind;
+                    for (var a in oldEvents) if (oldEvents.hasOwnProperty(a))
+                    // TODO: Remove jQuery dependency
                         jQuery(this._eventObj).unbind(a,oldEvents[a]);
+                }
+
+                this._parameters.bind = events;
+                for (var a in events) if (events.hasOwnProperty(a))
+                // TODO: Remove jQuery dependency
+                    jQuery(this._eventObj).bind(a,events[a]);
             }
+        },
+
+        _Loader:(function()
+        {
+            if (IE)
+                return function(parameters)
+                {
+                    var width=this._img.width;
+                    var height=this._img.height;
+                    this._img.parentNode.removeChild(this._img);
+
+                    this._vimage = this.createVMLNode('image');
+                    this._vimage.src=this._img.src;
+                    this._vimage.style.height=height+"px";
+                    this._vimage.style.width=width+"px";
+                    this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
+                    this._vimage.style.top = "0px";
+                    this._vimage.style.left = "0px";
+
+					/* Group minifying a small 1px precision problem when rotating object */
+                    this._container =  this.createVMLNode('group');
+                    this._container.style.width=width;
+                    this._container.style.height=height;
+                    this._container.style.position="absolute";
+                    this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
+                    this._container.appendChild(this._vimage);
+
+                    this._rootObj.appendChild(this._container);
+                    this._rootObj.style.position="relative"; // FIXES IE PROBLEM
+                    this._rootObj.style.width=width+"px";
+                    this._rootObj.style.height=height+"px";
+                    this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+                    this._rootObj.className=this._img.className;
+                    this._eventObj = this._rootObj;
+                    this._handleRotation(parameters);
+                }
+            else
+                return function (parameters)
+                {
+                    this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+                    this._rootObj.className=this._img.className;
+
+                    this._width=this._img.width;
+                    this._height=this._img.height;
+                    this._widthHalf=this._width/2; // used for optimisation
+                    this._heightHalf=this._height/2;// used for optimisation
+
+                    var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
+
+                    this._widthAdd = _widthMax - this._width;
+                    this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
+                    this._widthAddHalf=this._widthAdd/2; // used for optimisation
+                    this._heightAddHalf=this._heightAdd/2;// used for optimisation
+
+                    this._img.parentNode.removeChild(this._img);
 
-            this._parameters.bind = events;
-			for (var a in events) if (events.hasOwnProperty(a)) 
-				// TODO: Remove jQuery dependency
-					jQuery(this._eventObj).bind(a,events[a]);
-		}
-	},
-
-	_Loader:(function()
-	{
-		if (IE)
-		return function(parameters)
-		{
-			var width=this._img.width;
-			var height=this._img.height;
-			this._img.parentNode.removeChild(this._img);
-							
-			this._vimage = this.createVMLNode('image');
-			this._vimage.src=this._img.src;
-			this._vimage.style.height=height+"px";
-			this._vimage.style.width=width+"px";
-			this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
-			this._vimage.style.top = "0px";
-			this._vimage.style.left = "0px";
-
-			/* Group minifying a small 1px precision problem when rotating object */
-			this._container =  this.createVMLNode('group');
-			this._container.style.width=width;
-			this._container.style.height=height;
-			this._container.style.position="absolute";
-			this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
-			this._container.appendChild(this._vimage);
-			
-			this._rootObj.appendChild(this._container);
-			this._rootObj.style.position="relative"; // FIXES IE PROBLEM
-			this._rootObj.style.width=width+"px";
-			this._rootObj.style.height=height+"px";
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;			
-		    this._eventObj = this._rootObj;	
-		    this._handleRotation(parameters);	
-		}
-		else
-		return function (parameters)
-		{
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;
-			
-			this._width=this._img.width;
-			this._height=this._img.height;
-			this._widthHalf=this._width/2; // used for optimisation
-			this._heightHalf=this._height/2;// used for optimisation
-			
-			var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
-
-			this._widthAdd = _widthMax - this._width;
-			this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
-			this._widthAddHalf=this._widthAdd/2; // used for optimisation
-			this._heightAddHalf=this._heightAdd/2;// used for optimisation
-			
-			this._img.parentNode.removeChild(this._img);	
-			
-			this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
-			this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
-			
-			this._canvas=document.createElement('canvas');
-			this._canvas.setAttribute('width',this._width);
-			this._canvas.style.position="relative";
-			this._canvas.style.left = -this._widthAddHalf + "px";
-			this._canvas.style.top = -this._heightAddHalf + "px";
-			this._canvas.Wilq32 = this._rootObj.Wilq32;
-			
-			this._rootObj.appendChild(this._canvas);
-			this._rootObj.style.width=this._width+"px";
-			this._rootObj.style.height=this._height+"px";
-            this._eventObj = this._canvas;
-			
-			this._cnv=this._canvas.getContext('2d');
-            this._handleRotation(parameters);
-		}
-	})(),
-
-	_animateStart:function()
-	{	
-		if (this._timer) {
-			clearTimeout(this._timer);
-		}
-		this._animateStartTime = +new Date;
-		this._animateStartAngle = this._angle;
-		this._animate();
-	},
-    _animate:function()
+                    this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
+                    this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
+
+                    this._canvas=document.createElement('canvas');
+                    this._canvas.setAttribute('width',this._width);
+                    this._canvas.style.position="relative";
+                    this._canvas.style.left = -this._widthAddHalf + "px";
+                    this._canvas.style.top = -this._heightAddHalf + "px";
+                    this._canvas.Wilq32 = this._rootObj.Wilq32;
+
+                    this._rootObj.appendChild(this._canvas);
+                    this._rootObj.style.width=this._width+"px";
+                    this._rootObj.style.height=this._height+"px";
+                    this._eventObj = this._canvas;
+
+                    this._cnv=this._canvas.getContext('2d');
+                    this._handleRotation(parameters);
+                }
+        })(),
+
+        _animateStart:function()
+        {
+            if (this._timer) {
+                clearTimeout(this._timer);
+            }
+            this._animateStartTime = +new Date;
+            this._animateStartAngle = this._angle;
+            this._animate();
+        },
+        _animate:function()
+        {
+            var actualTime = +new Date;
+            var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
+
+            // TODO: Bug for animatedGif for static rotation ? (to test)
+            if (checkEnd && !this._parameters.animatedGif)
+            {
+                clearTimeout(this._timer);
+            }
+            else
+            {
+                if (this._canvas||this._vimage||this._img) {
+                    var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
+                    this._rotate((~~(angle*10))/10);
+                }
+                if (this._parameters.step) {
+                    this._parameters.step(this._angle);
+                }
+                var self = this;
+                this._timer = setTimeout(function()
+                {
+                    self._animate.call(self);
+                }, 10);
+            }
+
+            // To fix Bug that prevents using recursive function in callback I moved this function to back
+            if (this._parameters.callback && checkEnd){
+                this._angle = this._parameters.animateTo;
+                this._rotate(this._angle);
+                this._parameters.callback.call(this._rootObj);
+            }
+        },
+
+        _rotate : (function()
+        {
+            var rad = Math.PI/180;
+            if (IE)
+                return function(angle)
+                {
+                    this._angle = angle;
+                    this._container.style.rotation=(angle%360)+"deg";
+                }
+            else if (supportedCSS)
+                return function(angle){
+                    this._angle = angle;
+                    this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
+                }
+            else
+                return function(angle)
+                {
+                    this._angle = angle;
+                    angle=(angle%360)* rad;
+                    // clear canvas
+                    this._canvas.width = this._width+this._widthAdd;
+                    this._canvas.height = this._height+this._heightAdd;
+
+                    // REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
+                    this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
+                    this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal
+                    this._cnv.rotate(angle);										// rotate image
+                    this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
+                    this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
+                    this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
+                }
+
+        })()
+    }
+
+    if (IE)
     {
-         var actualTime = +new Date;
-         var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
-
-         // TODO: Bug for animatedGif for static rotation ? (to test)
-         if (checkEnd && !this._parameters.animatedGif) 
-         {
-             clearTimeout(this._timer);
-         }
-         else 
-         {
-             if (this._canvas||this._vimage||this._img) {
-                 var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
-                 this._rotate((~~(angle*10))/10);
-             }
-             if (this._parameters.step) {
-                this._parameters.step(this._angle);
-             }
-             var self = this;
-             this._timer = setTimeout(function()
-                     {
-                     self._animate.call(self);
-                     }, 10);
-         }
-
-         // To fix Bug that prevents using recursive function in callback I moved this function to back
-         if (this._parameters.callback && checkEnd){
-             this._angle = this._parameters.animateTo;
-             this._rotate(this._angle);
-             this._parameters.callback.call(this._rootObj);
-         }
-     },
-
-	_rotate : (function()
-	{
-		var rad = Math.PI/180;
-		if (IE)
-		return function(angle)
-		{
-            this._angle = angle;
-			this._container.style.rotation=(angle%360)+"deg";
-		}
-		else if (supportedCSS)
-		return function(angle){
-            this._angle = angle;
-			this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
-		}
-		else 
-		return function(angle)
-		{
-            this._angle = angle;
-			angle=(angle%360)* rad;
-			// clear canvas	
-			this._canvas.width = this._width+this._widthAdd;
-			this._canvas.height = this._height+this._heightAdd;
-						
-			// REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
-			this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
-			this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal 
-			this._cnv.rotate(angle);										// rotate image
-			this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
-			this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
-			this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
-		}
-
-	})()
-}
-
-if (IE)
-{
-Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
-document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-		try {
-			!document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-			return function (tagName) {
-				return document.createElement('<rvml:' + tagName + ' class="rvml">');
-			};
-		} catch (e) {
-			return function (tagName) {
-				return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-			};
-		}		
-})();
-}
+        Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
+            document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
+            try {
+                !document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
+                return function (tagName) {
+                    return document.createElement('<rvml:' + tagName + ' class="rvml">');
+                };
+            } catch (e) {
+                return function (tagName) {
+                    return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
+                };
+            }
+        })();
+    }
 })(jQuery);

+ 2 - 5
watero-wechat-web/src/main/webapp/common/shop/js/page/cash_log.js

@@ -8,14 +8,11 @@ mui.init({
 var count = 0, pageNumber = 0, pageSize = 15;
 function pullupRefresh() {
     pageNumber += 1;
-    $.ajax(base_path + '/cashLog/list?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/cashLog/list?dates=' + new Date().getTime(), {
         data: {
             "pageNO": pageNumber,
             "pageSize": pageSize
-        },
-        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 cash_log_list = [];
                 var dataObj = dt.data;

+ 193 - 205
watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -1,224 +1,212 @@
 var flag = true,
-	param = null,
-	pStatus = true,
-	goodStatus = true,
-	colorId='',
-	shareOpenid = '';
+    param = null,
+    pStatus = true,
+    goodStatus = true,
+    colorId='',
+    shareOpenid = '';
 var yuanjia = '';
 mui.ready(function() {
-	var nowUrl = location.href;
-	var productId = getParam("productId");
-	colorId = getParam("colorId");
-	param = nowUrl.split("?")[1];
-	//springFestivalPop();
-	marquee_Show();
-	selectProductInfo(productId);
-	selectProductImageText(productId);
-	mui('body').on('tap', '#add-cart-div', function() {
-		if(!pStatus) {
-			mui.alert("只有在售商品才可以添加购物车!");
-			return false
-		}
-		if(!goodStatus) {
-			mui.alert("该商品暂时缺货,不能购买!");
-			return false
-		}
-		var btnArray = ['否', '是'];
-		$.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
-            xhrFields: {
-                withCredentials: true
+    var nowUrl = location.href;
+    var productId = getParam("productId");
+    colorId = getParam("colorId");
+    param = nowUrl.split("?")[1];
+    //springFestivalPop();
+    marquee_Show();
+    selectProductInfo(productId);
+    selectProductImageText(productId);
+    mui('body').on('tap', '#add-cart-div', function() {
+        if(!pStatus) {
+            mui.alert("只有在售商品才可以添加购物车!");
+            return false
+        }
+        if(!goodStatus) {
+            mui.alert("该商品暂时缺货,不能购买!");
+            return false
+        }
+        var btnArray = ['否', '是'];
+        mui.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'GET',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    getCartNum()
+                } else {
+                    mui.confirm(dt.message + '是否刷新页面?', '提示', btnArray, function(e) {
+                        if(e.index == 1) {
+                            location.reload(true)
+                        }
+                    })
+                }
             },
-			dataType: 'json',
-			type: 'GET',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.status) {
-					getCartNum()
-				} else {
-					mui.confirm(dt.message + '是否刷新页面?', '提示', btnArray, function(e) {
-						if(e.index == 1) {
-							location.reload(true)
-						}
-					})
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		})
-	});
-	mui('body').on('tap', '#click-product-desc', function() {
-		if(flag) {
-			selectProductImageText(productId);
-			flag = false
-		}
-	});
-	mui('body').on('tap', '.video-right', function() {
-		mui.openWindow({
-			url: base_path + '/indexVideo'
-		})
-	});
-	mui('body').on('tap', '.icon-guanbi', function() {
-		document.querySelector('.go-video').style.display = 'none'
-	});
-	mui('body').on('tap', '.go_gwc', function() {
-		mui.openWindow({
-			url: '/watero/html/wechat/shopping_cart.html'
-		})
-	});
-	mui('body').on('tap', '#shopp-div', function() {
-		if(!pStatus) {
-			mui.alert("该商品已经下架,请重新挑选商品购买!");
-			return false
-		}
-		if(!goodStatus) {
-			mui.alert("该商品暂时缺货,不能购买!");
-			return false
-		}
-		var btnArray = ['否', '是'];
-		$.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
-            xhrFields: {
-                withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+    mui('body').on('tap', '#click-product-desc', function() {
+        if(flag) {
+            selectProductImageText(productId);
+            flag = false
+        }
+    });
+    mui('body').on('tap', '.video-right', function() {
+        mui.openWindow({
+            url: base_path + '/indexVideo'
+        })
+    });
+    mui('body').on('tap', '.icon-guanbi', function() {
+        document.querySelector('.go-video').style.display = 'none'
+    });
+    mui('body').on('tap', '.go_gwc', function() {
+        mui.openWindow({
+            url: base_path + '/wxCart/goCart'
+        })
+    });
+    mui('body').on('tap', '#shopp-div', function() {
+        if(!pStatus) {
+            mui.alert("该商品已经下架,请重新挑选商品购买!");
+            return false
+        }
+        if(!goodStatus) {
+            mui.alert("该商品暂时缺货,不能购买!");
+            return false
+        }
+        var btnArray = ['否', '是'];
+        mui.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'GET',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    window.location.href = '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
+                } else {
+                    mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
+                        if(e.index == 1) {}
+                    })
+                }
             },
-			dataType: 'json',
-			type: 'GET',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.status) {
-					window.location.href = '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
-				} else {
-					mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
-						if(e.index == 1) {}
-					})
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		})
-	});
-	var url = domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
-	window.repleFlag = false;
-	window.wxFriend = {
-		"appId": "",
-		"imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
-		"link": url,
-		"desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
-		"title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
-		"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-		"shareTimeSuccess": "分享成功",
-		"shareTimeCancel": "已取消分享",
-		"shareAppSuccess": "分享成功!",
-		"shareAppCancel": "已取消分享"
-	};
-	getConfig();
-	getCartNum();
-	document.querySelector('.loading-bg').style.display = 'none'
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+    var url = domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
+    window.repleFlag = false;
+    window.wxFriend = {
+        "appId": "",
+        "imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
+        "link": url,
+        "desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
+        "title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
+        "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+        "shareTimeSuccess": "分享成功",
+        "shareTimeCancel": "已取消分享",
+        "shareAppSuccess": "分享成功!",
+        "shareAppCancel": "已取消分享"
+    };
+    getConfig();
+    getCartNum();
+    document.querySelector('.loading-bg').style.display = 'none'
 });
 
 function selectProductInfo(productId) {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/product/getProductByProductId?productId=' + productId +'&colorId='+colorId+'&dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/product/getProductByProductId?productId=' + productId +'&colorId='+colorId+'&dates=' + new Date().getTime(), {
+        dataType: 'json',
+        async: false,
+        type: 'GET',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                console.log(dt.data.product);
+                if(dt.data.product.productId == 28) {
+                    goodStatus = false
+                }
+                shareOpenid = dt.data.shareOpenid;
+                var imageNote = "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
+                for(var i = 0; i < dt.data.product.pictureList.length; i += 1) {
+                    imageNote += "<div class='mui-slider-item'><a href='#'><img src='" + dt.data.product.pictureList[i].pictureUrl + "'></a></div>";
+                    if(i == 0) {
+                        $("#active-div").append("<div class='mui-indicator mui-active'></div>")
+                    } else {
+                        $("#active-div").append("<div class='mui-indicator'></div>")
+                    }
+                }
+                imageNote += "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
+                $("#group-images-div").append(imageNote);
+                var banner = mui('#detail-slider');
+                banner.slider({
+                    interval: 5000
+                });
+                $("#product-name-font").html(dt.data.product.productName);
+                if(marquee != '' && dt.data.product.productDiscount == '328000') {
+                    $('<span class="mui-h6">购买即赠3年滤芯</span>').insertAfter('.price-sp')
+                }
+                $("#product-price-span").html("¥" + accDiv(dt.data.product.productDiscount, 100));
+                if(yuanjia == '') {
+                    yuanjia = '<s>原价¥' + accDiv(dt.data.product.productPrice, 100) + '</s>'
+                }
+                $("#product-price-s").html(yuanjia);
+                $("#product-access-span").html(dt.data.product.productSalesnum + "人已购买");
+                if(dt.data.product.productStatus == 1) {
+                    pStatus = true
+                } else {
+                    pStatus = false
+                }
+            } else {
+                mui.confirm(dt.message + '是否重新加载页面?', '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		async: false,
-		type: 'GET',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				console.log(dt.data.product);
-				if(dt.data.product.productId == 28) {
-					goodStatus = false
-				}
-				shareOpenid = dt.data.shareOpenid;
-				var imageNote = "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
-				for(var i = 0; i < dt.data.product.pictureList.length; i += 1) {
-					imageNote += "<div class='mui-slider-item'><a href='#'><img src='" + dt.data.product.pictureList[i].pictureUrl + "'></a></div>";
-					if(i == 0) {
-						$("#active-div").append("<div class='mui-indicator mui-active'></div>")
-					} else {
-						$("#active-div").append("<div class='mui-indicator'></div>")
-					}
-				}
-				imageNote += "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
-				$("#group-images-div").append(imageNote);
-				var banner = mui('#detail-slider');
-				banner.slider({
-					interval: 5000
-				});
-				$("#product-name-font").html(dt.data.product.productName);
-				if(marquee != '' && dt.data.product.productDiscount == '328000') {
-					$('<span class="mui-h6">购买即赠3年滤芯</span>').insertAfter('.price-sp')
-				}
-				$("#product-price-span").html("¥" + accDiv(dt.data.product.productDiscount, 100));
-				if(yuanjia == '') {
-					yuanjia = '<s>原价¥' + accDiv(dt.data.product.productPrice, 100) + '</s>'
-				}
-				$("#product-price-s").html(yuanjia);
-				$("#product-access-span").html(dt.data.product.productSalesnum + "人已购买");
-				if(dt.data.product.productStatus == 1) {
-					pStatus = true
-				} else {
-					pStatus = false
-				}
-			} else {
-				mui.confirm(dt.message + '是否重新加载页面?', '提示', btnArray, function(e) {
-					if(e.index == 1) {
-						location.reload(true)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 
 function selectProductImageText(productId) {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/product/getPictureByProductId?productId=' + productId, {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/product/getPictureByProductId?productId=' + productId, {
+        dataType: 'json',
+        type: 'POST',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                if(dt.data != null) {
+                    $("#product-param-img").html(dt.data.imagetextContext)
+                } else {
+                    $("#item2").empty();
+                    mui.alert('商品详情获取失败')
+                }
+            } else {
+                mui.confirm(dt.message + '是否刷新页面?', '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'POST',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				if(dt.data != null) {
-					$("#product-param-img").html(dt.data.imagetextContext)
-				} else {
-					$("#item2").empty();
-					mui.alert('商品详情获取失败')
-				}
-			} else {
-				mui.confirm(dt.message + '是否刷新页面?', '提示', btnArray, function(e) {
-					if(e.index == 1) {
-						location.reload(true)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			mui.confirm('您的网络开小差了,是否重新加载页面?', '提示', btnArray, function(e) {
-				if(e.index == 1) {
-					location.reload(true)
-				}
-			})
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            mui.confirm('您的网络开小差了,是否重新加载页面?', '提示', btnArray, function(e) {
+                if(e.index == 1) {
+                    location.reload(true)
+                }
+            })
+        }
+    })
 };
 var mask = mui.createMask(function() {});
 mui('body').on('tap', '.share_wechat', function() {
-	mask.show();
+    mask.show();
 });
 $(window).on("scroll", function() {
-	if($(window).scrollTop() > 120) {
-		$(".return").show()
-	} else {
-		$(".return").hide()
-	}
+    if($(window).scrollTop() > 120) {
+        $(".return").show()
+    } else {
+        $(".return").hide()
+    }
 });

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 162 - 165
watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_list.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 542 - 554
watero-wechat-web/src/main/webapp/common/shop/js/page/clearing.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 3 - 9
watero-wechat-web/src/main/webapp/common/shop/js/page/coupon.js


+ 2 - 6
watero-wechat-web/src/main/webapp/common/shop/js/page/coupon_list.js

@@ -9,16 +9,12 @@ mui.init({
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/coupon/couponItemList', {
+    mui.ajax(base_path + '/coupon/couponItemList', {
         data: {
             "pageSize": pagesize,
             "useStatus": tabindex,
             "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 coupon_data = [];
                 coupon_data = dt.data.itemList;

+ 4 - 7
watero-wechat-web/src/main/webapp/common/shop/js/page/daili_2wm.js

@@ -7,22 +7,19 @@ mui.ready(function () {
     document.querySelector('.loading-bg').style.display = 'none'
 });
 function shareProxyMemberUrl() {
-    $.ajax(base_path + '/member/shareProxyMemberUrl?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/member/shareProxyMemberUrl?' + param, {
         dataType: 'json',
         type: 'POST',
         timeout: 15000,
         success: function (dt) {
             if (dt.status) {
                 if (dt.data.qrcodeUrl == null) {
-                    $("#qrcode-div").html("<img src='http://static.iamberry.com/watero/images/shop/bg_2wm.jpg'/>")
+                    $("#qrcode-div").html("<img src='//s.iamberry.com/watero/images/shop/bg_2wm.jpg'/>")
                 } else {
                     $("#qrcode-div").html("<img src='" + dt.data.qrcodeUrl + "'/>")
                 }
                 if (dt.data.data.userHead == null) {
-                    $("#user-head").empty().html("<img src='http://static.iamberry.com/watero/images/shop/logo_head.png' />")
+                    $("#user-head").empty().html("<img src='//s.iamberry.com/watero/images/shop/logo_head.png' />")
                 } else {
                     $("#user-head").empty().html("<img src='" + dt.data.data.userHead + "' />")
                 }
@@ -34,7 +31,7 @@ function shareProxyMemberUrl() {
                 window.repleFlag = true;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/watero/images/shop/default_qrcode.png',
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/default_qrcode.png',
                     "link": dt.data.shareUrl,
                     "desc": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
                     "title": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",

+ 1 - 4
watero-wechat-web/src/main/webapp/common/shop/js/page/daili_order_list.js

@@ -9,11 +9,8 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/agent/agentOrder', {
+    mui.ajax(base_path + '/agent/agentOrder', {
         data: {"pageSize": pagesize, "pageNO": pageNumber},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

+ 1 - 4
watero-wechat-web/src/main/webapp/common/shop/js/page/daili_rebackOrder_list.js

@@ -9,11 +9,8 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/agent/agentOrder', {
+    mui.ajax(base_path + '/agent/agentOrder', {
         data: {"pageSize": pagesize, "pageNO": pageNumber, "rebackStatus": 1},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

+ 2 - 5
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_2wm.js

@@ -7,10 +7,7 @@ mui.ready(function () {
     document.querySelector('.loading-bg').style.display = 'none'
 });
 function shareProxyMemberUrl() {
-    $.ajax(base_path + '/member/shareDrpUrl?dates=' + new Date().getTime() + '&' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/member/shareDrpUrl?dates=' + new Date().getTime() + '&' + param, {
         dataType: 'json',
         type: 'POST',
         data: {},
@@ -28,7 +25,7 @@ function shareProxyMemberUrl() {
             window.repleFlag = false;
             window.wxFriend = {
                 "appId": "",
-                "imgUrl": 'http://static.iamberry.com/watero/js/images/shop/default_qrcode.png',
+                "imgUrl": '//s.iamberry.com/watero/js/images/shop/default_qrcode.png',
                 "link": dt.data.shareUrl,
                 "desc": "秉承“关爱、极致、乐观”的企业精神,打造“中国最大的母婴平台”,通过“硬件+软件+平台”的业务模式,重构母婴人群、母婴店铺、品牌厂商三者之间的连接关系。爱贝源是母婴实体店“抱团转型O2O的助推器”;是母婴品牌商“营销渠道扁平化的最优解”;是母婴消费者“专属化购物方案的提供者”。",
                 "title": "深圳爱贝源科技,是一家互联网+“母婴平台”的科技公司,2014年成立于深圳。",

+ 274 - 283
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js

@@ -5,318 +5,309 @@ hz_shang.style.display = 'inline-block';
 var barChart = echarts.init(document.getElementById('barChart'));
 var types = "7Day";
 var getOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(元)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(元)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 var getDiamondOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(台)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(台)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 mui.ready(function() {
-		$.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
-            },
-			dataType: 'json',
-			type: 'get',
-			timeout: 15000,
-			success: function(dt) {
-				if (typeof(dt.isRedirect) == "undefined"){ 
-					if(dt.status) {
-						var src='';
-						if(dt.data.sRoleId==1){
-							$("#yewu").show();
-							src=base_path + "/statistics/sales_management.html";
-						}else if(dt.data.sRoleId==2){
-							$("#guanli").show();
-							src=base_path + "/statistics/total_management.html";
-						}
-						mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
-							mui.openWindow({url: src});
-						});
-					}
-				}else if(dt.isRedirect){
-					mui.openWindow({url:dt.redirectURL});
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理;
-				console.log(xhr);
-			}
-	});
-	document.querySelector('.loading-bg').style.display = 'none';
-	fenxiao_center_data();
-	pulldata();
+    mui.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
+        data: {},
+        dataType: 'json',
+        type: 'get',
+        timeout: 15000,
+        success: function(dt) {
+            if (typeof(dt.isRedirect) == "undefined"){
+                if(dt.status) {
+                    var src='';
+                    if(dt.data.sRoleId==1){
+                        $("#yewu").show();
+                        src=base_path + "/statistics/sales_management.html";
+                    }else if(dt.data.sRoleId==2){
+                        $("#guanli").show();
+                        src=base_path + "/statistics/total_management.html";
+                    }
+                    mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
+                        mui.openWindow({url: src});
+                    });
+                }
+            }else if(dt.isRedirect){
+                mui.openWindow({url:dt.redirectURL});
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            //异常处理;
+            console.log(xhr);
+        }
+    });
+    document.querySelector('.loading-bg').style.display = 'none';
+    fenxiao_center_data();
+    pulldata();
 });
 mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), function(index, el) {
-	el.addEventListener('tap', function() {
-		switch(index) {
-			case 0:
-				types = "7Day";
-				pulldata();
-				break;
-			case 1:
-				types = "6Mon";
-				pulldata();
-				break;
-			case 2:
-				types = "Year";
-				pulldata();
-				break;
-			default:
-				break
-		}
-	}, false)
+    el.addEventListener('tap', function() {
+        switch(index) {
+            case 0:
+                types = "7Day";
+                pulldata();
+                break;
+            case 1:
+                types = "6Mon";
+                pulldata();
+                break;
+            case 2:
+                types = "Year";
+                pulldata();
+                break;
+            default:
+                break
+        }
+    }, false)
 });
 
 function pulldata() {
-	var btnArray = ['否', '是'];
-	var url = base_path + '/rebackStatic/statisInfo';
-	var count = 1;
-	if(isDiamond) {
-		url = base_path + '/rebackStatic/getDiamondStaticsInfo';
-		count = 2
-	}
-	$.ajax(url + '?dates=' + new Date().getTime(), {
-		data: {
-			"openid": "230",
-			"type": types
-		},
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    var url = base_path + '/rebackStatic/statisInfo';
+    var count = 1;
+    if(isDiamond) {
+        url = base_path + '/rebackStatic/getDiamondStaticsInfo';
+        count = 2
+    }
+    mui.ajax(url + '?dates=' + new Date().getTime(), {
+        data: {
+            "openid": "230",
+            "type": types
+        },
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                var counts = [];
+                var dates = [];
+                mui(dt.data).each(function(index) {
+                    if(count == 1) {
+                        counts[index] = accDiv(this.amount, 100)
+                    } else if(count == 2) {
+                        counts[index] = this.salesNumber
+                    }
+                    dates[index] = this.strDate
+                });
+                barChart.setOption({
+                    xAxis: {
+                        data: dates
+                    },
+                    series: [{
+                        name: '收入',
+                        data: counts
+                    }]
+                })
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				var counts = [];
-				var dates = [];
-				mui(dt.data).each(function(index) {
-					if(count == 1) {
-						counts[index] = accDiv(this.amount, 100)
-					} else if(count == 2) {
-						counts[index] = this.salesNumber
-					}
-					dates[index] = this.strDate
-				});
-				barChart.setOption({
-					xAxis: {
-						data: dates
-					},
-					series: [{
-						name: '收入',
-						data: counts
-					}]
-				})
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr);
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr);
+        }
+    })
 };
 
 function fenxiao_center_data() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                $('#salesName').html("下线 · 销量");
+                if(dt.data.salesName) {
+                    isDiamond = true;
+                    barChart.setOption(getDiamondOption('bar'));
+                    $('#balanceLi').hide();
+                    $('#waitAccounts').hide()
+                } else {
+                    isDiamond = false;
+                    barChart.setOption(getOption('bar'));
+                    $('#balanceLi').show();
+                    $('#waitAccounts').show()
+                }
+                $('#salesName').val(dt.data.salesName);
+                document.querySelector('#to_accounts').innerHTML = accDiv(dt.data.unIncomeMoney, 100) + '元';
+                document.querySelector('.total_money').innerHTML = accDiv(dt.data.totalMoney, 100) + '元';
+                document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
+                if(dt.data.wm2 == "true") {
+                    wm2 = true;
+                    document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
+                    document.querySelector(".fenxiao_share").style.display = 'inline-block'
+                }
+                document.querySelector('.role_name').innerHTML = dt.data.role;
+                document.querySelector('.user_name').innerHTML = dt.data.userName;
+                document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
+                var shareOpenid = dt.data.shareOpenid;
+                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/index.jpg',
+                    "link": link,
+                    "desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
+                    "title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
+                    "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功",
+                    "shareAppCancel": "已取消分享"
+                };
+                getConfig();
+                pulldata()
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				$('#salesName').html("下线 · 销量");
-				if(dt.data.salesName) {
-					isDiamond = true;
-					barChart.setOption(getDiamondOption('bar'));
-					$('#balanceLi').hide();
-					$('#waitAccounts').hide()
-				} else {
-					isDiamond = false;
-					barChart.setOption(getOption('bar'));
-					$('#balanceLi').show();
-					$('#waitAccounts').show()
-				}
-				$('#salesName').val(dt.data.salesName);
-				document.querySelector('#to_accounts').innerHTML = accDiv(dt.data.unIncomeMoney, 100) + '元';
-				document.querySelector('.total_money').innerHTML = accDiv(dt.data.totalMoney, 100) + '元';
-				document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
-				if(dt.data.wm2 == "true") {
-					wm2 = true;
-					document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
-					document.querySelector(".fenxiao_share").style.display = 'inline-block'
-				}
-				document.querySelector('.role_name').innerHTML = dt.data.role;
-				document.querySelector('.user_name').innerHTML = dt.data.userName;
-				document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
-				var shareOpenid = dt.data.shareOpenid;
-				var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/watero/images/shop/index.jpg',
-					"link": link,
-					"desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
-					"title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
-					"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功",
-					"shareAppCancel": "已取消分享"
-				};
-				getConfig();
-				pulldata()
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr);
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr);
+        }
+    })
 };
 function tixian() {
-	window.location.href = base_path + "/drp/withdrawalsList";
+    window.location.href = base_path + "/drp/withdrawalsList";
 };
 
 function getIncomeRecord() {
-	window.location.href = base_path + "/drp/UnIncomeOrderList";
+    window.location.href = base_path + "/drp/UnIncomeOrderList";
 };
 
 function shareH5() {
-	window.location.href = "http://www.watero.cn/watero_wap_app_1.2/index.html";
+    window.location.href = "http://www.watero.cn/watero_wap_app_1.2/index.html";
 };
 
 function xialianlist() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/xialianUser2";
-	} else {
-		window.location.href = base_path + "/drp/xialianUser";
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/xialianUser2";
+    } else {
+        window.location.href = base_path + "/drp/xialianUser";
+    }
 };
 
 function weiruzhang() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/UnIncomeOrderList";
-	} else {
-		window.location.href = base_path + "/drp/UnIncomeOrderList2";
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/UnIncomeOrderList";
+    } else {
+        window.location.href = base_path + "/drp/UnIncomeOrderList2";
+    }
 };
 
 function fenxiao_wm2() {
-	window.location.href = "/watero/wechat/drp/share2WM";
+    window.location.href = "/watero/wechat/drp/share2WM";
 };

+ 199 - 208
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js

@@ -4,241 +4,232 @@ hz_shang.style.display = 'inline-block';
 var barChart = echarts.init(document.getElementById('barChart'));
 var types = "7Day";
 var getOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(台)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(台)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 mui.ready(function() {
-	$.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
-			data: {},
-			xhrFields: {
-				withCredentials: true
-			},
-			dataType: 'json',
-			type: 'get',
-			timeout: 15000,
-			success: function(dt) {
-				if (typeof(dt.isRedirect) == "undefined"){ 
-					if(dt.status) {
-						var src='';
-						if(dt.data.sRoleId==1){
-							$("#yewu").show();
-							src=base_path + "/statistics/sales_management.html";
-						}else if(dt.data.sRoleId==2){
-							$("#guanli").show();
-							src=base_path + "/statistics/total_management.html";
-						}
-						mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
-							mui.openWindow({url: src});
-						});
-					}
-				}else if(dt.isRedirect){
-					mui.openWindow({url:dt.redirectURL});
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理;
-				console.log(xhr);
-			}
-	});
-	document.querySelector('.loading-bg').style.display = 'none';
-	barChart.setOption(getOption('bar'));
-	fenxiao_center_data();
-	pulldata()
+    mui.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
+        data: {},
+        dataType: 'json',
+        type: 'get',
+        timeout: 15000,
+        success: function(dt) {
+            if (typeof(dt.isRedirect) == "undefined"){
+                if(dt.status) {
+                    var src='';
+                    if(dt.data.sRoleId==1){
+                        $("#yewu").show();
+                        src=base_path + "/statistics/sales_management.html";
+                    }else if(dt.data.sRoleId==2){
+                        $("#guanli").show();
+                        src=base_path + "/statistics/total_management.html";
+                    }
+                    mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
+                        mui.openWindow({url: src});
+                    });
+                }
+            }else if(dt.isRedirect){
+                mui.openWindow({url:dt.redirectURL});
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            //异常处理;
+            console.log(xhr);
+        }
+    });
+    document.querySelector('.loading-bg').style.display = 'none';
+    barChart.setOption(getOption('bar'));
+    fenxiao_center_data();
+    pulldata()
 });
 mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), function(index, el) {
-	el.addEventListener('tap', function() {
-		switch(index) {
-			case 0:
-				types = "7Day";
-				pulldata();
-				break;
-			case 1:
-				types = "6Mon";
-				pulldata();
-				break;
-			case 2:
-				types = "Year";
-				pulldata();
-				break;
-			default:
-				break
-		}
-	}, false)
+    el.addEventListener('tap', function() {
+        switch(index) {
+            case 0:
+                types = "7Day";
+                pulldata();
+                break;
+            case 1:
+                types = "6Mon";
+                pulldata();
+                break;
+            case 2:
+                types = "Year";
+                pulldata();
+                break;
+            default:
+                break
+        }
+    }, false)
 });
 
 function pulldata() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/rebackStatic/statisInfo2?dates=' + new Date().getTime(), {
-		data: {
-			"openid": "230",
-			"type": types
-		},
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/rebackStatic/statisInfo2?dates=' + new Date().getTime(), {
+        data: {
+            "openid": "230",
+            "type": types
+        },
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                var counts = [];
+                var dates = [];
+                mui(dt.data).each(function(index) {
+                    counts[index] = this.salesNumber;
+                    dates[index] = this.strDate
+                });
+                barChart.setOption({
+                    xAxis: {
+                        data: dates
+                    },
+                    series: [{
+                        name: '收入',
+                        data: counts
+                    }]
+                })
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				var counts = [];
-				var dates = [];
-				mui(dt.data).each(function(index) {
-					counts[index] = this.salesNumber;
-					dates[index] = this.strDate
-				});
-				barChart.setOption({
-					xAxis: {
-						data: dates
-					},
-					series: [{
-						name: '收入',
-						data: counts
-					}]
-				})
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 
 function fenxiao_center_data() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
+                if(dt.data.wm2 == "true") {
+                    wm2 = true;
+                    document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
+                    document.querySelector(".fenxiao_share").style.display = 'inline-block'
+                }
+                document.querySelector('.role_name').innerHTML = dt.data.role;
+                document.querySelector('.user_name').innerHTML = dt.data.userName;
+                document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
+                var shareOpenid = dt.data.shareOpenid;
+                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/index.jpg',
+                    "link": link,
+                    "desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
+                    "title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
+                    "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功",
+                    "shareAppCancel": "已取消分享"
+                };
+                getConfig()
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
-				if(dt.data.wm2 == "true") {
-					wm2 = true;
-					document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
-					document.querySelector(".fenxiao_share").style.display = 'inline-block'
-				}
-				document.querySelector('.role_name').innerHTML = dt.data.role;
-				document.querySelector('.user_name').innerHTML = dt.data.userName;
-				document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
-				var shareOpenid = dt.data.shareOpenid;
-				var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/watero/images/shop/index.jpg',
-					"link": link,
-					"desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
-					"title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
-					"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功",
-					"shareAppCancel": "已取消分享"
-				};
-				getConfig()
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 function tixian() {
-	window.location.href = base_path + "/drp/withdrawalsList"
+    window.location.href = base_path + "/drp/withdrawalsList"
 };
 
 function getIncomeRecord() {
-	window.location.href = base_path + "/drp/UnIncomeOrderList2"
+    window.location.href = base_path + "/drp/UnIncomeOrderList2"
 };
 
 function xialianlist() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/xialianUser2"
-	} else {
-		window.location.href = base_path + "/drp/xialianUser"
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/xialianUser2"
+    } else {
+        window.location.href = base_path + "/drp/xialianUser"
+    }
 };
 
 function weiruzhang() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/UnIncomeOrderList"
-	} else {
-		window.location.href = base_path + "/drp/UnIncomeOrderList2"
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/UnIncomeOrderList"
+    } else {
+        window.location.href = base_path + "/drp/UnIncomeOrderList2"
+    }
 };
 
 function fenxiao_wm2() {
-	window.location.href = "/watero/wechat/drp/share2WM"
+    window.location.href = "/watero/wechat/drp/share2WM"
 };
 
 function salesNumbers() {
-	window.location.href = base_path + "/drp/salesNumbers"
+    window.location.href = base_path + "/drp/salesNumbers"
 };

+ 3 - 7
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_mendian_next_user_list.js

@@ -9,17 +9,13 @@ var pageNumber = 0, pagesize = 10, endNo = 0;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underUnderlingStatisc?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underUnderlingStatisc?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "endNo": endNo,
             "openid": getParam("openid")
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             console.log(dt);
             if (dt.status) {
                 var chanpin_data = [];
@@ -34,7 +30,7 @@ function pullupRefresh() {
                     var li = document.createElement('li');
                     li.className = 'mui-table-view-cell';
                     if (this.img == null) {
-                        li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td class="mui-text-left">' + decodeURI("未命名") + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
+                        li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td class="mui-text-left">' + decodeURI("未命名") + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
                     } else {
                         li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td class="mui-text-left">' + decodeURI(this.name) + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
                     }

+ 7 - 12
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list.js

@@ -9,10 +9,7 @@ var pageNumber = 0, pagesize = 10, tabindex = 1;
 mui.ready(function () {
     var btnArray = ['否', '是'];
     console.log("----------getParam('openid)-------------" + getParam("openid"));
-    $.ajax(base_path + '/rebackStatic/underDrpListInfoInit?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfoInit?dates=' + new Date().getTime(), {
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -62,17 +59,13 @@ mui.ready(function () {
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "roleId": tabindex,
             "openid": (getParam("openid") == null ? "" : getParam("openid"))
-        },
-        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 chanpin_data = [];
                 if (dt.data.list != null) {
@@ -94,12 +87,14 @@ function pullupRefresh() {
                 });
                 mui.each(document.querySelectorAll(".my-tab-view-pull .daili"), function (index, el) {
                     el.addEventListener('tap', function () {
-                        mui.openWindow({url: '/watero/html/wechat/fenxiao_mendian_next_user_list.html?openid=' + this.getAttribute('openid')})
+                        console.log("11111");
+                        mui.openWindow({url: base_path + '/drp/MendianTerminalUser?openid=' + this.getAttribute('openid')})
                     }, false)
                 });
                 mui.each(document.querySelectorAll(".my-tab-view-pull .qita"), function (index, el) {
                     el.addEventListener('tap', function () {
-                        mui.openWindow({url: '/watero/html/wechat/fenxiao_next_user_list.html?openid=' + this.getAttribute('openid')})
+                        console.log("2222");
+                        mui.openWindow({url: base_path + '/drp/xialianUser?openid=' + this.getAttribute('openid')})
                     }, false)
                 })
             } else {

+ 4 - 8
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list2.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10, endNo = 0;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "endNo": endNo
-        },
-        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 itemSum = dt.data.itemNum;
                 var chanpin_data = [];
@@ -36,7 +32,7 @@ function pullupRefresh() {
                         var li = document.createElement('li');
                         li.className = 'mui-table-view-cell';
                         if (this.img == null) {
-                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td></td><td style="color:blue;">' + this.num + '台</td></tr></table>'
+                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td></td><td style="color:blue;">' + this.num + '台</td></tr></table>'
                         } else if (typeof(this.num) == "undefined") {
                             li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td>' + decodeURI(this.name) + '</td><td style="color:blue;">0台</td></tr></table>'
                         } else {
@@ -54,7 +50,7 @@ function pullupRefresh() {
                         var li = document.createElement('li');
                         li.className = 'mui-table-view-cell';
                         if (this.img == null) {
-                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td>' + this.strDate + '</td><td style="color:blue;">' + this.num + '</td></tr></table>'
+                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td>' + this.strDate + '</td><td style="color:blue;">' + this.num + '</td></tr></table>'
                         } else if (typeof(this.num) == "undefined") {
                             li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td>' + this.strDate + '</td><td style="color:blue;">0台</td></tr></table>'
                         } else {

+ 2 - 6
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_order_list.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/placeLogs/unIncomeOrderCastNext?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/placeLogs/unIncomeOrderCastNext?dates=' + new Date().getTime(), {
         data: {
             "openid": "",
             "pageSize": pagesize,
             "pageNumber": 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 fenxiao_list = [];
                 if (fenxiao_list != null) {

+ 0 - 9
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_apply.js

@@ -1,8 +1,5 @@
 mui.ready(function () {
     $.ajax({
-        "xhrFields": {
-            "withCredentials": true
-        },
         "type": "post",
         "url": base_path + "/WithDrawalsLogs/getWithdrawPage",
         "dataType": "json",
@@ -24,9 +21,6 @@ mui.ready(function () {
 });
 function ajaxSendApply(url, data) {
     $.ajax({
-        xhrFields: {
-            withCredentials: true
-        },
         url: url, data: data, dataType: "json", asyn: false, success: function (data) {
             var obj = eval("(" + data + ")");
             mui.alert(data.message)
@@ -77,9 +71,6 @@ function submitOrder() {
         "url": base_path + "/WithDrawalsLogs/submitWithdraw",
         "dataType": "json",
         "data": data,
-        "xhrFields": {
-            "withCredentials": true
-        },
         "success": function (res) {
             flag = true;
             if (res.status) {

+ 2 - 6
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_log.js

@@ -8,15 +8,11 @@ mui.init({
 var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/WithDrawalsLogs/historyWithdrawNext?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/WithDrawalsLogs/historyWithdrawNext?dates=' + new Date().getTime(), {
         data: {
             "openid": "",
             "page": {"pageSize": pagesize, "pageNumber": 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 fenxiao_list = [];
                 fenxiao_list = dt.data.list;

+ 2 - 6
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast2?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast2?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "openid": getParam("openid")
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             console.log(dt);
             if (dt.status) {
                 var chanpin_data = [];

+ 9 - 12
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list2.js

@@ -9,19 +9,16 @@ mui.init({
     }
 });
 var pageNumber = 0,
-pagesize = 10;
+    pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast3?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast3?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "openid": getParam("openid")
         },
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -43,9 +40,9 @@ function pullupRefresh() {
                 })
             } else {
                 mui.confirm(dt.message, '提示', btnArray,
-                function(e) {
-                    if (e.index == 1) {}
-                })
+                    function(e) {
+                        if (e.index == 1) {}
+                    })
             }
         },
         error: function(xhr, type, errorThrown) {
@@ -60,7 +57,7 @@ mui.ready(function() {
 });
 var addTimer = function() {
     var list = [],
-    interval;
+        interval;
     return function(id, time) {
         if (!interval) {
             interval = setInterval(go, 1000)
@@ -80,9 +77,9 @@ var addTimer = function() {
     }
     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);
+            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 {

+ 2 - 6
watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_transfer_accounts_list.js

@@ -9,15 +9,11 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": 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 chanpin_data = [];
                 if (dt.data.list != null) {

+ 418 - 417
watero-wechat-web/src/main/webapp/common/shop/js/page/httphijack1.0.0.js

@@ -6,448 +6,449 @@
  * @description 使用Javascript实现前端防御http劫持及防御XSS攻击,并且对可疑攻击进行上报
  * -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
  *
-1、使用方法:调用 httphijack.init()
+ 1、使用方法:调用 httphijack.init()
 
-2、建立自己的黑白名单、上报系统及接收后端
+ 2、建立自己的黑白名单、上报系统及接收后端
 
-3、防范范围:
-   1)所有内联事件执行的代码
-   2)href 属性 javascript: 内嵌的代码
-   3)静态脚本文件内容
-   4)动态添加的脚本文件内容
-   5)document-write添加的内容
-   6)iframe嵌套
+ 3、防范范围:
+ 1)所有内联事件执行的代码
+ 2)href 属性 javascript: 内嵌的代码
+ 3)静态脚本文件内容
+ 4)动态添加的脚本文件内容
+ 5)document-write添加的内容
+ 6)iframe嵌套
  *
  */
 (function(window, undifined) {
 
-  var httphijack = function() {},
-    // 记录内联事件是否被扫描过的 hash map
-    mCheckMap = {},
-    // 记录内联事件是否被扫描过的id
-    mCheckID = 0;
-
-  // 建立白名单
-  var whiteList = [
-    'test.iamberry.com',
-    'w.iamberry.com',
-    'res.wx.qq.com',
-    'static.iamberry.com',
-    'h5.iamberry.com'
-  ];
-  // 建立黑名单
-  var blackList = [
-    '192.168.1.0'
-  ];
-
-  // 建立关键词黑名单
-  var keywordBlackList = [
-    'xss',
-    'embed_v3',
-    '_embed_v3',
-    '_embed_v3_dc',
-    '_embed_v3_hd_l',
-    '_embed_v3_hd_c',
-    '_embed_v3_hd_r',
-    '_embed_v3_frmc',
-    '_embed_v3_main',
-    '_embed_v3_ft',
-    'BAIDU_SSP__wrapper',
-    'BAIDU_DSPUI_FLOWBAR',
-    '_embed_v3_hd'
-  ];
-  
-  // 触发内联事件拦截
-  function triggerIIE() {
-    var i = 0,
-      obj = null;
-
-    for (obj in document) {
-      if (/^on./.test(obj)) {
-        interceptionInlineEvent(obj, i++);
-      }
+    var httphijack = function() {},
+        // 记录内联事件是否被扫描过的 hash map
+        mCheckMap = {},
+        // 记录内联事件是否被扫描过的id
+        mCheckID = 0;
+
+    // 建立白名单
+    var whiteList = [
+        'test.iamberry.com',
+        'w.iamberry.com',
+        'res.wx.qq.com',
+        'static.iamberry.com',
+        's.iamberry.com',
+        'h5.iamberry.com'
+    ];
+    // 建立黑名单
+    var blackList = [
+        '192.168.1.0'
+    ];
+
+    // 建立关键词黑名单
+    var keywordBlackList = [
+        'xss',
+        'embed_v3',
+        '_embed_v3',
+        '_embed_v3_dc',
+        '_embed_v3_hd_l',
+        '_embed_v3_hd_c',
+        '_embed_v3_hd_r',
+        '_embed_v3_frmc',
+        '_embed_v3_main',
+        '_embed_v3_ft',
+        'BAIDU_SSP__wrapper',
+        'BAIDU_DSPUI_FLOWBAR',
+        '_embed_v3_hd'
+    ];
+
+    // 触发内联事件拦截
+    function triggerIIE() {
+        var i = 0,
+            obj = null;
+
+        for (obj in document) {
+            if (/^on./.test(obj)) {
+                interceptionInlineEvent(obj, i++);
+            }
+        }
     }
-  }
-
-  /**
-   * 内联事件拦截
-   * @param  {[String]} eventName [内联事件名]
-   * @param  {[Number]} eventID   [内联事件id]
-   * @return {[type]}             [description]
-   */
-  function interceptionInlineEvent(eventName, eventID) {
-    var isClick = (eventName == 'onclick');
-
-    document.addEventListener(eventName.substr(2), function(e) {
-      scanElement(e.target, isClick, eventName, eventID);
-    }, true);
-  }
-
-  /**
-   * 扫描元素是否存在内联事件
-   * @param  {[DOM]} elem [DOM元素]
-   * @param  {[Boolean]} isClick [是否是内联点击事件]
-   * @param  {[String]} eventName [内联 on* 事件名]
-   * @param  {[Number]} eventID [给每个内联 on* 事件一个id]
-   */
-  function scanElement(elem, isClick, eventName, eventID) {
-    var
-      flag = elem['isScan'],
-      // 扫描内联代码
-      code = "",
-      hash = 0;
-
-    // 跳过已扫描的事件
-    if (!flag) {
-      flag = elem['isScan'] = ++mCheckID;
+
+    /**
+     * 内联事件拦截
+     * @param  {[String]} eventName [内联事件名]
+     * @param  {[Number]} eventID   [内联事件id]
+     * @return {[type]}             [description]
+     */
+    function interceptionInlineEvent(eventName, eventID) {
+        var isClick = (eventName == 'onclick');
+
+        document.addEventListener(eventName.substr(2), function(e) {
+            scanElement(e.target, isClick, eventName, eventID);
+        }, true);
     }
 
-    hash = (flag << 8) | eventID;
+    /**
+     * 扫描元素是否存在内联事件
+     * @param  {[DOM]} elem [DOM元素]
+     * @param  {[Boolean]} isClick [是否是内联点击事件]
+     * @param  {[String]} eventName [内联 on* 事件名]
+     * @param  {[Number]} eventID [给每个内联 on* 事件一个id]
+     */
+    function scanElement(elem, isClick, eventName, eventID) {
+        var
+            flag = elem['isScan'],
+            // 扫描内联代码
+            code = "",
+            hash = 0;
+
+        // 跳过已扫描的事件
+        if (!flag) {
+            flag = elem['isScan'] = ++mCheckID;
+        }
 
-    if (hash in mCheckMap) {
-      return;
-    }
+        hash = (flag << 8) | eventID;
+
+        if (hash in mCheckMap) {
+            return;
+        }
 
-    mCheckMap[hash] = true;
+        mCheckMap[hash] = true;
 
-    // 非元素节点
-    if (elem.nodeType != Node.ELEMENT_NODE) {
-      return;
-    }
+        // 非元素节点
+        if (elem.nodeType != Node.ELEMENT_NODE) {
+            return;
+        }
 
-    if (elem[eventName]) {
-      code = elem.getAttribute(eventName);
-      if (code && blackListMatch(keywordBlackList, code)) {
-        // 注销事件
-        elem[eventName] = null;
-        console.log('拦截可疑内联事件:' + code);
-        hijackReport('拦截可疑内联事件', code);
-      }
+        if (elem[eventName]) {
+            code = elem.getAttribute(eventName);
+            if (code && blackListMatch(keywordBlackList, code)) {
+                // 注销事件
+                elem[eventName] = null;
+                console.log('拦截可疑内联事件:' + code);
+                hijackReport('拦截可疑内联事件', code);
+            }
+        }
+
+        // 扫描 <a href="javascript:"> 的脚本
+        if (isClick && elem.tagName == 'A' && elem.protocol == 'javascript:') {
+            var code = elem.href.substr(11);
+            if (blackListMatch(keywordBlackList, string)) {
+                // 注销代码
+                elem.href = 'javascript:void(0)';
+                console.log('拦截可疑事件:' + code);
+                hijackReport('拦截可疑javascript:代码', code);
+            }
+        }
+
+        // 递归扫描上级元素
+        scanElement(elem.parentNode);
     }
 
-    // 扫描 <a href="javascript:"> 的脚本
-    if (isClick && elem.tagName == 'A' && elem.protocol == 'javascript:') {
-      var code = elem.href.substr(11);
-      if (blackListMatch(keywordBlackList, string)) {
-        // 注销代码
-        elem.href = 'javascript:void(0)';
-        console.log('拦截可疑事件:' + code);
-        hijackReport('拦截可疑javascript:代码', code);
-      }
+    // 主动防御 MutationEvent
+    /**
+     * 使用 MutationObserver 进行静态脚本拦截
+     * @return {[type]} [description]
+     */
+    function interceptionStaticScript() {
+        // MutationObserver 的不同兼容性写法
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
+        // 该构造函数用来实例化一个新的 Mutation 观察者对象
+        // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
+        var observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                // 返回被添加的节点,或者为null.
+                var nodes = mutation.addedNodes;
+
+                // 逐个遍历
+                for (var i = 0; i < nodes.length; i++) {
+                    var node = nodes[i];
+
+                    // 扫描 script 与 iframe
+                    if (node.tagName === 'SCRIPT' || node.tagName === 'IFRAME') {
+                        // 拦截到可疑iframe
+                        if (node.tagName === 'IFRAME' && node.srcdoc) {
+                            node.parentNode.removeChild(node);
+                            console.log('拦截到可疑iframe', node.srcdoc);
+                            hijackReport('拦截可疑静态脚本', node.srcdoc);
+
+                        } else if (node.src) {
+                            // 只放行白名单
+                            if (!whileListMatch(whiteList, node.src)) {
+                                node.parentNode.removeChild(node);
+                                // 上报
+                                console.log('拦截可疑静态脚本:', node.src);
+                                hijackReport('拦截可疑静态脚本', node.src);
+                            }
+                        }
+                    }
+                }
+            });
+        });
+
+        // 传入目标节点和观察选项
+        // 如果 target 为 document 或者 document.documentElement
+        // 则当前文档中所有的节点添加与删除操作都会被观察到d
+        observer.observe(document, {
+            subtree: true,
+            childList: true
+        });
     }
 
-    // 递归扫描上级元素
-    scanElement(elem.parentNode);
-  }
-
-  // 主动防御 MutationEvent
-  /**
-   * 使用 MutationObserver 进行静态脚本拦截
-   * @return {[type]} [description]
-   */
-  function interceptionStaticScript() {
-    // MutationObserver 的不同兼容性写法
-    var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
-
-    // 该构造函数用来实例化一个新的 Mutation 观察者对象
-    // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
-    var observer = new MutationObserver(function(mutations) {
-      mutations.forEach(function(mutation) {
-        // 返回被添加的节点,或者为null.
-        var nodes = mutation.addedNodes;
-
-        // 逐个遍历
-        for (var i = 0; i < nodes.length; i++) {
-          var node = nodes[i];
-
-          // 扫描 script 与 iframe
-          if (node.tagName === 'SCRIPT' || node.tagName === 'IFRAME') {
-            // 拦截到可疑iframe
-            if (node.tagName === 'IFRAME' && node.srcdoc) {
-              node.parentNode.removeChild(node);
-              console.log('拦截到可疑iframe', node.srcdoc);
-              hijackReport('拦截可疑静态脚本', node.srcdoc);
-
-            } else if (node.src) {
-              // 只放行白名单
-              if (!whileListMatch(whiteList, node.src)) {
+    /**
+     * 使用 DOMNodeInserted  进行动态脚本拦截监
+     * 此处无法拦截,只能监测
+     * @return {[type]} [description]
+     */
+    function interceptionDynamicScript() {
+        // DOMNodeInserted 的执行时机早于 MutationObserver
+        document.addEventListener('DOMNodeInserted', function(e) {
+            var node = e.target;
+            if (/xss/i.test(node.src) || /xss/i.test(node.innerHTML)) {
                 node.parentNode.removeChild(node);
-                // 上报
-                console.log('拦截可疑静态脚本:', node.src);
-                hijackReport('拦截可疑静态脚本', node.src);
-              }
+                console.log('拦截可疑动态脚本:', node);
+                hijackReport('拦截可疑动态脚本', node.src);
             }
-          }
-        }
-      });
-    });
-
-    // 传入目标节点和观察选项
-    // 如果 target 为 document 或者 document.documentElement
-    // 则当前文档中所有的节点添加与删除操作都会被观察到d
-    observer.observe(document, {
-      subtree: true,
-      childList: true
-    });
-  }
-
-  /**
-   * 使用 DOMNodeInserted  进行动态脚本拦截监
-   * 此处无法拦截,只能监测
-   * @return {[type]} [description]
-   */
-  function interceptionDynamicScript() {
-    // DOMNodeInserted 的执行时机早于 MutationObserver
-    document.addEventListener('DOMNodeInserted', function(e) {
-      var node = e.target;
-      if (/xss/i.test(node.src) || /xss/i.test(node.innerHTML)) {
-        node.parentNode.removeChild(node);
-        console.log('拦截可疑动态脚本:', node);
-        hijackReport('拦截可疑动态脚本', node.src);
-      }
-    }, true);
-  }
-
-  // 重写 createElement
-  function resetCreateElement() {}
-
-  /**
-   * 重写单个 window 窗口的 document.write 属性
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]}       [description]
-   */
-  function resetDocumentWrite(window) {
-    var old_write = window.document.write;
-
-    window.document.write = function(string) {
-      if (blackListMatch(keywordBlackList, string)) {
-        console.log('拦截可疑模块:', string);
-        hijackReport('拦截可疑document-write', string);
-        return;
-      }
-
-      // 调用原始接口
-      old_write.apply(document, arguments);
+        }, true);
     }
-  }
-
-  /**
-   * 重写单个 window 窗口的 setAttribute 属性
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]} [description]
-   */
-  function resetSetAttribute(window) {
-    // 保存原有接口
-    var old_setAttribute = window.Element.prototype.setAttribute;
-
-    // 重写 setAttribute 接口
-    window.Element.prototype.setAttribute = function(name, value) {
-
-      // 额外细节实现
-      if (this.tagName == 'SCRIPT' && /^src$/i.test(name)) {
-
-        if (!whileListMatch(whiteList, value)) {
-          console.log('拦截可疑模块:', value);
-          hijackReport('拦截可疑setAttribute', value);
-          return;
-        }
-      }
-
-      // 调用原始接口
-      old_setAttribute.apply(this, arguments);
-    };
-  }
-
-  /**
-   * 使用 MutationObserver 对生成的 iframe 页面进行监控,
-   * 防止调用内部原生 setAttribute 及 document.write
-   * @return {[type]} [description]
-   */
-  function defenseIframe() {
-    // 先保护当前页面
-    installHook(window);
-  }
-
-  /**
-   * 实现单个 window 窗口的 setAttribute保护
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]}       [description]
-   */
-  function installHook(window) {
-    // 重写单个 window 窗口的 setAttribute 属性
-    resetSetAttribute(window);
-    // 重写单个 window 窗口的 document.Write 属性
-    resetDocumentWrite(window);
-
-    // MutationObserver 的不同兼容性写法
-    var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
-
-    // 该构造函数用来实例化一个新的 Mutation 观察者对象
-    // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
-    var observer = new MutationObserver(function(mutations) {
-      mutations.forEach(function(mutation) {
-        // 返回被添加的节点,或者为null.
-        var nodes = mutation.addedNodes;
-
-        // 逐个遍历
-        for (var i = 0; i < nodes.length; i++) {
-          var node = nodes[i];
-
-          // 给生成的 iframe 里环境也装上重写的钩子
-          if (node.tagName == 'IFRAME') {
-            installHook(node.contentWindow);
-          }
+
+    // 重写 createElement
+    function resetCreateElement() {}
+
+    /**
+     * 重写单个 window 窗口的 document.write 属性
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]}       [description]
+     */
+    function resetDocumentWrite(window) {
+        var old_write = window.document.write;
+
+        window.document.write = function(string) {
+            if (blackListMatch(keywordBlackList, string)) {
+                console.log('拦截可疑模块:', string);
+                hijackReport('拦截可疑document-write', string);
+                return;
+            }
+
+            // 调用原始接口
+            old_write.apply(document, arguments);
         }
-      });
-    });
-
-    observer.observe(document, {
-      subtree: true,
-      childList: true
-    });
-  }
-
-  /**
-   * 使用 Object.defineProperty,锁住call和apply,使之无法被重写
-   * @return {[type]} [description]
-   */
-  function lockCallAndApply() {
-    // 锁住 call
-    Object.defineProperty(Function.prototype, 'call', {
-      value: Function.prototype.call,
-      // 当且仅当仅当该属性的 writable 为 true 时,该属性才能被赋值运算符改变
-      writable: false,
-      // 当且仅当该属性的 configurable 为 true 时,该属性才能够被改变,也能够被删除
-      configurable: false,
-      enumerable: true
-    });
-    // 锁住 apply
-    Object.defineProperty(Function.prototype, 'apply', {
-      value: Function.prototype.apply,
-      writable: false,
-      configurable: false,
-      enumerable: true
-    });
-  }
-
-  /**
-   * 重定向iframe hijack(页面被iframe包裹)
-   */
-  function redirectionIframeHijack() {
-    var flag = 'iframe_hijack_redirected';
-    // 当前页面存在于一个 iframe 中
-    // 此处需要建立一个白名单匹配规则,白名单默认放行
-    if (self != top) {
-      var
-      // 使用 document.referrer 可以拿到跨域 iframe 父页面的 URL
-        parentUrl = document.referrer,
-        length = whiteList.length,
-        i = 0;
-
-      for (; i < length; i++) {
-        // 建立白名单正则
-        var reg = new RegExp(whiteList[i], 'i');
-
-        // 存在白名单中,放行
-        if (reg.test(parentUrl)) {
-          return;
+    }
+
+    /**
+     * 重写单个 window 窗口的 setAttribute 属性
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]} [description]
+     */
+    function resetSetAttribute(window) {
+        // 保存原有接口
+        var old_setAttribute = window.Element.prototype.setAttribute;
+
+        // 重写 setAttribute 接口
+        window.Element.prototype.setAttribute = function(name, value) {
+
+            // 额外细节实现
+            if (this.tagName == 'SCRIPT' && /^src$/i.test(name)) {
+
+                if (!whileListMatch(whiteList, value)) {
+                    console.log('拦截可疑模块:', value);
+                    hijackReport('拦截可疑setAttribute', value);
+                    return;
+                }
+            }
+
+            // 调用原始接口
+            old_setAttribute.apply(this, arguments);
+        };
+    }
+
+    /**
+     * 使用 MutationObserver 对生成的 iframe 页面进行监控,
+     * 防止调用内部原生 setAttribute 及 document.write
+     * @return {[type]} [description]
+     */
+    function defenseIframe() {
+        // 先保护当前页面
+        installHook(window);
+    }
+
+    /**
+     * 实现单个 window 窗口的 setAttribute保护
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]}       [description]
+     */
+    function installHook(window) {
+        // 重写单个 window 窗口的 setAttribute 属性
+        resetSetAttribute(window);
+        // 重写单个 window 窗口的 document.Write 属性
+        resetDocumentWrite(window);
+
+        // MutationObserver 的不同兼容性写法
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
+        // 该构造函数用来实例化一个新的 Mutation 观察者对象
+        // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
+        var observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                // 返回被添加的节点,或者为null.
+                var nodes = mutation.addedNodes;
+
+                // 逐个遍历
+                for (var i = 0; i < nodes.length; i++) {
+                    var node = nodes[i];
+
+                    // 给生成的 iframe 里环境也装上重写的钩子
+                    if (node.tagName == 'IFRAME') {
+                        installHook(node.contentWindow);
+                    }
+                }
+            });
+        });
+
+        observer.observe(document, {
+            subtree: true,
+            childList: true
+        });
+    }
+
+    /**
+     * 使用 Object.defineProperty,锁住call和apply,使之无法被重写
+     * @return {[type]} [description]
+     */
+    function lockCallAndApply() {
+        // 锁住 call
+        Object.defineProperty(Function.prototype, 'call', {
+            value: Function.prototype.call,
+            // 当且仅当仅当该属性的 writable 为 true 时,该属性才能被赋值运算符改变
+            writable: false,
+            // 当且仅当该属性的 configurable 为 true 时,该属性才能够被改变,也能够被删除
+            configurable: false,
+            enumerable: true
+        });
+        // 锁住 apply
+        Object.defineProperty(Function.prototype, 'apply', {
+            value: Function.prototype.apply,
+            writable: false,
+            configurable: false,
+            enumerable: true
+        });
+    }
+
+    /**
+     * 重定向iframe hijack(页面被iframe包裹)
+     */
+    function redirectionIframeHijack() {
+        var flag = 'iframe_hijack_redirected';
+        // 当前页面存在于一个 iframe 中
+        // 此处需要建立一个白名单匹配规则,白名单默认放行
+        if (self != top) {
+            var
+                // 使用 document.referrer 可以拿到跨域 iframe 父页面的 URL
+                parentUrl = document.referrer,
+                length = whiteList.length,
+                i = 0;
+
+            for (; i < length; i++) {
+                // 建立白名单正则
+                var reg = new RegExp(whiteList[i], 'i');
+
+                // 存在白名单中,放行
+                if (reg.test(parentUrl)) {
+                    return;
+                }
+            }
+
+            var url = location.href;
+            var parts = url.split('#');
+            if (location.search) {
+                parts[0] += '&' + flag + '=1';
+            } else {
+                parts[0] += '?' + flag + '=1';
+            }
+            try {
+                console.log('页面被嵌入iframe中:', parentUrl);
+                hijackReport('页面被嵌入iframe中', parentUrl);
+                top.location.href = parts.join('#');
+            } catch (e) {}
         }
-      }
-
-      var url = location.href;
-      var parts = url.split('#');
-      if (location.search) {
-        parts[0] += '&' + flag + '=1';
-      } else {
-        parts[0] += '?' + flag + '=1';
-      }
-      try {
-        console.log('页面被嵌入iframe中:', parentUrl);
-        hijackReport('页面被嵌入iframe中', parentUrl);
-        top.location.href = parts.join('#');
-      } catch (e) {}
     }
-  }
-
-  /**
-   * 自定义上报 -- 替换页面中的 console.log()
-   * @param  {[String]} name  [拦截类型]
-   * @param  {[String]} value [拦截值]
-   * @return {[type]}   [description]
-   */
-  function hijackReport(name, value) {
-    var img = document.createElement('img'),
-      hijackName = name,
-      hijackValue = value.toString(),
-      curDate = new Date().getTime();
-
-    // 上报
-    img.src = 'http://www.reportServer.com/report/?msg=' + hijackName + '&value=' + hijackValue + '&time=' + curDate;
-  }
-
-  /**
-   * [白名单匹配]
-   * @param  {[Array]} whileList [白名单]
-   * @param  {[String]} value    [需要验证的字符串]
-   * @return {[Boolean]}         [false -- 验证不通过,true -- 验证通过]
-   */
-  function whileListMatch(whileList, value) {
-    var length = whileList.length,
-      i = 0;
-
-    for (; i < length; i++) {
-      // 建立白名单正则
-      var reg = new RegExp(whiteList[i], 'i');
-
-      // 存在白名单中,放行
-      if (reg.test(value)) {
-        return true;
-      }
+
+    /**
+     * 自定义上报 -- 替换页面中的 console.log()
+     * @param  {[String]} name  [拦截类型]
+     * @param  {[String]} value [拦截值]
+     * @return {[type]}   [description]
+     */
+    function hijackReport(name, value) {
+        var img = document.createElement('img'),
+            hijackName = name,
+            hijackValue = value.toString(),
+            curDate = new Date().getTime();
+
+        // 上报
+        img.src = 'http://www.reportServer.com/report/?msg=' + hijackName + '&value=' + hijackValue + '&time=' + curDate;
+    }
+
+    /**
+     * [白名单匹配]
+     * @param  {[Array]} whileList [白名单]
+     * @param  {[String]} value    [需要验证的字符串]
+     * @return {[Boolean]}         [false -- 验证不通过,true -- 验证通过]
+     */
+    function whileListMatch(whileList, value) {
+        var length = whileList.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            // 建立白名单正则
+            var reg = new RegExp(whiteList[i], 'i');
+
+            // 存在白名单中,放行
+            if (reg.test(value)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * [黑名单匹配]
-   * @param  {[Array]} blackList [黑名单]
-   * @param  {[String]} value    [需要验证的字符串]
-   * @return {[Boolean]}         [false -- 验证不通过,true -- 验证通过]
-   */
-  function blackListMatch(blackList, value) {
-    var length = blackList.length,
-      i = 0;
-
-    for (; i < length; i++) {
-      // 建立黑名单正则
-      var reg = new RegExp(blackList[i], 'i');
-
-      // 存在黑名单中,拦截
-      if (reg.test(value)) {
-        return true;
-      }
+
+    /**
+     * [黑名单匹配]
+     * @param  {[Array]} blackList [黑名单]
+     * @param  {[String]} value    [需要验证的字符串]
+     * @return {[Boolean]}         [false -- 验证不通过,true -- 验证通过]
+     */
+    function blackListMatch(blackList, value) {
+        var length = blackList.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            // 建立黑名单正则
+            var reg = new RegExp(blackList[i], 'i');
+
+            // 存在黑名单中,拦截
+            if (reg.test(value)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  // 待完成:
-  // 建立黑白名单列表
-  // 对正则匹配精细化
+    // 待完成:
+    // 建立黑白名单列表
+    // 对正则匹配精细化
+
+    // 初始化方法
+    httphijack.init = function() {
+        // 触发内联事件拦截
+        triggerIIE();
+        // 进行静态脚本拦截
+        interceptionStaticScript();
+        // 进行动态脚本拦截
+        // interceptionDynamicScript();
+        // 锁住 apply 和 call
+        lockCallAndApply();
+        // 对当前窗口及多重内嵌 iframe 进行 setAttribute | document.write 重写
+        defenseIframe();
+        // 对iframe劫持进行重定向
+        redirectionIframeHijack();
+    }
 
-  // 初始化方法
-  httphijack.init = function() {
-    // 触发内联事件拦截
-    triggerIIE();
-    // 进行静态脚本拦截
-    interceptionStaticScript();
-    // 进行动态脚本拦截
-    // interceptionDynamicScript();
-    // 锁住 apply 和 call
-    lockCallAndApply();
-    // 对当前窗口及多重内嵌 iframe 进行 setAttribute | document.write 重写
-    defenseIframe();
-    // 对iframe劫持进行重定向
-    redirectionIframeHijack();
-  }
-
-  window.httphijack = httphijack;
+    window.httphijack = httphijack;
 })(window);

+ 2 - 5
watero-wechat-web/src/main/webapp/common/shop/js/page/iamberry_video.js

@@ -7,10 +7,7 @@ mui.ready(function () {
     } else {
         userType = 1
     }
-    $.ajax(base_path + '/agent/memberInfo?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/agent/memberInfo?dates=' + new Date().getTime(), {
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -21,7 +18,7 @@ mui.ready(function () {
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/images/shop/naiji_xuanchuan.jpg',
+                    "imgUrl": '//s.iamberry.com/images/shop/naiji_xuanchuan.jpg',
                     "link": link,
                     "desc": "Watero水时代商城,开启优雅生活",
                     "title": "Watero水时代商城,好水,好茶,生活不将就!",

+ 50 - 50
watero-wechat-web/src/main/webapp/view/2017_51.html

@@ -1,58 +1,58 @@
 <!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-content img{display: block;width: 100%;}
-		</style>
-		<script>
-			// 屏蔽分享
-			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/watero/view/2017_51.html';
-	window.repleFlag = true;
-	window.repleWxData = {
-		"appId": "",
-		"imgUrl": '/watero/images/shop/2017-51-share.png',
-		"link": url,
-		"desc": "4月29日-5月1日下单的顾客均有电动牙刷相赠!前五名还有一年净水滤芯套装赠送哦!手快有!手慢无!就看你手速行不行了!",
-		"title": "五一嗨购!送你全套净水滤芯!来不来?",
-		"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-		"shareTimeSuccess": "分享成功",
-		"shareTimeCancel": "已取消分享",
-		"shareAppSuccess": "分享成功!",
-		"shareAppCancel": "已取消分享"
-	};
-		</script>
-	</head>
-	<body style="background: #fd3b70;">
-	<img style="display: none" src="/watero/wateroimages/shop/2017-51-share.png" />
-	<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>
+		.mui-content img{display: block;width: 100%;}
+	</style>
+	<script>
+        // 屏蔽分享
+        //window.hiddenAllWechatMenu = true;
+        var url = '//'+document.domain+'/watero/view/2017_51.html';
+        window.repleFlag = true;
+        window.repleWxData = {
+            "appId": "",
+            "imgUrl": '//s.iamberry.com/watero/images/shop/2017-51-share.png',
+            "link": url,
+            "desc": "4月29日-5月1日下单的顾客均有电动牙刷相赠!前五名还有一年净水滤芯套装赠送哦!手快有!手慢无!就看你手速行不行了!",
+            "title": "五一嗨购!送你全套净水滤芯!来不来?",
+            "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+            "shareTimeSuccess": "分享成功",
+            "shareTimeCancel": "已取消分享",
+            "shareAppSuccess": "分享成功!",
+            "shareAppCancel": "已取消分享"
+        };
+	</script>
+</head>
+<body style="background: #fd3b70;">
+<img style="display: none" src="//s.iamberry.com/watero/images/shop/2017-51-share.png" />
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
+</div>
 
-			<div class="mui-content" style="background: #fd3b70;">
-				<img src="/watero/wateroimages/shop/2017-51-01.jpg" />
-				<a class="go_web_shop" href="/watero/wechat/chanpin_list.html"><img src="/watero/wateroimages/shop/2017-51-02.jpg" /></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>
+<div class="mui-content" style="background: #fd3b70;">
+	<img src="//s.iamberry.com/watero/images/shop/2017-51-01.jpg" />
+	<a class="go_web_shop" href="/watero/wechat/wxCart/goProductList"><img src="//s.iamberry.com/watero/images/shop/2017-51-02.jpg" /></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() {
-	document.querySelector('.loading-bg').style.display = 'none';
-});
+    mui.ready(function() {
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
 </script>
 </body>
 </html>

+ 252 - 258
watero-wechat-web/src/main/webapp/view/apply_replacement.html

@@ -1,281 +1,275 @@
 <!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;}
-	#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;}
-	.ul_noline: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;}
+		#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;}
+		.ul_noline: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="padding: 0 10px;background: #fff;">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" style="padding: 11px 0;">
-						<span class="iconfont icon-lease7 cl-blue"></span>&nbsp;订单编号:<span id="order_num"></span>
-					</li>
-				</ul>
-				<ul class="lease-ul">
-						<!--<li>产品名称:美国watero净饮水一体机</li>
-						<li>产品颜色:黑色x1</li>-->
-				</ul>
-				<ul class="mui-table-view my-view1">
-					<li class="mui-table-view-cell" style="padding: 11px 0;">
-						<span class="mui-h5">寄回快递单号:</span><input type="text" style="width:50% !important"  id="ipt_kuaidi"/><span id="kuaidi_name"></span>
-					</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>收  货  人:林林</li>
-							<li>手 机 号:15999999999</li>
-							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>-->
-						</ul>
-					</a>
-					</li>
-					<li>
-						<span class="mui-h5">换货备注</span>
-					</li>
-					<li style="ppadding:10px 0 5px 0;">
-						<input type="text" placeholder="请输入您的换货备注" style="font-size: 12px;background: #f0f0f0;border: 0;text-align: center;" id="ipt_beizhu"/>
-					</li>
-					<li class="mui-text-center" style="padding:10px 15px 15px 15px;">
-						<a href="/watero/view/lease_xieyi.html" style="text-decoration: underline;color: #999;" id="btn_shouhou">售后说明</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">申请换货</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>
-            var address='',nickname='',ads_tel='';
-            var parm=getParam("orderId"),item1=getParam("itemId");
-			mui.ready(function() {
-                $.ajax(base_path + '/rent_order/to_apply_exchange', {
-                    data: {
-                        orderId: parm,
-                        itemId:item1
-                    },
-                    xhrFields: {
-                        withCredentials: true
-                    },
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div style="padding: 0 10px;background: #fff;">
+		<ul class="mui-table-view">
+			<li class="mui-table-view-cell" style="padding: 11px 0;">
+				<span class="iconfont icon-lease7 cl-blue"></span>&nbsp;订单编号:<span id="order_num"></span>
+			</li>
+		</ul>
+		<ul class="lease-ul">
+			<!--<li>产品名称:美国watero净饮水一体机</li>
+            <li>产品颜色:黑色x1</li>-->
+		</ul>
+		<ul class="mui-table-view my-view1">
+			<li class="mui-table-view-cell" style="padding: 11px 0;">
+				<span class="mui-h5">寄回快递单号:</span><input type="text" style="width:50% !important"  id="ipt_kuaidi"/><span id="kuaidi_name"></span>
+			</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>收  货  人:林林</li>
+                        <li>手 机 号:15999999999</li>
+                        <li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>-->
+					</ul>
+				</a>
+			</li>
+			<li>
+				<span class="mui-h5">换货备注</span>
+			</li>
+			<li style="ppadding:10px 0 5px 0;">
+				<input type="text" placeholder="请输入您的换货备注" style="font-size: 12px;background: #f0f0f0;border: 0;text-align: center;" id="ipt_beizhu"/>
+			</li>
+			<li class="mui-text-center" style="padding:10px 15px 15px 15px;">
+				<a href="/watero/view/lease_xieyi.html" style="text-decoration: underline;color: #999;" id="btn_shouhou">售后说明</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">申请换货</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 address='',nickname='',ads_tel='';
+    var parm=getParam("orderId"),item1=getParam("itemId");
+    mui.ready(function() {
+        mui.ajax(base_path + '/rent_order/to_apply_exchange', {
+            data: {
+                orderId: parm,
+                itemId:item1
+            },
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+				/*console.log(dt)*/
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.status) {
+                        address=dt.data.rentAddressInfo;
+                        nickname=dt.data.rentAddressName;
+                        ads_tel=dt.data.rentAddressTel;
+                        $("#order_num").text(dt.data.rentOrderId);
+                        $(".address_ul").html('<li>收  货  人:' + dt.data.rentAddressName + '</li><li>手 机 号:' + dt.data.rentAddressTel + '</li><li>详细地址:' + dt.data.rentAddressInfo + '</li>');
+                        var str='';
+                        mui(dt.data.list).each(function(index) {
+                            if(this.itemProductType==1){
+                                str+='<li>产品名称:'+this.itemProductName+'</li><li>产品颜色:'+this.itemProductColorName+'x1</li>'
+                            }else{
+                                str+='<li>赠品名称:'+this.itemProductName+'</li><li>赠品颜色:'+this.itemProductColorName+'x1</li>'
+                            }
+                        });
+                        $(".lease-ul").html(str);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
+
+    //申请换货
+    var isPay=true,check=false;
+    mui('body').on('tap', '#btn_submit', function() {
+        console.log(check)
+        var th=this;
+        if(check){
+            if(isPay) {
+                isPay = false; // 锁定请求按钮
+                mui(this).button('loading');
+
+                var param = {
+                    "orderId": parm,
+                    "itemId": item1,
+                    "exchangeAddressName": nickname,
+                    "exchangeAddressTel": ads_tel,
+                    "exchangeAddressInfo":address,
+                    "exchangePostFirm":"申通快递",
+                    "exchangePostNum":$("#ipt_kuaidi").val(),
+                    "exchangeRemark":$("#ipt_beizhu").val()
+                }
+                $.ajax({
                     type: 'post',
+                    url: base_path+'/rent_order/apply_exchange?dates=' + new Date().getTime(),
+                    data: param,
+                    dataType: 'json',
                     timeout: 15000,
                     success: function(dt) {
-                        /*console.log(dt)*/
+                        //console.log(dt);
                         if(dt.isRedirect) {
                             location.href = dt.redirectURL;
                         }else{
-                        if(dt.status) {
-                            address=dt.data.rentAddressInfo;
-                            nickname=dt.data.rentAddressName;
-                            ads_tel=dt.data.rentAddressTel;
-                            $("#order_num").text(dt.data.rentOrderId);
-                            $(".address_ul").html('<li>收  货  人:' + dt.data.rentAddressName + '</li><li>手 机 号:' + dt.data.rentAddressTel + '</li><li>详细地址:' + dt.data.rentAddressInfo + '</li>');
-                            var str='';
-                            mui(dt.data.list).each(function(index) {
-                                if(this.itemProductType==1){
-                               str+='<li>产品名称:'+this.itemProductName+'</li><li>产品颜色:'+this.itemProductColorName+'x1</li>'
-                                }else{
-                                    str+='<li>赠品名称:'+this.itemProductName+'</li><li>赠品颜色:'+this.itemProductColorName+'x1</li>'
-								}
-							});
-                            $(".lease-ul").html(str);
-                        }
+                            if(dt.status) {
+                                mui.alert(dt.message,'',function(){
+                                    location.href='/watero/view/rent/lease_order_details.html?rentStatus=-1';
+                                });
+                            } else {
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.message);
+                            }
                         }
                     },
                     error: function(xhr, type, errorThrown) {
-                        console.log(xhr)
-                    }
-                })
-				document.querySelector('.loading-bg').style.display = 'none';
-			});
-
-            //申请换货
-			var isPay=true,check=false;
-            mui('body').on('tap', '#btn_submit', function() {
-                console.log(check)
-                var th=this;
-                if(check){
-                    if(isPay) {
-                        isPay = false; // 锁定请求按钮
-                        mui(this).button('loading');
-
-                        var param = {
-                            "orderId": parm,
-                            "itemId": item1,
-                            "exchangeAddressName": nickname,
-                            "exchangeAddressTel": ads_tel,
-                            "exchangeAddressInfo":address,
-                            "exchangePostFirm":"申通快递",
-                            "exchangePostNum":$("#ipt_kuaidi").val(),
-                            "exchangeRemark":$("#ipt_beizhu").val()
-                        }
-                        $.ajax({
-                            xhrFields: {
-                                withCredentials: true
-                            },
-                            type: 'post',
-                            url: base_path+'/rent_order/apply_exchange?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) {
-                                        mui.alert(dt.message,'',function(){
-                                            location.href='/watero/rent/lease_order_details.html?rentStatus=-1';
-										});
-                                    } else {
-                                        mui(th).button('reset');
-                                        isPay = true;
-                                        mui.alert(dt.message);
-                                    }
-                                }
-                            },
-                            error: function(xhr, type, errorThrown) {
-                                //异常处理;
-                                console.log(xhr);
-                                isPay = true;
-                                layer.closeAll();
-                                mui.alert("请检查网络或刷新页面重试!");
-                                mui(th).button('reset');
-                            }
-                        });
-                    }else{
-                        mui.alert("正在申请换货中~~请稍后!");
-                        return;
+                        //异常处理;
+                        console.log(xhr);
+                        isPay = true;
+                        layer.closeAll();
+                        mui.alert("请检查网络或刷新页面重试!");
+                        mui(th).button('reset');
                     }
+                });
+            }else{
+                mui.alert("正在申请换货中~~请稍后!");
+                return;
+            }
+        }
+    });
+    // 获取微信共享地址
+    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;
+                $("#open-wechat-addres-a").empty().append('<ul class="address_ul"><li>收  件  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                    mui.alert("您没有选择收货地址!");
                 }
-            });
-            // 获取微信共享地址
-            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;
-                        $("#open-wechat-addres-a").empty().append('<ul class="address_ul"><li>收  件  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-                    },
-                    function() {
-                        if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-                            wechatAddr.status = true;
-                        } else {
-                            wechatAddr.status = false;
-                            // 用户取消拉出地址
-                            $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-                            mui.alert("您没有选择收货地址!");
-                        }
-                    }
-                );
+            }
+        );
 
-            });
-            mui.os.ios ? listener_ipt() : keyup_fn();
+    });
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-            function keyup_fn() {
-                $('body').on('keyup', '#ipt_kuaidi', function(e) {
-                    //传参数并加载数据
-                    var str = $.trim($(this).val());
-                    console.log(str!='' && typeof(str) != "undefined");
-                    if(str!='' && typeof(str) != "undefined"){
-                        check=true;
-                        $("#btn_submit").removeClass("active").removeAttr("disabled");
-                    }else{
-                        check=false;
-                        $("#btn_submit").addClass("active").prop("disabled","disabled");
-                    }
-                });
+    function keyup_fn() {
+        $('body').on('keyup', '#ipt_kuaidi', function(e) {
+            //传参数并加载数据
+            var str = $.trim($(this).val());
+            console.log(str!='' && typeof(str) != "undefined");
+            if(str!='' && typeof(str) != "undefined"){
+                check=true;
+                $("#btn_submit").removeClass("active").removeAttr("disabled");
+            }else{
+                check=false;
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
             }
+        });
+    }
 
-            function listener_ipt() {
-                document.getElementById('ipt_kuaidi').onblur = function() {
-                    //传参数并加载数据
-                    var str = $.trim($("#ipt_kuaidi").val());
-                    console.log(str!='' && typeof(str) != "undefined");
-                    var btn_submit=$("#btn_submit");
-                    if(str!='' && typeof(str) != "undefined"){
-                        check=true;
-                        $("#btn_submit").removeClass("active").removeAttr("disabled");
-                    }else{
-                        check=false;
-                        $("#btn_submit").addClass("active").prop("disabled","disabled");
-                    }
-                }
+    function listener_ipt() {
+        document.getElementById('ipt_kuaidi').onblur = function() {
+            //传参数并加载数据
+            var str = $.trim($("#ipt_kuaidi").val());
+            console.log(str!='' && typeof(str) != "undefined");
+            var btn_submit=$("#btn_submit");
+            if(str!='' && typeof(str) != "undefined"){
+                check=true;
+                $("#btn_submit").removeClass("active").removeAttr("disabled");
+            }else{
+                check=false;
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
             }
-            mui('body').on('tap', '#btn_shouhou', function() {
-                location.href="/watero/view/lease_xieyi.html"
-			});
-		</script>
-	</body>
+        }
+    }
+    mui('body').on('tap', '#btn_shouhou', function() {
+        location.href="/watero/view/lease_xieyi.html"
+    });
+</script>
+</body>
 
 </html>

+ 227 - 233
watero-wechat-web/src/main/webapp/view/apply_returns.html

@@ -1,253 +1,247 @@
 <!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:after,.ul_noline:before{display: none;}
-	.ul_noline li:after,.ul_noline li:before{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;}
-	.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color:#1cc9f4;}
-		</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:after,.ul_noline:before{display: none;}
+		.ul_noline li:after,.ul_noline li:before{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;}
+		.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color:#1cc9f4;}
+	</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>
-		<div class="mui-content">
-			<div style="padding: 0 10px;background: #fff;">
-				<ul class="mui-table-view ul_noline">
-					<li class="mui-table-view-cell mui-text-center">
-						<span class="cl-red mui-h4">注意</span>
-					</li>
-				</ul>
-				<ul class="lease-ul">
-						<li>1、因净水机滤芯为耗材,若申请退货,所交服务费将无法退还,请 知悉</li>
-						<li>2、成功退货后,我们将在5个工作日内退还至您微信</li>
-				</ul>
-					
-				<ul class="mui-table-view ul_noline">
-					<li class="mui-table-view-cell" style="padding: 11px 5px;">
-						<span class="iconfont icon-lease5 cl-blue"></span>&nbsp;退货流程<span class="mui-h6">(如若完成请勾选,进行下一步)</span>
-					</li>
-				</ul>
-					<div class="mui-input-row mui-checkbox mui-left">
-						<label>我已联系客服,并已沟通确认退货</label>
-						<input name="checkbox" value="1" type="checkbox" id="checkbox1">
-					</div>
-					<div class="mui-input-row mui-checkbox mui-left">
-						<label>我已经将机器及配件完整打包好并邮寄</label>
-						<input name="checkbox" value="2" type="checkbox" id="checkbox2">
-					</div>
-					<ul class="mui-table-view ul_noline">
-						<li class="mui-table-view-cell">寄回快递单号<input type="text" placeholder="请填写单号" style="width: 50% !important;margin-bottom: 0;font-size: 12px;margin-left: 10px;" id="ipt_kuaidi"/></li>
-					</ul>
-					<ul class="mui-table-view ul_noline">
-						<li class="mui-table-view-cell mui-h6">
-							<span class="mui-h5">提示:</span>我们收到货品并验货后,将立即退还押金:<span class="cl-red" class="money">¥0.00</span>
-						</li>
-					</ul>
-					<img src="/watero/wateroimages/shop/welcome_to_use_again.png" width="100%" />
-				</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">申请退货</button>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div style="padding: 0 10px;background: #fff;">
+		<ul class="mui-table-view ul_noline">
+			<li class="mui-table-view-cell mui-text-center">
+				<span class="cl-red mui-h4">注意</span>
+			</li>
+		</ul>
+		<ul class="lease-ul">
+			<li>1、因净水机滤芯为耗材,若申请退货,所交服务费将无法退还,请 知悉</li>
+			<li>2、成功退货后,我们将在5个工作日内退还至您微信</li>
+		</ul>
+
+		<ul class="mui-table-view ul_noline">
+			<li class="mui-table-view-cell" style="padding: 11px 5px;">
+				<span class="iconfont icon-lease5 cl-blue"></span>&nbsp;退货流程<span class="mui-h6">(如若完成请勾选,进行下一步)</span>
+			</li>
+		</ul>
+		<div class="mui-input-row mui-checkbox mui-left">
+			<label>我已联系客服,并已沟通确认退货</label>
+			<input name="checkbox" value="1" type="checkbox" id="checkbox1">
+		</div>
+		<div class="mui-input-row mui-checkbox mui-left">
+			<label>我已经将机器及配件完整打包好并邮寄</label>
+			<input name="checkbox" value="2" type="checkbox" id="checkbox2">
 		</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 parm1=getParam("orderId"),item=getParam("itemId");
-			mui.ready(function() {
-				document.querySelector('.loading-bg').style.display = 'none';
-			});
-            mui.os.ios ? listener_ipt() : keyup_fn();
+		<ul class="mui-table-view ul_noline">
+			<li class="mui-table-view-cell">寄回快递单号<input type="text" placeholder="请填写单号" style="width: 50% !important;margin-bottom: 0;font-size: 12px;margin-left: 10px;" id="ipt_kuaidi"/></li>
+		</ul>
+		<ul class="mui-table-view ul_noline">
+			<li class="mui-table-view-cell mui-h6">
+				<span class="mui-h5">提示:</span>我们收到货品并验货后,将立即退还押金:<span class="cl-red" class="money">¥0.00</span>
+			</li>
+		</ul>
+		<img src="//s.iamberry.com/watero/images/shop/welcome_to_use_again.png" width="100%" />
+	</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">申请退货</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 parm1=getParam("orderId"),item=getParam("itemId");
+    mui.ready(function() {
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-            function keyup_fn() {
-                $('body').on('keyup', '#ipt_kuaidi', function(e) {
-                    var str = $.trim($(this).val());
-                    if(str!='' && typeof(str) != "undefined"){
-                        if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")) {
-                            check=true;
-                            see_apply_exchange();
-                            $("#btn_submit").removeClass("active").removeAttr("disabled");
-                        }else{
-                            check=false;
-                            $("#btn_submit").addClass("active").prop("disabled","disabled");
-						}
-                    }else{
-                        check=false;
-                        $("#btn_submit").addClass("active").prop("disabled","disabled");
-                    }
-                });
+    function keyup_fn() {
+        $('body').on('keyup', '#ipt_kuaidi', function(e) {
+            var str = $.trim($(this).val());
+            if(str!='' && typeof(str) != "undefined"){
+                if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")) {
+                    check=true;
+                    see_apply_exchange();
+                    $("#btn_submit").removeClass("active").removeAttr("disabled");
+                }else{
+                    check=false;
+                    $("#btn_submit").addClass("active").prop("disabled","disabled");
+                }
+            }else{
+                check=false;
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
             }
+        });
+    }
 
-            function listener_ipt() {
-                document.getElementById('ipt_kuaidi').onblur = function() {
-                    var str = $.trim($("#ipt_kuaidi").val());
-                    var btn_submit=$("#btn_submit");
-                    if(str!='' && typeof(str) != "undefined"){
-                        if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")) {
-                        check=true;
-                        see_apply_exchange();
-                        $("#btn_submit").removeClass("active").removeAttr("disabled");
-                        }else{
-                            check=false;
-                            $("#btn_submit").addClass("active").prop("disabled","disabled");
-                        }
-                    }else{
-                        check=false;
-                        $("#btn_submit").addClass("active").prop("disabled","disabled");
-                    }
+    function listener_ipt() {
+        document.getElementById('ipt_kuaidi').onblur = function() {
+            var str = $.trim($("#ipt_kuaidi").val());
+            var btn_submit=$("#btn_submit");
+            if(str!='' && typeof(str) != "undefined"){
+                if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")) {
+                    check=true;
+                    see_apply_exchange();
+                    $("#btn_submit").removeClass("active").removeAttr("disabled");
+                }else{
+                    check=false;
+                    $("#btn_submit").addClass("active").prop("disabled","disabled");
                 }
+            }else{
+                check=false;
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
             }
-            //申请退货
-            var isPay=true,check=false;
-            mui('body').on('tap', '#btn_submit', function() {
-                console.log(check)
-                var th=this;
-                if(check){
-                    if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")){
-                    if(isPay) {
-                        isPay = false; // 锁定请求按钮
-                        mui(this).button('loading');
+        }
+    }
+    //申请退货
+    var isPay=true,check=false;
+    mui('body').on('tap', '#btn_submit', function() {
+        console.log(check)
+        var th=this;
+        if(check){
+            if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")){
+                if(isPay) {
+                    isPay = false; // 锁定请求按钮
+                    mui(this).button('loading');
 
-                        var param = {
-                            "orderId": parm1,
-                            "itemId": item,
-                            "rentPostNum":$("#ipt_kuaidi").val()
-                        }
-                        $.ajax({
-                            xhrFields: {
-                                withCredentials: true
-                            },
-                            type: 'post',
-                            url: base_path+'/rent_order/apply_exit?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) {
-                                        mui.alert(dt.message,'',function () {
-                                            location.href='/watero/html/rent/lease_order_details.html?rentStatus=-1';
-                                        });
-                                    } else {
-                                        mui(th).button('reset');
-                                        isPay = true;
-                                        mui.alert(dt.message);
-                                    }
+                    var param = {
+                        "orderId": parm1,
+                        "itemId": item,
+                        "rentPostNum":$("#ipt_kuaidi").val()
+                    }
+                    $.ajax({
+                        type: 'post',
+                        url: base_path+'/rent_order/apply_exit?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) {
+                                    mui.alert(dt.message,'',function () {
+                                        location.href='/watero/view/rent/lease_order_details.html?rentStatus=-1';
+                                    });
+                                } else {
+                                    mui(th).button('reset');
+                                    isPay = true;
+                                    mui.alert(dt.message);
                                 }
-                            },
-                            error: function(xhr, type, errorThrown) {
-                                //异常处理;
-                                console.log(xhr);
-                                isPay = true;
-                                mui.alert("请检查网络或刷新页面重试!");
-                                mui(th).button('reset');
                             }
-                        });
-                    }else{
-                        mui.alert("正在申请退货中~~请稍后!");
-                        return;
-                    }
-                    }
+                        },
+                        error: function(xhr, type, errorThrown) {
+                            //异常处理;
+                            console.log(xhr);
+                            isPay = true;
+                            mui.alert("请检查网络或刷新页面重试!");
+                            mui(th).button('reset');
+                        }
+                    });
+                }else{
+                    mui.alert("正在申请退货中~~请稍后!");
+                    return;
                 }
-            });
-            mui('body').on('click', 'input[type=checkbox]', function() {
-                if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")){
-                    if(check=true){
-                    $("#btn_submit").removeClass("active").removeAttr("disabled");
-                    }else{
-                        $("#btn_submit").addClass("active").prop("disabled","disabled");
-					}
-				}else{
-                    $("#btn_submit").addClass("active").prop("disabled","disabled");
-				}
-			});
-			function see_apply_exchange(){
-                $.ajax(base_path + '/rent_order/to_apply_exit', {
-                    data: {
-                        "orderId": parm1,
-                        "itemId": item
-                    },
-                    xhrFields: {
-                        withCredentials: true
-                    },
-                    type: 'post',
-                    timeout: 15000,
-                    success: function(dt) {
-						/*console.log(dt)*/
-                        if(dt.isRedirect) {
-                            location.href = dt.redirectURL;
+            }
+        }
+    });
+    mui('body').on('click', 'input[type=checkbox]', function() {
+        if($("#checkbox1").is(":checked") && $("#checkbox2").is(":checked")){
+            if(check=true){
+                $("#btn_submit").removeClass("active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
+            }
+        }else{
+            $("#btn_submit").addClass("active").prop("disabled","disabled");
+        }
+    });
+    function see_apply_exchange(){
+        mui.ajax(base_path + '/rent_order/to_apply_exit', {
+            data: {
+                "orderId": parm1,
+                "itemId": item
+            },
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+				/*console.log(dt)*/
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.status) {
+                        if(dt.resultCode==200){
+                            $(".money").text("¥"+accDiv(dt.data,100))
                         }else{
-                            if(dt.status) {
-                                if(dt.resultCode==200){
-                                    $(".money").text("¥"+accDiv(dt.data,100))
-                                }else{
-                                    $(".money").text("¥0.00")
-								}
-                            }
+                            $(".money").text("¥0.00")
                         }
-                    },
-                    error: function(xhr, type, errorThrown) {
-                        console.log(xhr)
                     }
-                })
-			}
-		</script>
-	</body>
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    }
+</script>
+</body>
 
 </html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 186 - 189
watero-wechat-web/src/main/webapp/view/coupon_bag.html


+ 108 - 114
watero-wechat-web/src/main/webapp/view/deposit_coupon.html

@@ -1,45 +1,45 @@
 <!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 type="text/css">
-			.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio] {left: 0px;}
-			.mui-checkbox.mui-left label, .mui-radio.mui-left label {padding-right: 15px;padding-left: 38px;}
-			.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;}
-		</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 type="text/css">
+		.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio] {left: 0px;}
+		.mui-checkbox.mui-left label, .mui-radio.mui-left label {padding-right: 15px;padding-left: 38px;}
+		.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;}
+	</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="mui-content-padded">
-			<div style="position: relative;">
-			<img src="/watero/wateroimages/shop/bg_quan_02.jpg" width="100%" />
+<div class="mui-content" style="background: #fff;">
+	<div class="mui-content-padded">
+		<div style="position: relative;">
+			<img src="//s.iamberry.com/watero/images/shop/bg_quan_02.jpg" width="100%" />
 			<div style="position: absolute;left: 0;width: 100%;top:30%;line-height: 1.6; width: 100%;text-align: center;color: #fff;font-size: 16px;">
 				<span class="coupon_name"></span><br />
 				<span class="mui-h4 coupon_money">¥0.00</span>
 			</div>
-			</div>
-			<div style="padding: 10px 0;">选择订单</div>
-			<div class="cp_list">
+		</div>
+		<div style="padding: 10px 0;">选择订单</div>
+		<div class="cp_list">
 			<!--<div class="mui-input-row mui-radio mui-left">
 						<label>2017550548058(黑色水机)</label>
 						<input name="radio1" type="radio">
@@ -48,35 +48,32 @@
 						<label>2017550548058(白色水机)</label>
 						<input name="radio1" type="radio">
 			</div>-->
-			</div>
-			<div style="padding: 10px 0;">
-				订单押金:<span class="cl-red yajin">¥0.00</span>
-			</div>
-			<div style="padding: 0 0 20px 0;">
-				本次提取押金<span class="cl-red now_money">¥0.00</span>,剩余<span class="cl-red sy_money">¥0.00</span>,待提取
-			</div>
-			<div class="mui-h6">
-				财务审核通过后,将于5个工作日内,转至您的微信钱包
-			</div>
 		</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 style="padding: 10px 0;">
+			订单押金:<span class="cl-red yajin">¥0.00</span>
+		</div>
+		<div style="padding: 0 0 20px 0;">
+			本次提取押金<span class="cl-red now_money">¥0.00</span>,剩余<span class="cl-red sy_money">¥0.00</span>,待提取
 		</div>
+		<div class="mui-h6">
+			财务审核通过后,将于5个工作日内,转至您的微信钱包
+		</div>
+	</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>
-	<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">
-        var pledgeId=getParam("pledgeId");
-	mui.ready(function(){
-        $.ajax(base_path + '/rent_coupon/toExtractDeposit', {
+</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 pledgeId=getParam("pledgeId");
+    mui.ready(function(){
+        mui.ajax(base_path + '/rent_coupon/toExtractDeposit', {
             data: {
                 pledgeId: pledgeId
             },
-            xhrFields: {
-                withCredentials: true
-            },
             type: 'post',
             timeout: 15000,
             success: function(dt) {
@@ -85,7 +82,7 @@
                     location.href = dt.redirectURL;
                 }else{
                     console.log(dt)
-					if(dt.status){
+                    if(dt.status){
                         $(".coupon_name").text(dt.data.couponInfo.pledgeName);
                         $(".coupon_money").text("¥"+accDiv(dt.data.couponInfo.pledgeMoney,100)).attr("name",accDiv(dt.data.couponInfo.pledgeMoney,100));
                         var table=document.querySelector(".cp_list");
@@ -93,10 +90,10 @@
                         cp_data=dt.data.listOrderItem;
                         mui(cp_data).each(function(index) {
                             var li=document.createElement("div");
-                            /*li.innerHTML='<div class="mui-input-row mui-checkbox mui-left"><label>'+this.itemOrderId+'('+this.itemProductColorName+')</label> <input name="checkbox" value="Item 1" type="checkbox" ></div>'*/
+							/*li.innerHTML='<div class="mui-input-row mui-checkbox mui-left"><label>'+this.itemOrderId+'('+this.itemProductColorName+')</label> <input name="checkbox" value="Item 1" type="checkbox" ></div>'*/
                             li.innerHTML='<div class="mui-input-row mui-radio mui-left"><label>'+this.itemOrderId+'('+this.itemProductColorName+')</label><input name="radio1" value="'+accDiv(this.rentDeposit,100)+'" tip="'+this.itemId+'" sy="'+accDiv(this.rentRemainDeposit,100)+'" type="radio"></div>';
                             table.appendChild(li);
-						});
+                        });
                         $(document).on('click',".cp_list .mui-radio>input[type=radio]:checked", function() {
                             $(".yajin").text("¥"+$(this).val());
                             console.log($(".coupon_money").attr("name")+"_"+$(this).val());
@@ -105,69 +102,66 @@
                             }else{
                                 $(".now_money").text("¥"+$(".coupon_money").attr("name"));
                                 $(".sy_money").text("¥"+$(this).attr("sy"));
-							}
-							$("#btn_submit").removeClass("active").removeAttr("disabled");
+                            }
+                            $("#btn_submit").removeClass("active").removeAttr("disabled");
                         });
-					}else{
-					    mui.alert("请求数据失败,请稍后重试!")
-					}
+                    }else{
+                        mui.alert("请求数据失败,请稍后重试!")
+                    }
                 }
             },
             error: function(xhr, type, errorThrown) {
                 console.log(xhr)
             }
         });
-		document.querySelector('.loading-bg').style.display='none';
-	});
+        document.querySelector('.loading-bg').style.display='none';
+    });
 
-        //申请退货
-        var isPay=true;
-        mui('body').on('tap', '#btn_submit', function() {
-            var th=this;
-                    if(isPay) {
-                        isPay = false; // 锁定请求按钮
-                        mui(this).button('loading');
+    //申请退货
+    var isPay=true;
+    mui('body').on('tap', '#btn_submit', function() {
+        var th=this;
+        if(isPay) {
+            isPay = false; // 锁定请求按钮
+            mui(this).button('loading');
 
-                        var param = {
-                            "pledgeId": pledgeId,
-                            "orderItemId": $(".cp_list .mui-radio>input[type=radio]:checked").attr("tip")
-                        }
-                        $.ajax({
-                            xhrFields: {
-                                withCredentials: true
-                            },
-                            type: 'post',
-                            url: base_path+'/rent_coupon/extractDeposit?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) {
-                                        mui.alert(dt.message);;
-                                    } else {
-                                        mui(th).button('reset');
-                                        isPay = true;
-                                        mui.alert(dt.message);
-                                    }
-                                }
-                            },
-                            error: function(xhr, type, errorThrown) {
-                                //异常处理;
-                                console.log(xhr);
-                                isPay = true;
-                                mui.alert("请检查网络或刷新页面重试!");
-                                mui(th).button('reset');
-                            }
-                        });
+            var param = {
+                "pledgeId": pledgeId,
+                "orderItemId": $(".cp_list .mui-radio>input[type=radio]:checked").attr("tip")
+            }
+            $.ajax({
+                type: 'post',
+                url: base_path+'/rent_coupon/extractDeposit?dates=' + new Date().getTime(),
+                data: param,
+                dataType: 'json',
+                timeout: 15000,
+                success: function(dt) {
+                    //console.log(dt);
+                    if(dt.isRedirect) {
+                        location.href = dt.redirectURL;
                     }else{
-                        mui.alert("正在确认提取中~~请稍后!");
-                        return;
+                        if(dt.status) {
+                            mui.alert(dt.message);;
+                        } else {
+                            mui(th).button('reset');
+                            isPay = true;
+                            mui.alert(dt.message);
+                        }
                     }
-        });
-	</script>
-	</body>
+                },
+                error: function(xhr, type, errorThrown) {
+                    //异常处理;
+                    console.log(xhr);
+                    isPay = true;
+                    mui.alert("请检查网络或刷新页面重试!");
+                    mui(th).button('reset');
+                }
+            });
+        }else{
+            mui.alert("正在确认提取中~~请稍后!");
+            return;
+        }
+    });
+</script>
+</body>
 </html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 520 - 520
watero-wechat-web/src/main/webapp/view/faq.html


+ 67 - 67
watero-wechat-web/src/main/webapp/view/gift_card_agent_explain.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>
+<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>
 		.icon-quanyizhanshi,.icon-shouquan,.icon-pinleiyouhui{font-size: 15px;padding-left:30px;}
 		.icon-quanyizhanshi:before,.icon-shouquan:before,.icon-pinleiyouhui:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
 		.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
 		.ul-desc{padding:10px 10px 10px 15px;background: #fff;color: #666;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">
-				
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<span class="iconfont icon-quanyizhanshi">尊享权益</span>
-				</li>
-			</ul>
-			<ul class="ul-desc">
-				<li>1.将获赠价值3680元的美国watero净饮水一体机一台。</li>
-				<li>2.将获得8张礼品兑换卡(每张可兑换一台美国watero净饮水一体机)</li>
-				<li>3.成功推荐其他人成为代理商,可获赠一台美国watero桌面净饮水一 体机)</li>
-				<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
-				<li>5.如果您销售完8张提货卡,系统即将赠送一台水机。</li>
-			</ul>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<span class="iconfont icon-shouquan">产品代理权</span>
-				</li>
-			</ul>
-			<ul class="ul-desc">
-				<li>当您成为尊贵的代理以后,即可享受美国watero净饮水一体机及礼品卡的产品代理权,在您代理的范围内,我们(深圳爱贝源科技有限公司)保证只有您一人可以代理我们的礼品卡。</li>
-				<li><br/>公司郑重承诺!</li>
-			</ul>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<span class="iconfont icon-pinleiyouhui">低价拿货权</span>
-				</li>
-			</ul>
-			<ul class="ul-desc">
-				<li>当您成为尊贵的代理以后,即可享受美国watero净饮水一体机及礼品卡的产品代理权,并且享受我们(深圳爱贝源科技有限公司)的最低价拿货权益!</li>
-				<li><br/>我们保证让您享受我们最低价的拿货权!</li>
-			</ul>
-		</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/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script type="text/javascript">
-	mui.ready(function(){
-		//console.log("页面加载完毕");
-		document.querySelector('.loading-bg').style.display='none';
-	});
+	</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">
+
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-quanyizhanshi">尊享权益</span>
+		</li>
+	</ul>
+	<ul class="ul-desc">
+		<li>1.将获赠价值3680元的美国watero净饮水一体机一台。</li>
+		<li>2.将获得8张礼品兑换卡(每张可兑换一台美国watero净饮水一体机)</li>
+		<li>3.成功推荐其他人成为代理商,可获赠一台美国watero桌面净饮水一 体机)</li>
+		<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
+		<li>5.如果您销售完8张提货卡,系统即将赠送一台水机。</li>
+	</ul>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-shouquan">产品代理权</span>
+		</li>
+	</ul>
+	<ul class="ul-desc">
+		<li>当您成为尊贵的代理以后,即可享受美国watero净饮水一体机及礼品卡的产品代理权,在您代理的范围内,我们(深圳爱贝源科技有限公司)保证只有您一人可以代理我们的礼品卡。</li>
+		<li><br/>公司郑重承诺!</li>
+	</ul>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-pinleiyouhui">低价拿货权</span>
+		</li>
+	</ul>
+	<ul class="ul-desc">
+		<li>当您成为尊贵的代理以后,即可享受美国watero净饮水一体机及礼品卡的产品代理权,并且享受我们(深圳爱贝源科技有限公司)的最低价拿货权益!</li>
+		<li><br/>我们保证让您享受我们最低价的拿货权!</li>
+	</ul>
+</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/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("页面加载完毕");
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
 </html>

+ 111 - 114
watero-wechat-web/src/main/webapp/view/gift_card_agent_xiaxian_list.html

@@ -1,118 +1,115 @@
 <!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>
-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
-			.my-tab-view-pull{padding: 10px 0;}
-			.my-table-view-cell{margin: 0 15px 10px 15px;background: #61cfe7;padding: 10px;border-radius: 5px;position: relative;}
-			.my-table-view-cell p,.my-table-view-cell a{color: #fff !important;}
-			.my-right-center{position: absolute;right: 10px;top: 50%;-webkit-transform: translateY(-50%);}
-			.yuan{border-radius: 50%;border: 3px solid #8ddbed;}
-			.mui-media-object{width: 60px !important;height: 60px !important;max-width: 60px !important;}
-			.mui-media-body{padding-top: 10px;}
-		</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>
-		<!--下拉刷新容器开始-->
-		<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>
+<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>
+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
+		.my-tab-view-pull{padding: 10px 0;}
+		.my-table-view-cell{margin: 0 15px 10px 15px;background: #61cfe7;padding: 10px;border-radius: 5px;position: relative;}
+		.my-table-view-cell p,.my-table-view-cell a{color: #fff !important;}
+		.my-right-center{position: absolute;right: 10px;top: 50%;-webkit-transform: translateY(-50%);}
+		.yuan{border-radius: 50%;border: 3px solid #8ddbed;}
+		.mui-media-object{width: 60px !important;height: 60px !important;max-width: 60px !important;}
+		.mui-media-body{padding-top: 10px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</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.init({
-				pullRefresh: {
-					container: '#pullrefresh',
-					down: {
-						//callback: pulldownRefresh
-					},
-					up: {
-						contentrefresh: '正在加载...',
-						callback: pullupRefresh
-					}
-				}
-			});
-	       var pageNumber = 0,pagesize = 10;
-			/**
-			 * 上拉加载具体业务实现
-			 */
-			function pullupRefresh() {
-				++pageNumber;
-				$.ajax(base_path + '/giftCard/card/beRefereesList?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 xiaxian_data = [];
-							xiaxian_data = dt.data;	
-							mui('#pullrefresh').pullRefresh().endPullupToRefresh(xiaxian_data.length < pagesize);
-							var table = document.body.querySelector('.my-tab-view-pull');
-							mui(xiaxian_data).each(function(index) {
-								var li = document.createElement('li');
-								var status='未付款';
-								li.className = 'my-table-view-cell';
-								 if(typeof(this.payStatus) == "undefined"){
-									 status='未付款';
-								 }else{
-									 if(this.payStatus==2){
-										 status='已付款';
-									 }else{
-										 status='未付款';
-									 }
-								 }
-								li.innerHTML = '<a><img class="mui-media-object yuan mui-pull-left" src="'+this.agentHead+'"><div class="mui-media-body">'+decodeURI(this.agentNickname)+'<p class="mui-ellipsis">'+formatDate(this.agentCreateTime)+'</p></div><span class="my-right-center">'+status+'</span></a>';
-								table.appendChild(li)	
-							})
-						} else {
-							mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						console.log(xhr)
-					}
-				})
-			}
-	mui.ready(function(){
-		document.querySelector('.loading-bg').style.display='none';
-		//页面首次加载时拉取一次数据
-		mui('#pullrefresh').pullRefresh().pullupLoading();
-	});	
-		</script>
-	</body>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<!--下拉刷新容器开始-->
+<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">
+    mui.init({
+        pullRefresh: {
+            container: '#pullrefresh',
+            down: {
+                //callback: pulldownRefresh
+            },
+            up: {
+                contentrefresh: '正在加载...',
+                callback: pullupRefresh
+            }
+        }
+    });
+    var pageNumber = 0,pagesize = 10;
+    /**
+     * 上拉加载具体业务实现
+     */
+    function pullupRefresh() {
+        ++pageNumber;
+        mui.ajax(base_path + '/giftCard/card/beRefereesList?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 xiaxian_data = [];
+                    xiaxian_data = dt.data;
+                    mui('#pullrefresh').pullRefresh().endPullupToRefresh(xiaxian_data.length < pagesize);
+                    var table = document.body.querySelector('.my-tab-view-pull');
+                    mui(xiaxian_data).each(function(index) {
+                        var li = document.createElement('li');
+                        var status='未付款';
+                        li.className = 'my-table-view-cell';
+                        if(typeof(this.payStatus) == "undefined"){
+                            status='未付款';
+                        }else{
+                            if(this.payStatus==2){
+                                status='已付款';
+                            }else{
+                                status='未付款';
+                            }
+                        }
+                        li.innerHTML = '<a><img class="mui-media-object yuan mui-pull-left" src="'+this.agentHead+'"><div class="mui-media-body">'+decodeURI(this.agentNickname)+'<p class="mui-ellipsis">'+formatDate(this.agentCreateTime)+'</p></div><span class="my-right-center">'+status+'</span></a>';
+                        table.appendChild(li)
+                    })
+                } else {
+                    mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    }
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+        //页面首次加载时拉取一次数据
+        mui('#pullrefresh').pullRefresh().pullupLoading();
+    });
+</script>
+</body>
 </html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 197 - 203
watero-wechat-web/src/main/webapp/view/gift_card_exchange_details.html


+ 69 - 69
watero-wechat-web/src/main/webapp/view/gift_card_exchange_win.html

@@ -1,80 +1,80 @@
 <!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:25px 0;background:url(/watero/images/shop/gift-card-tit-bg3.png) top center /100% no-repeat #71d8ec;}
-			.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{display:none;}
-			.mui-icon-checkmarkempty{font-size:50px;border:2px solid #fff;border-radius: 50%;}
-			.my-btn-line{border: 1px solid #71d8ec; background: transparent;color: #71d8ec;padding: 5px 10px;}
-		</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>
+		.tips{padding-bottom: 65px;}
+		.gift-card-title{padding:25px 0;background:url(//s.iamberry.com/watero/images/shop/gift-card-tit-bg3.png) top center /100% no-repeat #71d8ec;}
+		.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{display:none;}
+		.mui-icon-checkmarkempty{font-size:50px;border:2px solid #fff;border-radius: 50%;}
+		.my-btn-line{border: 1px solid #71d8ec; background: transparent;color: #71d8ec;padding: 5px 10px;}
+	</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">
-					<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>
-					<li class="mui-table-view-cell mui-text-center">兑换成功</li>
-					</ul>
-				<ul class="mui-table-view mui-text-center">
-				<li class="mui-table-view-cell">
+<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>
+			<li class="mui-table-view-cell mui-text-center">兑换成功</li>
+		</ul>
+		<ul class="mui-table-view mui-text-center">
+			<li class="mui-table-view-cell">
 				兑换时间:<span class="new-time">1900-01-01  00:00:00</span><br/><h6>(可再次扫描礼品卡上二维码,查询兑换信息)</h6>
-				</li>
-				<li class="mui-table-view-cell">
+			</li>
+			<li class="mui-table-view-cell">
 				<button type="button" class="my-btn-line" id="go-exchange-details">查看兑换详情</button>
-				</li>
-				<li class="mui-table-view-cell">
-				<image width="50%" src="/watero/wateroimages/shop/gift-card-2wm.png" />
-				</li>
-				<li class="mui-table-view-cell mui-text-left">
+			</li>
+			<li class="mui-table-view-cell">
+				<image width="50%" src="//s.iamberry.com/watero/images/shop/gift-card-2wm.png" />
+			</li>
+			<li class="mui-table-view-cell mui-text-left">
 				<div style="margin-left:5%;font-size:12px;color:#8f8f94;">1.长按识别二维码关注watero水时代<br/>
-				2.公众号回复“礼品卡”,即可查看兑换物流信息<br/>
-				3.享受watero水时代完善的产品售后服务</div>
-				</li>
-				</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>
+					2.公众号回复“礼品卡”,即可查看兑换物流信息<br/>
+					3.享受watero水时代完善的产品售后服务</div>
+			</li>
+		</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">
-	mui.ready(function(){
-		$(".new-time").text(formatDate(new Date()));
-		document.querySelector('.loading-bg').style.display='none';
-	});
-	mui('body').on('tap', '#go-exchange-details', function() {
-		mui.openWindow({
-			url: base_path + '/giftCard/card/exchangeUI'
-		});
-	});
+    mui.ready(function(){
+        $(".new-time").text(formatDate(new Date()));
+        document.querySelector('.loading-bg').style.display='none';
+    });
+    mui('body').on('tap', '#go-exchange-details', function() {
+        mui.openWindow({
+            url: base_path + '/giftCard/card/exchangeUI'
+        });
+    });
 </script>
 </body>
 </html>

+ 236 - 242
watero-wechat-web/src/main/webapp/view/gift_card_get_give.html

@@ -1,257 +1,251 @@
 <!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;}
-.icon-fuxuankuang a {color: #24cae9;text-decoration: underline;}
-.icon-daifahuo, .icon-lease2, .icon-jiage, .icon-lipin {font-size: 15px;padding-left: 22px;}
-.icon-fuxuankuang {font-size: 12px;padding: 5px 5px 5px 22px;}
-.icon-fuxuankuang:before {font-size: 14px;margin-top: 5px;margin-right: 3px;}
-.icon-daifahuo:before, .icon-lease2:before, .icon-jiage:before,
-.icon-lipin:before {font-size: 19px;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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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:not (.mui-btn ){margin: -15px -15px;}
-.mui-table-view-cell>a .mui-pull-right {color: #999;font-size: 14px;}
-#btn_submit {color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
-.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;}
-.tips {padding-bottom: 65px;}
-.gift-card-title {padding-top: 70px;background: url(/watero/images/shop/gift-card-tit-bg2.png) top center/100% no-repeat #71d8ec;}
-.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.mui-collapse .mui-collapse-content {background: #71d8ec;}
-.accordion {float: right;margin: 2px 15px 0 0;font-size: 12px;color: #fff;}
-.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;}
-.my-div {padding: 5px 0;border-bottom: 1px solid rgba(0, 0, 0, .1);margin-bottom: 5px;}
-.mui-h5, h5 { margin-left: 30px;}
-</style>
-<script>
-	// 屏蔽分享
-	window.hiddenAllWechatMenu = true;
-</script>
+	<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;}
+		h3 {margin-top: 5px;margin-bottom: 0;}
+		.icon-fuxuankuang a {color: #24cae9;text-decoration: underline;}
+		.icon-daifahuo, .icon-lease2, .icon-jiage, .icon-lipin {font-size: 15px;padding-left: 22px;}
+		.icon-fuxuankuang {font-size: 12px;padding: 5px 5px 5px 22px;}
+		.icon-fuxuankuang:before {font-size: 14px;margin-top: 5px;margin-right: 3px;}
+		.icon-daifahuo:before, .icon-lease2:before, .icon-jiage:before,
+		.icon-lipin:before {font-size: 19px;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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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:not (.mui-btn ){margin: -15px -15px;}
+		.mui-table-view-cell>a .mui-pull-right {color: #999;font-size: 14px;}
+		#btn_submit {color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
+		.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;}
+		.tips {padding-bottom: 65px;}
+		.gift-card-title {padding-top: 70px;background: url(//s.iamberry.com/watero/images/shop/gift-card-tit-bg2.png) top center/100% no-repeat #71d8ec;}
+		.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.mui-collapse .mui-collapse-content {background: #71d8ec;}
+		.accordion {float: right;margin: 2px 15px 0 0;font-size: 12px;color: #fff;}
+		.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;}
+		.my-div {padding: 5px 0;border-bottom: 1px solid rgba(0, 0, 0, .1);margin-bottom: 5px;}
+		.mui-h5, h5 { margin-left: 30px;}
+	</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="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">您已成功推荐一位代理商,获赠价值¥3680水机一台</li>
-				<li class="mui-table-view-cell mui-text-left mui-collapse"></li>
-			</ul>
-			<div class="mui-content-padded">
-				<div class="my-div">
-					<span class="iconfont icon-lipin">选择赠品</span>
-				</div>
-				<div class="mui-h6">产品名称:美国watero净饮水一体机</div>
-				<div class="mui-h6">产品数量:1台</div>
-				<form class="mui-input-group">
-					<div style="display: table; width: 100%; padding: 10px 0;">
-						<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">您已成功推荐一位代理商,获赠价值¥3680水机一台</li>
+			<li class="mui-table-view-cell mui-text-left mui-collapse"></li>
+		</ul>
+		<div class="mui-content-padded">
+			<div class="my-div">
+				<span class="iconfont icon-lipin">选择赠品</span>
+			</div>
+			<div class="mui-h6">产品名称:美国watero净饮水一体机</div>
+			<div class="mui-h6">产品数量:1台</div>
+			<form class="mui-input-group">
+				<div style="display: table; width: 100%; padding: 10px 0;">
+					<div
 							style="display: table-cell; width: 20%; vertical-align: middle;">
-							选择颜色:</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>
+						选择颜色:</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>
-				</form>
-			</div>
-			<div class="my-div">
-					<span class="iconfont icon-lease2">收货信息</span>
 				</div>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
-						收货地址<span class="mui-h5">请选择收货地址</span>
-						<!-- <ul class="ft-12" style="color: #333;">
-							<li>收  货  人:林林</li>
-							<li>手 机 号:15999999999</li>
-							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
-						</ul> -->
-						</a>	
-					</li>
-				</ul>
-		</div>
+			</form>
 		</div>
-		<div class="buy-footer">
-		<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" disabled="disabled">确认领取</button>
+		<div class="my-div">
+			<span class="iconfont icon-lease2">收货信息</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 type="text/javascript">
-			var check = false, alert_msg = '';
-			var agentMachineId =getParam("agentMachineId"); 
-			mui.ready(function(){
-				$.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
-					data: {"agentMachineId":agentMachineId},
-                    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.returnCode=="200" && dt.resultCode=="200"){
-							if (typeof(dt.returnMsg.msg) != "undefined"){
-							if(dt.returnMsg.msg==2){
-								mui.alert("已经领取过,请在赠品订单列表查看",'',function(){
-									 mui.openWindow({url: '/watero/view/gift_card_give_order_list.html'})
-								});
-							}
-							}
-							var table = document.body.querySelector('.ul_radio');
-							mui(dt.returnMsg.colors).each(function(index) {
-								var li = document.createElement('li');
-								if(index==0){
-									li.className ='radio'+this.colorId+' active';
-								}else{
-									li.className ='radio'+this.colorId;
-								}
-								li.setAttribute("id",this.colorId);
-								table.appendChild(li);
-							});
-							$(".ul_radio li").each(function() {
-								$(this).on("click", function() {
-									$(this).addClass("active");
-									$(this).siblings().removeClass("active");
-								});
-							});
-							document.querySelector('.loading-bg').style.display='none';
-						}else{
-							mui.alert(dt.resultMsg);
-						}
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						console.log(xhr)
-					}
-				});
-			});
-			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;
-						$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-						$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-					},
-					function() {
-						if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-							wechatAddr.status = true;
-							$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-						} else {
-							wechatAddr.status = false;
-							// 用户取消拉出地址
-							$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-							mui.alert("您没有选择收货地址!");
-						}
-					}
-				);
+		<ul class="mui-table-view">
+			<li class="mui-table-view-cell">
+				<a class="mui-navigate-right" id="open-wechat-addres-a">
+					收货地址<span class="mui-h5">请选择收货地址</span>
+					<!-- <ul class="ft-12" style="color: #333;">
+                        <li>收  货  人:林林</li>
+                        <li>手 机 号:15999999999</li>
+                        <li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
+                    </ul> -->
+				</a>
+			</li>
+		</ul>
+	</div>
+</div>
+<div class="buy-footer">
+	<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" disabled="disabled">确认领取</button>
+</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?v=201706001"></script>
+<script type="text/javascript">
+    var check = false, alert_msg = '';
+    var agentMachineId =getParam("agentMachineId");
+    mui.ready(function(){
+        mui.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
+            data: {"agentMachineId":agentMachineId},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.returnCode=="200" && dt.resultCode=="200"){
+                        if (typeof(dt.returnMsg.msg) != "undefined"){
+                            if(dt.returnMsg.msg==2){
+                                mui.alert("已经领取过,请在赠品订单列表查看",'',function(){
+                                    mui.openWindow({url: '/watero/view/gift_card_give_order_list.html'})
+                                });
+                            }
+                        }
+                        var table = document.body.querySelector('.ul_radio');
+                        mui(dt.returnMsg.colors).each(function(index) {
+                            var li = document.createElement('li');
+                            if(index==0){
+                                li.className ='radio'+this.colorId+' active';
+                            }else{
+                                li.className ='radio'+this.colorId;
+                            }
+                            li.setAttribute("id",this.colorId);
+                            table.appendChild(li);
+                        });
+                        $(".ul_radio li").each(function() {
+                            $(this).on("click", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        document.querySelector('.loading-bg').style.display='none';
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        });
+    });
+    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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                    $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                    mui.alert("您没有选择收货地址!");
+                }
+            }
+        );
 
-			});
-			mui('body').on('tap','#btn_submit',function() {
-				if(wechatAddr.status){
-					mui(this).button('loading');
-					var param = {
-							"agentMachineColorId":$(".ul_radio .active").attr("id"),
-							"agentMachineId": agentMachineId,
-							"agentMachineAddressInfo": address,
-							"agentMachineAddressName":nickname,
-							"agentMachineAddressTel":ads_tel ,
-						};
-					$.ajax({
-						type: 'post',
-                        xhrFields: {
-                            withCredentials: true
-                        },
-						url: base_path+'/giftCard/card/updateAgentMachine?dates=' + new Date().getTime(),
-						data:param,
-						dataType: 'json',
-						timeout: 15000,
-						success: function(dt) {
-							//console.log(dt);
-							if(dt.resultCode=="200" && dt.returnCode=="200") {						 
-								 mui.openWindow({url: '/watero/view/gift_card_give_order_list.html'})
-							} else {
-								mui(th).button('reset');
-								mui.alert(dt.returnMsg);
-							}
-						},
-						error: function(xhr, type, errorThrown) {
-							//异常处理;
-							console.log(xhr);
-							mui.alert("请检查网络或刷新页面重试!");
-							mui(th).button('reset');
-						}
-					});
-				}else{
-					mui.alert("请选择收货信息");
-				}
-			});
-		</script>
+    });
+    mui('body').on('tap','#btn_submit',function() {
+        if(wechatAddr.status){
+            mui(this).button('loading');
+            var param = {
+                "agentMachineColorId":$(".ul_radio .active").attr("id"),
+                "agentMachineId": agentMachineId,
+                "agentMachineAddressInfo": address,
+                "agentMachineAddressName":nickname,
+                "agentMachineAddressTel":ads_tel ,
+            };
+            $.ajax({
+                type: 'post',
+                url: base_path+'/giftCard/card/updateAgentMachine?dates=' + new Date().getTime(),
+                data:param,
+                dataType: 'json',
+                timeout: 15000,
+                success: function(dt) {
+                    //console.log(dt);
+                    if(dt.resultCode=="200" && dt.returnCode=="200") {
+                        mui.openWindow({url: '/watero/view/gift_card_give_order_list.html'})
+                    } else {
+                        mui(th).button('reset');
+                        mui.alert(dt.returnMsg);
+                    }
+                },
+                error: function(xhr, type, errorThrown) {
+                    //异常处理;
+                    console.log(xhr);
+                    mui.alert("请检查网络或刷新页面重试!");
+                    mui(th).button('reset');
+                }
+            });
+        }else{
+            mui.alert("请选择收货信息");
+        }
+    });
+</script>
 </body>
 </html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 161 - 164
watero-wechat-web/src/main/webapp/view/gift_card_give_order_list.html


+ 75 - 75
watero-wechat-web/src/main/webapp/view/gift_card_go_agent.html

@@ -1,89 +1,89 @@
 <!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:55px 0;background: url(/watero/images/shop/gift-card-tit3-bg.jpg) top center /100% auto no-repeat #71d8ec;}
-.my-btn-exchange{border: 1px solid rgba(66,199,244,.5)  !important;text-align: center;height: 48px !important;width:90% !important;margin-left:5%;}
-#btn_submit{padding:7px 0 !important;background: #e3ecee;border: 0;color: #fff;}
-.my-footer{position: fixed;text-align: center;width: 100%;left: 0; bottom: 0;padding: 10px 0;font-size:12px;color:#c5c5c5;}
-#btn_submit.my-active{background:#6fd7eb;}
-</style>
-<script>
-	// 屏蔽分享
-	window.hiddenAllWechatMenu = true;
-</script>
+	<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:55px 0;background: url(//s.iamberry.com/watero/images/shop/gift-card-tit3-bg.jpg) top center /100% auto no-repeat #71d8ec;}
+		.my-btn-exchange{border: 1px solid rgba(66,199,244,.5)  !important;text-align: center;height: 48px !important;width:90% !important;margin-left:5%;}
+		#btn_submit{padding:7px 0 !important;background: #e3ecee;border: 0;color: #fff;}
+		.my-footer{position: fixed;text-align: center;width: 100%;left: 0; bottom: 0;padding: 10px 0;font-size:12px;color:#c5c5c5;}
+		#btn_submit.my-active{background:#6fd7eb;}
+	</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="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-left mui-collapse"></li>
-			</ul>
-			<div style="margin: 90px 13% 80px 13%;">
-					<input type="tel" value="" placeholder="请输入暗号" maxlength="6" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
-					<br/><br/>
-					<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined" id="btn_submit" disabled="disabled">确认</button>
-			</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-left mui-collapse"></li>
+		</ul>
+		<div style="margin: 90px 13% 80px 13%;">
+			<input type="tel" value="" placeholder="请输入暗号" maxlength="6" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
+			<br/><br/>
+			<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined" id="btn_submit" disabled="disabled">确认</button>
 		</div>
 	</div>
-	<div class="my-footer">
+</div>
+<div class="my-footer">
 	深圳爱贝源科技有限公司<br/>400-8006692
-	</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">
-		var code='031552';
-			mui.ready(function(){
-				document.querySelector('.loading-bg').style.display='none';
-			});
-			mui.os.ios ? listener_ipt() : keyup_fn();
+</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 code='031552';
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+    });
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-			function keyup_fn() {
-				$('body').on('keyup', '#ipt-exchange', function(e) {
-						//传参数并加载数据
-						var str = $.trim($('#ipt-exchange').val());
-						if(str==code){
-							$("#btn_submit").addClass("my-active").removeAttr("disabled");
-						}else{
-							$("#btn_submit").removeClass("my-active").prop("disabled","disabled");
-						}
-				});
-			}
+    function keyup_fn() {
+        $('body').on('keyup', '#ipt-exchange', function(e) {
+            //传参数并加载数据
+            var str = $.trim($('#ipt-exchange').val());
+            if(str==code){
+                $("#btn_submit").addClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").removeClass("my-active").prop("disabled","disabled");
+            }
+        });
+    }
 
-			function listener_ipt() {
-				document.getElementById('ipt-exchange').onblur = function() {
-					//传参数并加载数据
-					var str = $.trim($('#ipt-exchange').val());
-					if(str==code){
-						$("#btn_submit").addClass("my-active").removeAttr("disabled");
-					}else{
-						$("#btn_submit").removeClass("my-active").prop("disabled","disabled");
-					}
-				}
-			}
-			mui('body').on('tap','#btn_submit',function() {
-				if($.trim($('#ipt-exchange').val())==code){
-				mui.openWindow({url: '/watero/view/gift_card_to_agent.html'})
-				}
-			});
-		</script>
+    function listener_ipt() {
+        document.getElementById('ipt-exchange').onblur = function() {
+            //传参数并加载数据
+            var str = $.trim($('#ipt-exchange').val());
+            if(str==code){
+                $("#btn_submit").addClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").removeClass("my-active").prop("disabled","disabled");
+            }
+        }
+    }
+    mui('body').on('tap','#btn_submit',function() {
+        if($.trim($('#ipt-exchange').val())==code){
+            mui.openWindow({url: '/watero/view/gift_card_to_agent.html'})
+        }
+    });
+</script>
 </body>
 </html>

+ 470 - 479
watero-wechat-web/src/main/webapp/view/gift_card_renew_agent.html

@@ -1,504 +1,495 @@
 <!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;}
-			.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
-			.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin,.icon-lease1,.icon-jiage{font-size: 15px;padding-left: 22px;}
-			.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
-			.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
-			.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before,.icon-lease1:before,.icon-jiage:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-			.try_price{color: #f1436c;}
-			.ul_radio{width: 100%;text-align: left;}
-			.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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;}
-			#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
-			.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-			#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
-			.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;}
-			.tips{padding-bottom: 85px;}
-			
-			.gift-card-title{padding-top:70px;background:url(/watero/images/shop/gift-card-tit2-bg.jpg) top center /100% no-repeat #71d8ec;}
-			.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
-			.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
-			.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;}
-			.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
-			.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
-			.mui-h6, h6 {padding: 5px 0;}
-			.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;font-size: 14px;}
-		</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;}
+		h3{margin-top:5px;margin-bottom: 0;}
+		.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
+		.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin,.icon-lease1,.icon-jiage{font-size: 15px;padding-left: 22px;}
+		.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
+		.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
+		.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before,.icon-lease1:before,.icon-jiage:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.try_price{color: #f1436c;}
+		.ul_radio{width: 100%;text-align: left;}
+		.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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;}
+		#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
+		.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;}
+		.tips{padding-bottom: 85px;}
+
+		.gift-card-title{padding-top:70px;background:url(//s.iamberry.com/watero/images/shop/gift-card-tit2-bg.jpg) top center /100% no-repeat #71d8ec;}
+		.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
+		.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
+		.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;}
+		.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
+		.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
+		.mui-h6, h6 {padding: 5px 0;}
+		.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;font-size: 14px;}
+	</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">
-					<ul class="mui-table-view gift-card-title">
-					<li class="mui-table-view-cell mui-text-center">代理费用:10000元</li>
-					<li class="mui-table-view-cell mui-text-left mui-collapse">
-						<a class="mui-navigate-right" id="mui-navigate-right"><span class="iconfont icon-quanyizhanshi"></span> 尊享权益<span class="accordion">详情</span></a>
-						<div class="mui-collapse-content">
-							<ul class="ft-12">
-								<li>1.将获赠价值3680元的美国watero净水机一台。</li>
-								<li>2.将获得8张提货卡(每张可兑换一台美国watero净水机)</li>
-								<li>3.成功推荐其他人成为代理商,可获赠一台美国watero净水机</li>
-								<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
-							</ul>
-						</div>
-					</li>
+<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">代理费用:10000元</li>
+			<li class="mui-table-view-cell mui-text-left mui-collapse">
+				<a class="mui-navigate-right" id="mui-navigate-right"><span class="iconfont icon-quanyizhanshi"></span> 尊享权益<span class="accordion">详情</span></a>
+				<div class="mui-collapse-content">
+					<ul class="ft-12">
+						<li>1.将获赠价值3680元的美国watero净水机一台。</li>
+						<li>2.将获得8张提货卡(每张可兑换一台美国watero净水机)</li>
+						<li>3.成功推荐其他人成为代理商,可获赠一台美国watero净水机</li>
+						<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
 					</ul>
-				<div class="mui-content-padded">
-				<div>
-					<span class="iconfont icon-lease1">代理商信息</span>
 				</div>
-				<form class="mui-input-group">
-				    <div class="mui-input-row">
-						<label>您的姓名</label>
-						<input type="text" maxlength="10" 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>
-				</form>
-				<div class="my-div">
-					<span class="iconfont icon-lipin">选择赠品</span>
+			</li>
+		</ul>
+		<div class="mui-content-padded">
+			<div>
+				<span class="iconfont icon-lease1">代理商信息</span>
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>您的姓名</label>
+					<input type="text" maxlength="10" 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>
+			</form>
+			<div class="my-div">
+				<span class="iconfont icon-lipin">选择赠品</span>
+			</div>
+			<div class="mui-h6">
+				产品名称:美国watero净饮水一体机
+			</div>
+			<div class="mui-h6">
+				产品数量:1台
+			</div>
+			<form class="mui-input-group">
+				<div style="display: table;width: 100%;padding: 10px 0;">
+					<div style="display: table-cell;width: 20%;vertical-align: middle;font-size: 12px;font-weight: 400;color: #8f8f94;">选择颜色:</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 class="mui-h6">
-					产品名称:美国watero净饮水一体机
+				</div>
+				<div class="my-div">
+					<span class="iconfont icon-daifahuo">提货卡</span>
 				</div>
 				<div class="mui-h6">
-					产品数量:1台
+					美国watero净饮水一体机提货卡<span class="mui-pull-right cl-red">X8张</span>
 				</div>
-				<form class="mui-input-group">
-					<div style="display: table;width: 100%;padding: 10px 0;">
-						<div style="display: table-cell;width: 20%;vertical-align: middle;font-size: 12px;font-weight: 400;color: #8f8f94;">选择颜色:</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 class="my-div">
-						<span class="iconfont icon-daifahuo">提货卡</span>
-					</div>
-					<div class="mui-h6">
-						美国watero净饮水一体机提货卡<span class="mui-pull-right cl-red">X8张</span>
-					</div>
-				</form>
-<!-- 				<div class="my-div">
-					<span class="iconfont icon-lease2">收货信息</span>
-				</div> -->
-				<ul class="mui-table-view" style="padding-top: 15px;">
-					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
+			</form>
+			<!-- 				<div class="my-div">
+                                <span class="iconfont icon-lease2">收货信息</span>
+                            </div> -->
+			<ul class="mui-table-view" style="padding-top: 15px;">
+				<li class="mui-table-view-cell">
+					<a class="mui-navigate-right" id="open-wechat-addres-a">
 						<span class="iconfont icon-lease2">收货信息</span><span class="mui-h5">请选择收货地址</span>
 						<!-- <ul class="ft-12" style="color: #333;">
 							<li>收  货  人:林林</li>
 							<li>手 机 号:15999999999</li>
 							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
 						</ul> -->
-						</a>	
-					</li>
-				</ul>
-				 <div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
-					<span class="iconfont icon-jiage">抵扣密码</span>
-				</div>
-				<div>
-					<input type="text" value="" placeholder="请输入抵扣密码" maxlength="12" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
-					<br/>
-					<span class="mui-h5">说明:如你已经线下支付并已获得抵扣密码,输入即可!</span>
-				</div> 
-				<ul class="mui-table-view">
-				<li style="padding:20px 10px 0px 10px;text-align: center;">
-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero代理说明》</a></span>
-					</li>
-				</ul>
-				</div>
-					
-				<div class="mui-text-center">
-					支付金额:<span class="cl-red" id="pay_price">¥10000</span>
-				</div>
+					</a>
+				</li>
+			</ul>
+			<div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
+				<span class="iconfont icon-jiage">抵扣密码</span>
 			</div>
+			<div>
+				<input type="text" value="" placeholder="请输入抵扣密码" maxlength="12" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
+				<br/>
+				<span class="mui-h5">说明:如你已经线下支付并已获得抵扣密码,输入即可!</span>
 			</div>
-			<div class="buy-footer">
-				<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" disabled="disabled">立即支付</button>
-			</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>
+			<ul class="mui-table-view">
+				<li style="padding:20px 10px 0px 10px;text-align: center;">
+					<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero代理说明》</a></span>
+				</li>
+			</ul>
+		</div>
+
+		<div class="mui-text-center">
+			支付金额:<span class="cl-red" id="pay_price">¥10000</span>
+		</div>
+	</div>
+</div>
+<div class="buy-footer">
+	<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" disabled="disabled">立即支付</button>
+</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">
-//wechatAddr.status=true;
-	var check = false,alert_msg='';
-	var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
-	var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
-	var dcode=/^[A-Z]{1}[0-9]{11}$/; //12位抵扣密码
-	var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
-	mui.ready(function(){
-		$.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
+    //wechatAddr.status=true;
+    var check = false,alert_msg='';
+    var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
+    var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
+    var dcode=/^[A-Z]{1}[0-9]{11}$/; //12位抵扣密码
+    var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
+    mui.ready(function(){
+        mui.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.returnCode=="200" && dt.resultCode=="200"){
+                        if (dt.returnMsg.agentInfo == null){
+                            mui.openWindow({url:'/watero/view/gift_card_to_agent.html'})
+                        }
+                        $("#ipt-name").val(decodeURI(dt.returnMsg.agentInfo.agentNickname));
+                        $("#ipt-phone").val(dt.returnMsg.agentInfo.agentTel);
+                        var table = document.body.querySelector('.ul_radio');
+                        mui(dt.returnMsg.colors).each(function(index) {
+                            var li = document.createElement('li');
+                            if(index==0){
+                                li.className ='radio'+this.colorId+' active';
+                            }else{
+                                li.className ='radio'+this.colorId;
+                            }
+                            li.setAttribute("id",this.colorId);
+                            li.setAttribute("name",this.colorProductId);
+                            table.appendChild(li);
+                        });
+                        $(".ul_radio li").each(function() {
+                            $(this).on("tap", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        document.querySelector('.loading-bg').style.display='none';
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				//console.log(dt);
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-				if(dt.returnCode=="200" && dt.resultCode=="200"){
-					if (dt.returnMsg.agentInfo == null){
-						mui.openWindow({url:'/watero/view/gift_card_to_agent.html'})
-					}
-					$("#ipt-name").val(decodeURI(dt.returnMsg.agentInfo.agentNickname));
-					$("#ipt-phone").val(dt.returnMsg.agentInfo.agentTel);	
-					var table = document.body.querySelector('.ul_radio');
-					mui(dt.returnMsg.colors).each(function(index) {
-						var li = document.createElement('li');
-						if(index==0){
-							li.className ='radio'+this.colorId+' active';
-						}else{
-							li.className ='radio'+this.colorId;
-						}
-						li.setAttribute("id",this.colorId);
-						li.setAttribute("name",this.colorProductId);
-						table.appendChild(li);
-					});
-					$(".ul_radio li").each(function() {
-						$(this).on("tap", function() {
-							$(this).addClass("active");
-							$(this).siblings().removeClass("active");
-						});
-					});
-					document.querySelector('.loading-bg').style.display='none';
-				}else{
-					mui.alert(dt.resultMsg);
-				}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		});
-	});
-	mui('body').on('tap', '#btn_submit', function() {
-		change_input();
-		var th=this;
-		if(check){
-				if(isPay) {
-				isPay = false; // 锁定请求按钮
-				mui(this).button('loading');
-				var param = {
-						"agentMachineColorId":$(".ul_radio .active").attr("id"),
-						"agentMachineProductId": $(".ul_radio .active").attr("name"),
-						"agentMachineAddressInfo": address,
-						"agentMachineAddressName": nickname,
-						"agentMachineAddressTel":ads_tel,
-						"agentNickname":encodeURI($("#ipt-name").val().trim()),
-						"agentTel":$("#ipt-phone").val().trim(),
-						"payPassword":$("#ipt-exchange").val().trim(),
-					};
-				$.ajax({
-                    xhrFields: {
-                        withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        });
+    });
+    mui('body').on('tap', '#btn_submit', function() {
+        change_input();
+        var th=this;
+        if(check){
+            if(isPay) {
+                isPay = false; // 锁定请求按钮
+                mui(this).button('loading');
+                var param = {
+                    "agentMachineColorId":$(".ul_radio .active").attr("id"),
+                    "agentMachineProductId": $(".ul_radio .active").attr("name"),
+                    "agentMachineAddressInfo": address,
+                    "agentMachineAddressName": nickname,
+                    "agentMachineAddressTel":ads_tel,
+                    "agentNickname":encodeURI($("#ipt-name").val().trim()),
+                    "agentTel":$("#ipt-phone").val().trim(),
+                    "payPassword":$("#ipt-exchange").val().trim(),
+                };
+                $.ajax({
+                    type: 'post',
+                    url: '/watero/pay/pay_agent_renewal?dates=' + new Date().getTime(),
+                    data: param,
+                    dataType: 'json',
+                    timeout: 15000,
+                    success: function(dt) {
+                        //console.log(dt);
+                        if($("#ipt-exchange").val().trim()!=''){
+                            if(dt.status && dt.data.success) {
+                                mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
+                            }else{
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.data.info);
+                            }
+                        }else{
+                            if(dt.status) {
+                                var obj = JSON.parse("{" + dt.data.info + "}");
+                                WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                                    if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                        $.ajax({
+                                            type: 'post',
+                                            url: base_path+'/agent_pay/check_agent_pay_success',
+                                            data: {"orderId":dt.data.orderId},
+                                            dataType: 'json',
+                                            timeout: 15000,
+                                            success: function(data) {
+                                                //console.log(data);
+                                                if(data.status) {
+                                                    if(data.data==2){
+                                                        mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
+                                                    }else{
+                                                        mui.alert('如果已支付,请等待同步支付状态!', '', 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');
+                                                isPay = true;
+                                                mui.alert("请检查网络或刷新页面重试!");
+                                            }
+                                        });
+                                    } else {
+                                        isPay = true;
+                                        mui(th).button('reset');
+                                        mui.alert("对不起,支付失败!请稍后重试!");
+                                    }
+                                });
+                            } else {
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.returnMsg);
+                            }
+                        }
                     },
-					type: 'post',
-					url: '/watero/pay/pay_agent_renewal?dates=' + new Date().getTime(),
-					data: param,
-					dataType: 'json',
-					timeout: 15000,
-					success: function(dt) {
-						//console.log(dt);
-						if($("#ipt-exchange").val().trim()!=''){
-							if(dt.status && dt.data.success) {
-								mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
-							}else{
-								mui(th).button('reset');
-								isPay = true;
-								mui.alert(dt.data.info);
-							}
-						}else{
-						if(dt.status) {
-							var obj = JSON.parse("{" + dt.data.info + "}");
-							WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-								if(res.err_msg == 'get_brand_wcpay_request:ok') {
-									$.ajax({
-                                        xhrFields: {
-                                            withCredentials: true
-                                        },
-										type: 'post',
-										url: base_path+'/agent_pay/check_agent_pay_success',
-										data: {"orderId":dt.data.orderId},
-										dataType: 'json',
-										timeout: 15000,
-										success: function(data) {
-											//console.log(data);
-											if(data.status) {
-												if(data.data==2){
-													mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
-												}else{
-													mui.alert('如果已支付,请等待同步支付状态!', '', 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');
-											isPay = true;
-											mui.alert("请检查网络或刷新页面重试!");
-										}
-									});
-								} else {
-									isPay = true;
-									mui(th).button('reset');
-									mui.alert("对不起,支付失败!请稍后重试!");
-								}
-							});
-						} else {
-							mui(th).button('reset');
-							isPay = true;
-							mui.alert(dt.returnMsg);
-						}
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						//异常处理;
-						console.log(xhr);
-						mui.alert("请检查网络或刷新页面重试!");
-						mui(th).button('reset');
-						isPay = true;
-					}
-				});
-			}else{
-				mui.alert("正在请求支付中~~请稍后!");
-				return;
-			}
-		}else{
-			mui.alert(alert_msg);
-		}
-	});
-	mui('body').on('tap', '#xieyi-dalog', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_agent_explain.html'
-		});
-	});
-	mui('body').on('tap', '#mui-navigate-right', function() {
-		if(this.parentNode.classList.contains('mui-active')){
-			this.lastChild.innerHTML='详情'
-		}else{
-			this.lastChild.innerHTML='收起'
-			}
-		});
-$(document).on('tap', '#btn-tongyi', function() {
-	var btn_submit=$("#btn_submit");
-	if($(this).hasClass("mui-active")){
-		$(this).removeClass("mui-active");
-		check=true;
-		if(wechatAddr.status){
-			btn_submit.removeClass("mui-active").removeAttr("disabled");
-		}else{
-			btn_submit.addClass("mui-active").prop("disabled","disabled");
-		}
-	}else{
-		check=false;
-		$(this).addClass("mui-active");
-		btn_submit.addClass("mui-active").prop("disabled","disabled");
-	}
-});
-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;
-			$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-			if(check){
-				$(this).removeClass("mui-active");
-				$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-			}
-		},
-		function() {
-			if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-				wechatAddr.status = true;
-			} else {
-				wechatAddr.status = false;
-				// 用户取消拉出地址
-				$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-			}
-		}
-	);
+                    error: function(xhr, type, errorThrown) {
+                        //异常处理;
+                        console.log(xhr);
+                        mui.alert("请检查网络或刷新页面重试!");
+                        mui(th).button('reset');
+                        isPay = true;
+                    }
+                });
+            }else{
+                mui.alert("正在请求支付中~~请稍后!");
+                return;
+            }
+        }else{
+            mui.alert(alert_msg);
+        }
+    });
+    mui('body').on('tap', '#xieyi-dalog', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_agent_explain.html'
+        });
+    });
+    mui('body').on('tap', '#mui-navigate-right', function() {
+        if(this.parentNode.classList.contains('mui-active')){
+            this.lastChild.innerHTML='详情'
+        }else{
+            this.lastChild.innerHTML='收起'
+        }
+    });
+    $(document).on('tap', '#btn-tongyi', function() {
+        var btn_submit=$("#btn_submit");
+        if($(this).hasClass("mui-active")){
+            $(this).removeClass("mui-active");
+            check=true;
+            if(wechatAddr.status){
+                btn_submit.removeClass("mui-active").removeAttr("disabled");
+            }else{
+                btn_submit.addClass("mui-active").prop("disabled","disabled");
+            }
+        }else{
+            check=false;
+            $(this).addClass("mui-active");
+            btn_submit.addClass("mui-active").prop("disabled","disabled");
+        }
+    });
+    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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                if(check){
+                    $(this).removeClass("mui-active");
+                    $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+                }
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                }
+            }
+        );
 
-});
-function change_input() {
-	if($("#btn-tongyi").hasClass("mui-active")){
-		alert_msg="请勾选同意《美国watero代理说明》";
-		check=false;
-		return false;
-	}else{
-		check=true;
-	}
-	if(dcode.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
-		check=true;
-		$("#pay_price").text("¥0");
-	}else{
-		alert_msg="抵扣密码不正确,请重新填写";
-		check=false;
-		$("#pay_price").text("¥10000");
-		return false;
-	}
-	if(wechatAddr.status){
-		check=true;
-	}else{
-		alert_msg="请选择收货地址";
-		check=false;
-		return false;
-	}
-	$(".mui-input-group input").each(function(index) {
-		switch ($(this).attr("id")){
-			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-name":
-				if($(this).val().trim()==""){
-					alert_msg="请填写姓名";
-					check=false;
-					return false;
-				}else{
-					if(uname.test($(this).val().trim())) {
-						check=true;
-					}else{
-						alert_msg="姓名格式不正确,请重新填写";
-						check=false;
-						return false;
-					}
-				}
-				break;
-			default:
-				break;
-		}
-	});
-	if(check) {
-		$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-	}else{
-		$("#btn_submit").addClass("mui-active").prop("disabled","disabled");
-	}
-}
-mui.os.ios ? listener_ipt() : keyup_fn();
+    });
+    function change_input() {
+        if($("#btn-tongyi").hasClass("mui-active")){
+            alert_msg="请勾选同意《美国watero代理说明》";
+            check=false;
+            return false;
+        }else{
+            check=true;
+        }
+        if(dcode.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
+            check=true;
+            $("#pay_price").text("¥0");
+        }else{
+            alert_msg="抵扣密码不正确,请重新填写";
+            check=false;
+            $("#pay_price").text("¥10000");
+            return false;
+        }
+        if(wechatAddr.status){
+            check=true;
+        }else{
+            alert_msg="请选择收货地址";
+            check=false;
+            return false;
+        }
+        $(".mui-input-group input").each(function(index) {
+            switch ($(this).attr("id")){
+                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-name":
+                    if($(this).val().trim()==""){
+                        alert_msg="请填写姓名";
+                        check=false;
+                        return false;
+                    }else{
+                        if(uname.test($(this).val().trim())) {
+                            check=true;
+                        }else{
+                            alert_msg="姓名格式不正确,请重新填写";
+                            check=false;
+                            return false;
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        });
+        if(check) {
+            $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+        }else{
+            $("#btn_submit").addClass("mui-active").prop("disabled","disabled");
+        }
+    }
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-function keyup_fn() {
-	$(document).on('keyup', '#ipt-name', function(e) {
-		change_input();
-			if(check){
-				$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-			}else{
-				$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-			}
-	});
-	$(document).on('keyup', '#ipt-phone', function(e) {
-		change_input();
-			if(check){
-				$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-			}else{
-				$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-			}
-	});
-}
+    function keyup_fn() {
+        $(document).on('keyup', '#ipt-name', function(e) {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        });
+        $(document).on('keyup', '#ipt-phone', function(e) {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        });
+    }
 
-function listener_ipt() {
-	document.getElementById('ipt-name').onblur = function() {
-		change_input();
-		if(check){
-			$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-		}else{
-			$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-		}
-	}
-	document.getElementById('ipt-phone').onblur = function() {
-		change_input();
-		if(check){
-			$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-		}else{
-			$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-		}
-	}
-}
-	</script>
-	</body>
+    function listener_ipt() {
+        document.getElementById('ipt-name').onblur = function() {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        }
+        document.getElementById('ipt-phone').onblur = function() {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        }
+    }
+</script>
+</body>
 </html>

+ 469 - 478
watero-wechat-web/src/main/webapp/view/gift_card_to_agent.html

@@ -1,503 +1,494 @@
 <!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;}
-			.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
-			.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin,.icon-lease1{font-size: 15px;padding-left: 22px;}
-			.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
-			.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
-			.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before,.icon-lease1:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-			.try_price{color: #f1436c;}
-			.ul_radio{width: 100%;text-align: left;}
-			.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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;}
-			#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
-			.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-			#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
-			.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;}
-			.tips{padding-bottom: 85px;}
-			
-			.gift-card-title{padding-top:60px;background:url(/watero/images/shop/gift-card-tit-bg.jpg) top center /100% no-repeat #71d8ec;}
-			.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
-			.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
-			.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;}
-			.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
-			.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
-			.mui-h6, h6 {padding: 5px 0;}
-			.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;font-size: 14px;}
-		</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;}
+		h3{margin-top:5px;margin-bottom: 0;}
+		.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
+		.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin,.icon-lease1{font-size: 15px;padding-left: 22px;}
+		.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
+		.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
+		.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before,.icon-lease1:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.try_price{color: #f1436c;}
+		.ul_radio{width: 100%;text-align: left;}
+		.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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;}
+		#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
+		.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;}
+		.tips{padding-bottom: 85px;}
+
+		.gift-card-title{padding-top:60px;background:url(//s.iamberry.com/watero/images/shop/gift-card-tit-bg.jpg) top center /100% no-repeat #71d8ec;}
+		.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
+		.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
+		.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;}
+		.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
+		.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
+		.mui-h6, h6 {padding: 5px 0;}
+		.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;font-size: 14px;}
+	</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">
-					<ul class="mui-table-view gift-card-title">
-					<li class="mui-table-view-cell mui-text-center">代理费用:10000元</li>
-					<li class="mui-table-view-cell mui-text-left mui-collapse">
-						<a class="mui-navigate-right" id="mui-navigate-right"><span class="iconfont icon-quanyizhanshi"></span> 尊享权益<span class="accordion">详情</span></a>
-						<div class="mui-collapse-content">
-							<ul class="ft-12">
-								<li>1.将获赠价值3680元的美国watero净水机一台。</li>
-								<li>2.将获得8张提货卡(每张可兑换一台美国watero净水机)</li>
-								<li>3.成功推荐其他人成为代理商,可获赠一台美国watero净水机</li>
-								<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
-							</ul>
-						</div>
-					</li>
+<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">代理费用:10000元</li>
+			<li class="mui-table-view-cell mui-text-left mui-collapse">
+				<a class="mui-navigate-right" id="mui-navigate-right"><span class="iconfont icon-quanyizhanshi"></span> 尊享权益<span class="accordion">详情</span></a>
+				<div class="mui-collapse-content">
+					<ul class="ft-12">
+						<li>1.将获赠价值3680元的美国watero净水机一台。</li>
+						<li>2.将获得8张提货卡(每张可兑换一台美国watero净水机)</li>
+						<li>3.成功推荐其他人成为代理商,可获赠一台美国watero净水机</li>
+						<li>4.一年后,未使用的礼品卡每张可兑换成1250元现金。</li>
 					</ul>
-				<div class="mui-content-padded">
-				<div>
-					<span class="iconfont icon-lease1">代理商信息</span>
 				</div>
-				<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>
-				</form>
-				<div class="my-div">
-					<span class="iconfont icon-lipin">选择赠品</span>
+			</li>
+		</ul>
+		<div class="mui-content-padded">
+			<div>
+				<span class="iconfont icon-lease1">代理商信息</span>
+			</div>
+			<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>
+			</form>
+			<div class="my-div">
+				<span class="iconfont icon-lipin">选择赠品</span>
+			</div>
+			<div class="mui-h6">
+				产品名称:美国watero净饮水一体机
+			</div>
+			<div class="mui-h6">
+				产品数量:1台
+			</div>
+			<form class="mui-input-group">
+				<div style="display: table;width: 100%;padding: 10px 0;">
+					<div style="display: table-cell;width: 20%;vertical-align: middle;font-size: 12px;font-weight: 400;color: #8f8f94;">选择颜色:</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 class="mui-h6">
-					产品名称:美国watero净饮水一体机
+				</div>
+				<div class="my-div">
+					<span class="iconfont icon-daifahuo">提货卡</span>
 				</div>
 				<div class="mui-h6">
-					产品数量:1台
+					美国watero净饮水一体机提货卡<span class="mui-pull-right cl-red">X8张</span>
 				</div>
-				<form class="mui-input-group">
-					<div style="display: table;width: 100%;padding: 10px 0;">
-						<div style="display: table-cell;width: 20%;vertical-align: middle;font-size: 12px;font-weight: 400;color: #8f8f94;">选择颜色:</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 class="my-div">
-						<span class="iconfont icon-daifahuo">提货卡</span>
-					</div>
-					<div class="mui-h6">
-						美国watero净饮水一体机提货卡<span class="mui-pull-right cl-red">X8张</span>
-					</div>
-				</form>
-<!-- 				<div class="my-div">
-					<span class="iconfont icon-lease2">收货信息</span>
-				</div> -->
-				<ul class="mui-table-view" style="padding-top: 15px;">
-					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
+			</form>
+			<!-- 				<div class="my-div">
+                                <span class="iconfont icon-lease2">收货信息</span>
+                            </div> -->
+			<ul class="mui-table-view" style="padding-top: 15px;">
+				<li class="mui-table-view-cell">
+					<a class="mui-navigate-right" id="open-wechat-addres-a">
 						<span class="iconfont icon-lease2">收货信息</span><span class="mui-h5">请选择收货地址</span>
 						<!-- <ul class="ft-12" style="color: #333;">
 							<li>收  货  人:林林</li>
 							<li>手 机 号:15999999999</li>
 							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
 						</ul> -->
-						</a>	
-					</li>
-				</ul>
-				 <div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
-					<span class="iconfont icon-jiage">抵扣密码</span>
-				</div>
-				<div>
-					<input type="text" value="" placeholder="请输入抵扣密码" maxlength="12" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
-					<br/>
-					<span class="mui-h5">说明:如你已经线下支付并已获得抵扣密码,输入即可!</span>
-				</div> 
-				<ul class="mui-table-view">
-				<li style="padding:20px 10px 0px 10px;text-align: center;">
-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero代理说明》</a></span>
-					</li>
-				</ul>
-				</div>
-					
-				<div class="mui-text-center">
-					支付金额:<span class="cl-red" id="pay_price">¥10000</span>
-				</div>
+					</a>
+				</li>
+			</ul>
+			<div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
+				<span class="iconfont icon-jiage">抵扣密码</span>
 			</div>
+			<div>
+				<input type="text" value="" placeholder="请输入抵扣密码" maxlength="12" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
+				<br/>
+				<span class="mui-h5">说明:如你已经线下支付并已获得抵扣密码,输入即可!</span>
 			</div>
-			<div class="buy-footer">
-				<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" disabled="disabled">确认支付</button>
-			</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>
+			<ul class="mui-table-view">
+				<li style="padding:20px 10px 0px 10px;text-align: center;">
+					<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero代理说明》</a></span>
+				</li>
+			</ul>
+		</div>
+
+		<div class="mui-text-center">
+			支付金额:<span class="cl-red" id="pay_price">¥10000</span>
+		</div>
+	</div>
+</div>
+<div class="buy-footer">
+	<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" disabled="disabled">确认支付</button>
+</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">
-//wechatAddr.status=true;
-	var check = false,alert_msg='';
-	var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
-	var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
-	var dcode=/^[A-Z]{1}[0-9]{11}$/; //12位抵扣密码
-	var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
-	mui.ready(function(){
-		$.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
+    //wechatAddr.status=true;
+    var check = false,alert_msg='';
+    var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
+    var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
+    var dcode=/^[A-Z]{1}[0-9]{11}$/; //12位抵扣密码
+    var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
+    mui.ready(function(){
+        mui.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.returnCode=="200" && dt.resultCode=="200"){
+                        var table = document.body.querySelector('.ul_radio');
+                        mui(dt.returnMsg.colors).each(function(index) {
+                            var li = document.createElement('li');
+                            if(index==0){
+                                li.className ='radio'+this.colorId+' active';
+                            }else{
+                                li.className ='radio'+this.colorId;
+                            }
+                            li.setAttribute("id",this.colorId);
+                            li.setAttribute("name",this.colorProductId);
+                            table.appendChild(li);
+                        });
+                        $(".ul_radio li").each(function() {
+                            $(this).on("tap", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        document.querySelector('.loading-bg').style.display='none';
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				//console.log(dt);
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-				if(dt.returnCode=="200" && dt.resultCode=="200"){
-					var table = document.body.querySelector('.ul_radio');
-					mui(dt.returnMsg.colors).each(function(index) {
-						var li = document.createElement('li');
-						if(index==0){
-							li.className ='radio'+this.colorId+' active';
-						}else{
-							li.className ='radio'+this.colorId;
-						}
-						li.setAttribute("id",this.colorId);
-						li.setAttribute("name",this.colorProductId);
-						table.appendChild(li);
-					});
-					$(".ul_radio li").each(function() {
-						$(this).on("tap", function() {
-							$(this).addClass("active");
-							$(this).siblings().removeClass("active");
-						});
-					});
-					document.querySelector('.loading-bg').style.display='none';
-				}else{
-					mui.alert(dt.resultMsg);
-				}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		});
-	});
-	mui('body').on('tap', '#btn_submit', function() {
-		change_input();
-		var th=this;
-		if(check){
-				if(isPay) {
-				isPay = false; // 锁定请求按钮
-				mui(this).button('loading');
-				var param = {
-						"agentMachineColorId":$(".ul_radio .active").attr("id"),
-						"agentMachineProductId": $(".ul_radio .active").attr("name"),
-						"agentMachineAddressInfo": address,
-						"agentMachineAddressName": nickname,
-						"agentMachineAddressTel":ads_tel,
-						"userName":encodeURI($("#ipt-name").val().trim()),
-						"userTel":$("#ipt-phone").val().trim(),
-						"payPassword":$("#ipt-exchange").val().trim(),
-					};
-				$.ajax({
-                    xhrFields: {
-                        withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        });
+    });
+    mui('body').on('tap', '#btn_submit', function() {
+        change_input();
+        var th=this;
+        if(check){
+            if(isPay) {
+                isPay = false; // 锁定请求按钮
+                mui(this).button('loading');
+                var param = {
+                    "agentMachineColorId":$(".ul_radio .active").attr("id"),
+                    "agentMachineProductId": $(".ul_radio .active").attr("name"),
+                    "agentMachineAddressInfo": address,
+                    "agentMachineAddressName": nickname,
+                    "agentMachineAddressTel":ads_tel,
+                    "userName":encodeURI($("#ipt-name").val().trim()),
+                    "userTel":$("#ipt-phone").val().trim(),
+                    "payPassword":$("#ipt-exchange").val().trim(),
+                };
+                $.ajax({
+                    type: 'post',
+                    url: '/watero/pay/pay_agent?dates=' + new Date().getTime(),
+                    data: param,
+                    dataType: 'json',
+                    timeout: 15000,
+                    success: function(dt) {
+                        //console.log(dt);
+                        if($("#ipt-exchange").val().trim()!=''){
+                            if(dt.status && dt.data.success) {
+                                mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
+                            }else{
+                                mui(th).button('reset');
+                                mui.alert(dt.data.info,'',function(){
+                                    if(dt.data.info=='您已经是代理商,无须再次申请!'){
+                                        mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
+                                    }
+                                });
+                                isPay = true;
+                            }
+                        }else{
+                            if(dt.status) {
+                                var obj = JSON.parse("{" + dt.data.info + "}");
+                                WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                                    if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                        $.ajax({
+                                            type: 'post',
+                                            url: base_path+'/agent_pay/check_agent_pay_success',
+                                            data: {"orderId":dt.data.orderId},
+                                            dataType: 'json',
+                                            timeout: 15000,
+                                            success: function(data) {
+                                                //console.log(data);
+                                                if(data.status) {
+                                                    if(data.data==2){
+                                                        mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
+                                                    }else{
+                                                        mui.alert('如果已支付,请等待同步支付状态!', '', 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');
+                                                isPay = true;
+                                                mui.alert("请检查网络或刷新页面重试!");
+                                            }
+                                        });
+                                    } else {
+                                        isPay = true;
+                                        mui(th).button('reset');
+                                        mui.alert("对不起,支付失败!请稍后重试!");
+                                    }
+                                });
+                            } else {
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.returnMsg);
+                            }
+                        }
                     },
-					type: 'post',
-					url: '/watero/pay/pay_agent?dates=' + new Date().getTime(),
-					data: param,
-					dataType: 'json',
-					timeout: 15000,
-					success: function(dt) {
-						//console.log(dt);
-						if($("#ipt-exchange").val().trim()!=''){
-							if(dt.status && dt.data.success) {
-								mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
-							}else{
-								mui(th).button('reset');
-								mui.alert(dt.data.info,'',function(){
-									if(dt.data.info=='您已经是代理商,无须再次申请!'){
-										mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
-									}
-								});
-								isPay = true;
-							}
-						}else{
-						if(dt.status) {
-							var obj = JSON.parse("{" + dt.data.info + "}");
-							WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-								if(res.err_msg == 'get_brand_wcpay_request:ok') {
-									$.ajax({
-                                        xhrFields: {
-                                            withCredentials: true
-                                        },
-										type: 'post',
-										url: base_path+'/agent_pay/check_agent_pay_success',
-										data: {"orderId":dt.data.orderId},
-										dataType: 'json',
-										timeout: 15000,
-										success: function(data) {
-											//console.log(data);
-											if(data.status) {
-												if(data.data==2){
-													mui.openWindow({url:base_path+ '/giftCard/card/agencyUI'});
-												}else{
-													mui.alert('如果已支付,请等待同步支付状态!', '', 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');
-											isPay = true;
-											mui.alert("请检查网络或刷新页面重试!");
-										}
-									});
-								} else {
-									isPay = true;
-									mui(th).button('reset');
-									mui.alert("对不起,支付失败!请稍后重试!");
-								}
-							});
-						} else {
-							mui(th).button('reset');
-							isPay = true;
-							mui.alert(dt.returnMsg);
-						}
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						//异常处理;
-						console.log(xhr);
-						isPay = true;
-						mui.alert("请检查网络或刷新页面重试!");
-						mui(th).button('reset');
-					}
-				});
-			}else{
-				mui.alert("正在请求支付中~~请稍后!");
-				return;
-			}
-		}else{
-			mui.alert(alert_msg);
-		}
-	});
-	mui('body').on('tap', '#xieyi-dalog', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_agent_explain.html'
-		});
-	});
-	mui('body').on('tap', '#mui-navigate-right', function() {
-		if(this.parentNode.classList.contains('mui-active')){
-			this.lastChild.innerHTML='详情'
-		}else{
-			this.lastChild.innerHTML='收起'
-			}
-		});
-$(document).on('tap', '#btn-tongyi', function() {
-	var btn_submit=$("#btn_submit");
-	if($(this).hasClass("mui-active")){
-		$(this).removeClass("mui-active");
-		check=true;
-		if(wechatAddr.status){
-			btn_submit.removeClass("mui-active").removeAttr("disabled");
-		}else{
-			btn_submit.addClass("mui-active").prop("disabled","disabled");
-		}
-	}else{
-		check=false;
-		$(this).addClass("mui-active");
-		btn_submit.addClass("mui-active").prop("disabled","disabled");
-	}
-});
-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;
-			$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-			if(check){
-				$(this).removeClass("mui-active");
-				$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-			}
-		},
-		function() {
-			if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-				wechatAddr.status = true;
-			} else {
-				wechatAddr.status = false;
-				// 用户取消拉出地址
-				$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-			}
-		}
-	);
+                    error: function(xhr, type, errorThrown) {
+                        //异常处理;
+                        console.log(xhr);
+                        isPay = true;
+                        mui.alert("请检查网络或刷新页面重试!");
+                        mui(th).button('reset');
+                    }
+                });
+            }else{
+                mui.alert("正在请求支付中~~请稍后!");
+                return;
+            }
+        }else{
+            mui.alert(alert_msg);
+        }
+    });
+    mui('body').on('tap', '#xieyi-dalog', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_agent_explain.html'
+        });
+    });
+    mui('body').on('tap', '#mui-navigate-right', function() {
+        if(this.parentNode.classList.contains('mui-active')){
+            this.lastChild.innerHTML='详情'
+        }else{
+            this.lastChild.innerHTML='收起'
+        }
+    });
+    $(document).on('tap', '#btn-tongyi', function() {
+        var btn_submit=$("#btn_submit");
+        if($(this).hasClass("mui-active")){
+            $(this).removeClass("mui-active");
+            check=true;
+            if(wechatAddr.status){
+                btn_submit.removeClass("mui-active").removeAttr("disabled");
+            }else{
+                btn_submit.addClass("mui-active").prop("disabled","disabled");
+            }
+        }else{
+            check=false;
+            $(this).addClass("mui-active");
+            btn_submit.addClass("mui-active").prop("disabled","disabled");
+        }
+    });
+    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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                if(check){
+                    $(this).removeClass("mui-active");
+                    $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+                }
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                }
+            }
+        );
 
-});
-function change_input() {
-	if($("#btn-tongyi").hasClass("mui-active")){
-		alert_msg="请勾选同意《美国watero代理说明》";
-		check=false;
-		return false;
-	}else{
-		check=true;
-	}
-	if(dcode.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
-		check=true;
-		$("#pay_price").text("¥0");
-	}else{
-		alert_msg="抵扣密码不正确,请重新填写";
-		check=false;
-		$("#pay_price").text("¥10000");
-		return false;
-	}
-	if(wechatAddr.status){
-		check=true;
-	}else{
-		alert_msg="请选择收货地址";
-		check=false;
-		return false;
-	}
-	$(".mui-input-group input").each(function(index) {
-		switch ($(this).attr("id")){
-			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-name":
-				if($(this).val().trim()==""){
-					alert_msg="请填写姓名";
-					check=false;
-					return false;
-				}else{
-					if(uname.test($(this).val().trim())) {
-						check=true;
-					}else{
-						alert_msg="姓名格式不正确,请重新填写";
-						check=false;
-						return false;
-					}
-				}
-				break;
-			default:
-				break;
-		}
-	});
-	if(check) {
-		$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-	}else{
-		$("#btn_submit").addClass("mui-active").prop("disabled","disabled");
-	}
-}
-mui.os.ios ? listener_ipt() : keyup_fn();
+    });
+    function change_input() {
+        if($("#btn-tongyi").hasClass("mui-active")){
+            alert_msg="请勾选同意《美国watero代理说明》";
+            check=false;
+            return false;
+        }else{
+            check=true;
+        }
+        if(dcode.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
+            check=true;
+            $("#pay_price").text("¥0");
+        }else{
+            alert_msg="抵扣密码不正确,请重新填写";
+            check=false;
+            $("#pay_price").text("¥10000");
+            return false;
+        }
+        if(wechatAddr.status){
+            check=true;
+        }else{
+            alert_msg="请选择收货地址";
+            check=false;
+            return false;
+        }
+        $(".mui-input-group input").each(function(index) {
+            switch ($(this).attr("id")){
+                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-name":
+                    if($(this).val().trim()==""){
+                        alert_msg="请填写姓名";
+                        check=false;
+                        return false;
+                    }else{
+                        if(uname.test($(this).val().trim())) {
+                            check=true;
+                        }else{
+                            alert_msg="姓名格式不正确,请重新填写";
+                            check=false;
+                            return false;
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        });
+        if(check) {
+            $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+        }else{
+            $("#btn_submit").addClass("mui-active").prop("disabled","disabled");
+        }
+    }
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-function keyup_fn() {
-	$(document).on('keyup', '#ipt-name', function(e) {
-		change_input();
-			if(check){
-				$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-			}else{
-				$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-			}
-	});
-	$(document).on('keyup', '#ipt-phone', function(e) {
-		change_input();
-			if(check){
-				$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-			}else{
-				$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-			}
-	});
-}
+    function keyup_fn() {
+        $(document).on('keyup', '#ipt-name', function(e) {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        });
+        $(document).on('keyup', '#ipt-phone', function(e) {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        });
+    }
 
-function listener_ipt() {
-	document.getElementById('ipt-name').onblur = function() {
-		change_input();
-		if(check){
-			$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-		}else{
-			$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-		}
-	}
-	document.getElementById('ipt-phone').onblur = function() {
-		change_input();
-		if(check){
-			$("#btn_submit").removeClass("my-active").removeAttr("disabled");
-		}else{
-			$("#btn_submit").addClass("my-active").prop("disabled","disabled");
-		}
-	}
-}
-	</script>
-	</body>
+    function listener_ipt() {
+        document.getElementById('ipt-name').onblur = function() {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        }
+        document.getElementById('ipt-phone').onblur = function() {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("my-active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("my-active").prop("disabled","disabled");
+            }
+        }
+    }
+</script>
+</body>
 </html>

+ 263 - 269
watero-wechat-web/src/main/webapp/view/gift_card_user_exchange.html

@@ -1,287 +1,281 @@
 <!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;}
-			.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;}
-			.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin{font-size: 15px;padding-left: 25px;}
-			.icon-fuxuankuang{font-size: 12px;padding:5px 5px 5px 22px;}
-			.icon-fuxuankuang:before{font-size: 14px;margin-top: 5px;margin-right: 3px;}
-			.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-			.try_price{color: #f1436c;}
-			.ul_radio{width: 100%;text-align: left;}
-			.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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:not(.mui-btn){margin: -15px -25px;}
-			.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-			#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
-			.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;}
-			.tips{padding-bottom: 65px;}
+<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;}
+		h3{margin-top:5px;margin-bottom: 0;}
+		.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;}
+		.icon-daifahuo,.icon-lease2,.icon-jiage,.icon-lipin{font-size: 15px;padding-left: 25px;}
+		.icon-fuxuankuang{font-size: 12px;padding:5px 5px 5px 22px;}
+		.icon-fuxuankuang:before{font-size: 14px;margin-top: 5px;margin-right: 3px;}
+		.icon-daifahuo:before,.icon-lease2:before,.icon-jiage:before,.icon-lipin:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.try_price{color: #f1436c;}
+		.ul_radio{width: 100%;text-align: left;}
+		.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: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;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:not(.mui-btn){margin: -15px -25px;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		#btn_submit{color: #fff;font-size: 18px;background: #24cae9;margin-bottom: 0;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;}
+		.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;}
+		.tips{padding-bottom: 65px;}
 
-			.gift-card-title{padding-top:60px;background:url(/watero/images/gift-card-tit-bg.jpg) top center /100% no-repeat #71d8ec;}
-			.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
-			.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
-			.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;}
-			.my-div{padding:10px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom:10px;}
-			.my-div.noline{padding: 5px 0;border-bottom:0;margin-bottom: 5px;}
-			.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;margin-bottom:0 !important;}
-			.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;}
-			.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #e3ecee !important;}
-			.mui-h5, h5 {margin-left: 30px;}
-			.mui-h6{font-size:14px;}
-		</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>
+		.gift-card-title{padding-top:60px;background:url(//s.iamberry.com/watero/images/gift-card-tit-bg.jpg) top center /100% no-repeat #71d8ec;}
+		.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.mui-collapse .mui-collapse-content{background: #71d8ec;}
+		.accordion{float: right;margin:2px 15px 0 0;font-size: 12px;color: #fff;}
+		.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;}
+		.my-div{padding:10px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom:10px;}
+		.my-div.noline{padding: 5px 0;border-bottom:0;margin-bottom: 5px;}
+		.my-btn-exchange{background: #ddf2f8 !important;text-align: center;border: 0 !important;margin-bottom:0 !important;}
+		.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;}
+		.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #e3ecee !important;}
+		.mui-h5, h5 {margin-left: 30px;}
+		.mui-h6{font-size:14px;}
+	</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">
-				<div class="mui-content-padded">
-				<div class="my-div">
-					<span class="iconfont icon-lipin">提货信息</span>
+<div class="mui-content" style="background: #fff;">
+	<div class="tips">
+		<div class="mui-content-padded">
+			<div class="my-div">
+				<span class="iconfont icon-lipin">提货信息</span>
+			</div>
+			<div class="mui-h6">
+				提货产品:美国watero净饮水一体机
+			</div>
+			<form class="mui-input-group">
+				<div style="display: table;width: 100%;padding: 10px 0;">
+					<div style="display: table-cell;width: 20%;vertical-align: middle;color: #8f8f94;">选择颜色:</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 class="mui-h6">
-					提货产品:美国watero净饮水一体机
 				</div>
-				<form class="mui-input-group">
-					<div style="display: table;width: 100%;padding: 10px 0;">
-						<div style="display: table-cell;width: 20%;vertical-align: middle;color: #8f8f94;">选择颜色:</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>
-				</form>
-				<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);border-bottom:1px solid rgba(0,0,0,.1);margin:10px 0;">
-					<li class="mui-table-view-cell" style="padding: 15px 15px;">
-						<a class="mui-navigate-right" id="go-gift-details" href="http://w.iamberry.com/watero/wechat/product/desc?productId=34&colorId=1">
+			</form>
+			<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);border-bottom:1px solid rgba(0,0,0,.1);margin:10px 0;">
+				<li class="mui-table-view-cell" style="padding: 15px 15px;">
+					<a class="mui-navigate-right" id="go-gift-details" href="//w.iamberry.com/watero/wechat/product/desc?productId=34&colorId=2">
 						查看产品详情
-						</a>
-					</li>
-				</ul>
-				<div class="my-div">
-					<span class="iconfont icon-lease2">收货信息</span>
-				</div>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
+					</a>
+				</li>
+			</ul>
+			<div class="my-div">
+				<span class="iconfont icon-lease2">收货信息</span>
+			</div>
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell">
+					<a class="mui-navigate-right" id="open-wechat-addres-a">
 						收货地址<span class="mui-h5">请选择收货地址</span>
 						<!-- <ul class="ft-12" style="color: #333;">
 							<li>收  货  人:林林</li>
 							<li>手 机 号:15999999999</li>
 							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
 						</ul> -->
-						</a>
-					</li>
-				</ul>
-				<!-- <div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
-					<span class="iconfont icon-daifahuo">礼品卡兑换码</span>
-				</div>
-				<div>
-					<input type="text" value="" placeholder="请输入兑换密码" class="my-btn-exchange" id="ipt-exchange"/>
-				</div> -->
-<!-- 				<form class="mui-input-group">
-					<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>
-				</form> -->
-<!-- 				<div class="mui-h6">
-					说明:成功兑换后,可再次扫描提货卡上二维码查看兑换记录!
-				</div> -->
-				</div>
-			</div>
-			</div>
-			<div class="buy-footer">
-				<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" disabled="disabled">确认提货</button>
-			</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>
+					</a>
+				</li>
+			</ul>
+			<!-- <div style="padding:8px 0;margin-top:4px;border-top: 1px solid rgba(0,0,0,.1);">
+                <span class="iconfont icon-daifahuo">礼品卡兑换码</span>
+            </div>
+            <div>
+                <input type="text" value="" placeholder="请输入兑换密码" class="my-btn-exchange" id="ipt-exchange"/>
+            </div> -->
+			<!-- 				<form class="mui-input-group">
+                                <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>
+                            </form> -->
+			<!-- 				<div class="mui-h6">
+                                说明:成功兑换后,可再次扫描提货卡上二维码查看兑换记录!
+                            </div> -->
+		</div>
+	</div>
+</div>
+<div class="buy-footer">
+	<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" disabled="disabled">确认提货</button>
+</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?v=201706001"></script>
 <script type="text/javascript">
-	var check = false,alert_msg='';
-	var mobile=/^(13|14|15|18)[0-9]{9}$/; //11位手机号码
-	var code = /^[0-9]{4}$/; //4位数字
-	var en_num=/^[A-Za-z0-9]{7}$/;//简体中文英文数字
-	mui.ready(function(){
-		$.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
+    var check = false,alert_msg='';
+    var mobile=/^(13|14|15|18)[0-9]{9}$/; //11位手机号码
+    var code = /^[0-9]{4}$/; //4位数字
+    var en_num=/^[A-Za-z0-9]{7}$/;//简体中文英文数字
+    mui.ready(function(){
+        mui.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.returnCode=="200" && dt.resultCode=="200"){
+                        var table = document.body.querySelector('.ul_radio');
+                        mui(dt.returnMsg.colors).each(function(index) {
+                            var li = document.createElement('li');
+                            if(index==0){
+                                li.className ='radio'+this.colorId+' active';
+                            }else{
+                                li.className ='radio'+this.colorId;
+                            }
+                            li.setAttribute("id",this.colorId);
+                            table.appendChild(li);
+                        });
+                        //遍历产品颜色单选
+                        $(".ul_radio li").each(function() {
+                            $(this).on("tap", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				//console.log(dt);
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-				if(dt.returnCode=="200" && dt.resultCode=="200"){
-					var table = document.body.querySelector('.ul_radio');
-					mui(dt.returnMsg.colors).each(function(index) {
-						var li = document.createElement('li');
-						if(index==0){
-							li.className ='radio'+this.colorId+' active';
-						}else{
-							li.className ='radio'+this.colorId;
-						}
-						li.setAttribute("id",this.colorId);
-						table.appendChild(li);
-					});
-					//遍历产品颜色单选
-					$(".ul_radio li").each(function() {
-						$(this).on("tap", function() {
-							$(this).addClass("active");
-							$(this).siblings().removeClass("active");
-						});
-					});
-					
-				}else{
-					mui.alert(dt.resultMsg);
-				}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		});
-		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;
-				$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-				$("#btn_submit").removeClass("mui-active").removeAttr('disabled');
-			},
-			function() {
-				if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-					wechatAddr.status = true;
-				} else {
-					wechatAddr.status = false;
-					// 用户取消拉出地址
-					$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-					mui.alert("您取消了选择收货地址!");
-				}
-			}
-		);
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        });
+        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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                $("#btn_submit").removeClass("mui-active").removeAttr('disabled');
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                    mui.alert("您取消了选择收货地址!");
+                }
+            }
+        );
 
-	});
-	mui('body').on('tap', '#btn_submit', function() {
-		var th=this;
-				if(wechatAddr.status){
-					//开始提交,改变按钮样式并锁定
-					mui(this).button('loading');
-					var param = {
-							"cardPwd": getParam('cardPwd'),
-							"userMachineColorId":$(".ul_radio .active").attr("id") ,
-							"userMachineAddressInfo": address,
-							"userMachineAddressName": nickname,
-							"userMachineAddressTel":ads_tel,
-						};
-					$.ajax({
-                        xhrFields: {
-                            withCredentials: true
-                        },
-						type: 'post',
-						url: base_path+'/giftCard/card/exchange?dates=' + new Date().getTime(),
-						data: param,
-						dataType: 'json',
-						timeout: 15000,
-						success: function(dt) {
-							//console.log(dt);
-							if(dt.resultCode=="200" && dt.returnCode=="200") {
-								//成功后跳转页面
-								 mui.openWindow({url: '/watero/view/gift_card_exchange_details.html?psw='+getParam('cardPwd')})
-							} else {
-								//失败后还原按钮,并弹出警告
-								mui.alert(dt.returnMsg.returnMsg);
-								mui(th).button('reset');
-							}
-						},
-						error: function(xhr, type, errorThrown) {
-							//异常处理;还原提交按钮,并弹出警告
-							console.log(xhr);
-							mui.alert("请检查网络或刷新页面重试!");
-							mui(th).button('reset');							
-						}
-					});
-				}else{
-					//文本框值校验未通过,并弹出警告
-					mui.alert('请选择地址');
-				}
-	});
-	mui('body').on('tap', '#go-gift-details', function() {
-		var th=this;
-		 mui.openWindow({url: th.getAttribute("href")})
-	});
-	</script>
-	</body>
+    });
+    mui('body').on('tap', '#btn_submit', function() {
+        var th=this;
+        if(wechatAddr.status){
+            //开始提交,改变按钮样式并锁定
+            mui(this).button('loading');
+            var param = {
+                "cardPwd": getParam('cardPwd'),
+                "userMachineColorId":$(".ul_radio .active").attr("id") ,
+                "userMachineAddressInfo": address,
+                "userMachineAddressName": nickname,
+                "userMachineAddressTel":ads_tel,
+            };
+            $.ajax({
+                type: 'post',
+                url: base_path+'/giftCard/card/exchange?dates=' + new Date().getTime(),
+                data: param,
+                dataType: 'json',
+                timeout: 15000,
+                success: function(dt) {
+                    //console.log(dt);
+                    if(dt.resultCode=="200" && dt.returnCode=="200") {
+                        //成功后跳转页面
+                        mui.openWindow({url: '/watero/view/gift_card_exchange_details.html?psw='+getParam('cardPwd')})
+                    } else {
+                        //失败后还原按钮,并弹出警告
+                        mui.alert(dt.returnMsg.returnMsg);
+                        mui(th).button('reset');
+                    }
+                },
+                error: function(xhr, type, errorThrown) {
+                    //异常处理;还原提交按钮,并弹出警告
+                    console.log(xhr);
+                    mui.alert("请检查网络或刷新页面重试!");
+                    mui(th).button('reset');
+                }
+            });
+        }else{
+            //文本框值校验未通过,并弹出警告
+            mui.alert('请选择地址');
+        }
+    });
+    mui('body').on('tap', '#go-gift-details', function() {
+        var th=this;
+        mui.openWindow({url: th.getAttribute("href")})
+    });
+</script>
+</body>
 </html>

+ 406 - 415
watero-wechat-web/src/main/webapp/view/i_want_lease_pay.html

@@ -1,430 +1,421 @@
 <!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: #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;}
-    .lease-ul{font-size: 14px;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: 18px;color:#e4004d;position: absolute;left: 0;width: 20px;height: 18px;top:1px;}
-	.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: none;height:36px;}
-	.my-view1:after,.my-view1 li:after{display: none;}
-	.color{position:absolute; left:100px;top:25px;-webkit-transform: translateY(-50%);}
-	.after{position: relative;}
-	.after:before{content:'';width: 0;
-    height: 0;
-    border-left: 4px solid transparent;
-    border-right: 4px solid transparent;
-    border-top: 8px solid #666;position: absolute;
-    right: 15px;
-    top: 15px;}
+<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: #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;}
+		.lease-ul{font-size: 14px;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: 18px;color:#e4004d;position: absolute;left: 0;width: 20px;height: 18px;top:1px;}
+		.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: none;height:36px;}
+		.my-view1:after,.my-view1 li:after{display: none;}
+		.color{position:absolute; left:100px;top:25px;-webkit-transform: translateY(-50%);}
+		.after{position: relative;}
+		.after:before{content:'';width: 0;
+			height: 0;
+			border-left: 4px solid transparent;
+			border-right: 4px solid transparent;
+			border-top: 8px solid #666;position: absolute;
+			right: 15px;
+			top: 15px;}
 	</style>
 	<script>
-		// 屏蔽分享
-		window.hiddenAllWechatMenu = true;
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
 	</script>
-	</head>
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<div style="padding: 0 10px;background: #fff;">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell" style="padding: 11px 0;">
-						<span class="iconfont icon-lease cl-blue"></span>&nbsp;租用产品信息
-					</li>
-				</ul>
-				<ul class="lease-ul">
-						<li>产品名称:<span id="productName"></span></li>
-						<li style="position: relative;"><span class="lease-color">产品颜色:</span><img src="/watero/wateroimages/cp-1.jpg" width="30px" /> <span class="color" id="productColor"></span></li>
-						<li>租用时长:<span id="rentTime"></span><span class="mui-pull-right">年服务费:<span id="serviceMoney" class="cl-red"></span></span></li>
-						<li>设备押金:<span id="pledgeMoney" class="cl-red"></span><span class="mui-pull-right">费用合计:<span id="rentMoney" class="cl-red"></span></span></li>
-				</ul>
-				<ul class="mui-table-view my-view1">
-					<li class="mui-table-view-cell" style="padding: 11px 0;">
-						<span class="mui-h6">使用抵扣券</span>
-					</li>
-					<li class="after">
-						<select class="my-select" id="couponSelect">
-						
-						</select>
-					</li>
-					<li style="padding: 10px 0;display:none;" class="for_money">
-						<div><span class="mui-h6">抵扣金额:</span><span id="couponMoney" class="cl-red mui-pull-right">¥0</span></div>
-					</li>
-				</ul>
-					
-				<ul class="mui-table-view ul_noline">
-					<li class="mui-table-view-cell" style="padding: 11px 0 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);">
-						<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">
-						<span class="mui-h6">选择收货地址</span>
-						<!-- <ul class="address_ul">
-							<li>收  货  人:林林</li>
-							<li>手 机 号:15999999999</li>
-							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
-						</ul>  -->
-					</a>
-					</li>
-					<li>
-						<span class="mui-h6">说明:因滤芯为一次性耗材,不可回收,故充值金额概不退返</span>
-					</li>
-					<li class="mui-text-center" style="padding: 10px;">
-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已阅,并同意<a id="xieyi-dalog">《美国watero租用协议》</a></span>
-					</li>
-					<li class="mui-text-center" style="padding:10px 15px 15px 15px;">
-						支付金额:<span class="cl-red" id="rentPayMoney"></span>
-					</li>
-				</ul>
-				</div>
-			<div class="buy-footer">
-				<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="支付中" class="mui-btn my-btn-hand" 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/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/layer.js"></script>
-		<script>
-		var pledgeMoney=getParam('pledgeMoney');
-		var serviceMoney=getParam('serviceMoney');
-		var radio1=getParam('radio1');
-		var rentProduct=getParam('rentProduct');
-		var giftId=getParam('giftId');
-		var productName = decodeURI(escape(getParam('productName')));
-		var rentMoney = getParam('rentMoney');
-		var productColor = decodeURI(escape(getParam('productColor')));
-		var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
-		
-		mui.ready(function() {
-			document.querySelector('.loading-bg').style.display = 'none';
-			$('#productName').html(productName);
-			$('#productColor').html(productColor + ' x1');
-			$('#btn_submit').addClass("mui-active").prop("disabled","disabled");
-			$('#rentPayMoney').html('¥ ' + accDiv(rentMoney, 100));
-			switch (radio1) {
-				case '1':
-					$('#rentTime').html('1年');
-					$('#pledgeMoney').html('¥' + accDiv(pledgeMoney, 100));
-					$('#serviceMoney').html('¥' + accDiv(serviceMoney, 100));
-					$('#rentMoney').html('¥' + accDiv(rentMoney, 100));
-					break;
-				case '2':
-					$('#rentTime').html('2年');
-					$('#pledgeMoney').html('¥' + 0);
-					$('#serviceMoney').html('¥' + accDiv(rentMoney, 100));
-					$('#rentMoney').html('¥' + accDiv(rentMoney, 100));
-					break;
-				default:
-					$('#rentTime').html('3年');
-					$('#pledgeMoney').html('¥' + 0);
-					$('#serviceMoney').html('¥' + accDiv(rentMoney, 100));
-					$('#rentMoney').html('¥' + accDiv(rentMoney, 100));
-					break;
-			}
-			
-			$.ajax(base_path + '/rent_order/selectServiceCoupon?dates=' + new Date().getTime(), {
-				dataType: 'json',
-                xhrFields: {
-                    withCredentials: true
-                },
-				type: 'post',
-				timeout: 15000,
-				success: function(dt) {
-					//console.log(dt);
-					if(dt.isRedirect) {
-						location.href = dt.redirectURL;
-					}else{
-					if(dt.status) {
-						var coupon_data = dt.data[0];
-						//循环显示租用类型
-						if (coupon_data != null) {
-							mui(coupon_data).each(function(index) {
-								if (index == 0) {
-									$("#couponSelect").append( '<option serviceid="" value="0" selected>不使用抵扣券</option><option serviceId="' + this.serviceId + '"  value="' + this.serviceMoney + '">' + this.serviceName + '</option>');
-								} else {
-									$("#couponSelect").append( '<option serviceId="' + this.serviceId + '" value="' + this.serviceMoney + '">' + this.serviceName + '</option>');
-								}
-							});
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div style="padding: 0 10px;background: #fff;">
+		<ul class="mui-table-view">
+			<li class="mui-table-view-cell" style="padding: 11px 0;">
+				<span class="iconfont icon-lease cl-blue"></span>&nbsp;租用产品信息
+			</li>
+		</ul>
+		<ul class="lease-ul">
+			<li>产品名称:<span id="productName"></span></li>
+			<li style="position: relative;"><span class="lease-color">产品颜色:</span><img src="//s.iamberry.com/watero/images/cp-1.jpg" width="30px" /> <span class="color" id="productColor"></span></li>
+			<li>租用时长:<span id="rentTime"></span><span class="mui-pull-right">年服务费:<span id="serviceMoney" class="cl-red"></span></span></li>
+			<li>设备押金:<span id="pledgeMoney" class="cl-red"></span><span class="mui-pull-right">费用合计:<span id="rentMoney" class="cl-red"></span></span></li>
+		</ul>
+		<ul class="mui-table-view my-view1">
+			<li class="mui-table-view-cell" style="padding: 11px 0;">
+				<span class="mui-h6">使用抵扣券</span>
+			</li>
+			<li class="after">
+				<select class="my-select" id="couponSelect">
+
+				</select>
+			</li>
+			<li style="padding: 10px 0;display:none;" class="for_money">
+				<div><span class="mui-h6">抵扣金额:</span><span id="couponMoney" class="cl-red mui-pull-right">¥0</span></div>
+			</li>
+		</ul>
+
+		<ul class="mui-table-view ul_noline">
+			<li class="mui-table-view-cell" style="padding: 11px 0 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);">
+				<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">
+					<span class="mui-h6">选择收货地址</span>
+					<!-- <ul class="address_ul">
+                        <li>收  货  人:林林</li>
+                        <li>手 机 号:15999999999</li>
+                        <li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
+                    </ul>  -->
+				</a>
+			</li>
+			<li>
+				<span class="mui-h6">说明:因滤芯为一次性耗材,不可回收,故充值金额概不退返</span>
+			</li>
+			<li class="mui-text-center" style="padding: 10px;">
+				<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已阅,并同意<a id="xieyi-dalog">《美国watero租用协议》</a></span>
+			</li>
+			<li class="mui-text-center" style="padding:10px 15px 15px 15px;">
+				支付金额:<span class="cl-red" id="rentPayMoney"></span>
+			</li>
+		</ul>
+	</div>
+	<div class="buy-footer">
+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="支付中" class="mui-btn my-btn-hand" id="btn_submit">立即支付</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 src="//s.iamberry.com/watero/js/shop/layer.js"></script>
+<script>
+    var pledgeMoney=getParam('pledgeMoney');
+    var serviceMoney=getParam('serviceMoney');
+    var radio1=getParam('radio1');
+    var rentProduct=getParam('rentProduct');
+    var giftId=getParam('giftId');
+    var productName = decodeURI(escape(getParam('productName')));
+    var rentMoney = getParam('rentMoney');
+    var productColor = decodeURI(escape(getParam('productColor')));
+    var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
+
+    mui.ready(function() {
+        document.querySelector('.loading-bg').style.display = 'none';
+        $('#productName').html(productName);
+        $('#productColor').html(productColor + ' x1');
+        $('#btn_submit').addClass("mui-active").prop("disabled","disabled");
+        $('#rentPayMoney').html('¥ ' + accDiv(rentMoney, 100));
+        switch (radio1) {
+            case '1':
+                $('#rentTime').html('1年');
+                $('#pledgeMoney').html('¥' + accDiv(pledgeMoney, 100));
+                $('#serviceMoney').html('¥' + accDiv(serviceMoney, 100));
+                $('#rentMoney').html('¥' + accDiv(rentMoney, 100));
+                break;
+            case '2':
+                $('#rentTime').html('2年');
+                $('#pledgeMoney').html('¥' + 0);
+                $('#serviceMoney').html('¥' + accDiv(rentMoney, 100));
+                $('#rentMoney').html('¥' + accDiv(rentMoney, 100));
+                break;
+            default:
+                $('#rentTime').html('3年');
+                $('#pledgeMoney').html('¥' + 0);
+                $('#serviceMoney').html('¥' + accDiv(rentMoney, 100));
+                $('#rentMoney').html('¥' + accDiv(rentMoney, 100));
+                break;
+        }
+
+        mui.ajax(base_path + '/rent_order/selectServiceCoupon?dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.status) {
+                        var coupon_data = dt.data[0];
+                        //循环显示租用类型
+                        if (coupon_data != null) {
+                            mui(coupon_data).each(function(index) {
+                                if (index == 0) {
+                                    $("#couponSelect").append( '<option serviceid="" value="0" selected>不使用抵扣券</option><option serviceId="' + this.serviceId + '"  value="' + this.serviceMoney + '">' + this.serviceName + '</option>');
+                                } else {
+                                    $("#couponSelect").append( '<option serviceId="' + this.serviceId + '" value="' + this.serviceMoney + '">' + this.serviceName + '</option>');
+                                }
+                            });
 							/* console.log($('#couponSelect option:first').val())
-							$('#couponMoney').html('-¥' + accDiv($('#couponSelect option:first').val(),100)); */
-						}else{
-							$("#couponSelect").append( '<option serviceid="" value="" selected="selected">没有可用的抵扣券</option>');
-						}
-					} else {
-						//mui('#pullrefresh_chanpin_list').pullRefresh().endPullupToRefresh(true);
-					} 
-					}
-				},
-				error: function(xhr, type, errorThrown) {
-					console.log(xhr)
-				}
-			})
-		});
-		
-		//支付方法
-		mui('body').on('tap', '#btn_submit', function() {
-			var th=this;
-			var check = true;
-			if(!wechatAddr.status){
-				mui.alert("请选择收货地址");
-				check = false;
-			}
-			if (radio1 == null) {
-				mui.alert("请选择租用类型");
-				check = false;
-			}
-			if (rentProduct == null) {
-				mui.alert("请选择租用商品信息");
-				check = false;
-			}
-			if (giftId == null) {
-				mui.alert("请选择租用赠品信息");
-				check = false;
-			}
-			if(check){
-					if(isPay) {
-					isPay = false; // 锁定请求按钮
-					layer.open({
-						type: 2,
-						shadeClose: false,
-						content: "正在请求加载订单信息..."
-					}); // 调用加载弹出层
-					mui(this).button('loading');
+							 $('#couponMoney').html('-¥' + accDiv($('#couponSelect option:first').val(),100)); */
+                        }else{
+                            $("#couponSelect").append( '<option serviceid="" value="" selected="selected">没有可用的抵扣券</option>');
+                        }
+                    } else {
+                        //mui('#pullrefresh_chanpin_list').pullRefresh().endPullupToRefresh(true);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+
+    //支付方法
+    mui('body').on('tap', '#btn_submit', function() {
+        var th=this;
+        var check = true;
+        if(!wechatAddr.status){
+            mui.alert("请选择收货地址");
+            check = false;
+        }
+        if (radio1 == null) {
+            mui.alert("请选择租用类型");
+            check = false;
+        }
+        if (rentProduct == null) {
+            mui.alert("请选择租用商品信息");
+            check = false;
+        }
+        if (giftId == null) {
+            mui.alert("请选择租用赠品信息");
+            check = false;
+        }
+        if(check){
+            if(isPay) {
+                isPay = false; // 锁定请求按钮
+                layer.open({
+                    type: 2,
+                    shadeClose: false,
+                    content: "正在请求加载订单信息..."
+                }); // 调用加载弹出层
+                mui(this).button('loading');
 
-					var param = {
-							"rentAddressInfo": address,
-							"rentAddressName": nickname,
-							"rentAddressTel": ads_tel,
-							"rentTypeId": radio1,
-							"rentServiceId":$("#couponSelect").find("option:selected").attr("serviceId"),
-							"productId":rentProduct,
-							"giftId":giftId
-					}
-					$.ajax({
-                        xhrFields: {
-                            withCredentials: true
-                        },
-						type: 'post',
-						url: '/watero/wechat/rent_order/rentOrderPay?dates=' + new Date().getTime(),
-						data: param,
-						dataType: 'json',
-						timeout: 15000,
-						success: function(dt) {
-							//console.log(dt);
-							layer.closeAll();
-							if(dt.isRedirect) {
-								location.href = dt.redirectURL;
-							}else{
-							if(dt.resultCode== '200') {
-								var obj = JSON.parse("{" + dt.data.info + "}");
-								WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-									if(res.err_msg == 'get_brand_wcpay_request:ok') {
-										layer.open({
-											type: 2,
-											shadeClose: false,
-											content: "正在请求加载订单信息..."
-										}); // 调用加载弹出层
-										$.ajax({
-                                            xhrFields: {
-                                                withCredentials: true
+                var param = {
+                    "rentAddressInfo": address,
+                    "rentAddressName": nickname,
+                    "rentAddressTel": ads_tel,
+                    "rentTypeId": radio1,
+                    "rentServiceId":$("#couponSelect").find("option:selected").attr("serviceId"),
+                    "productId":rentProduct,
+                    "giftId":giftId
+                }
+                $.ajax({
+                    type: 'post',
+                    url: '/watero/wechat/rent_order/rentOrderPay?dates=' + new Date().getTime(),
+                    data: param,
+                    dataType: 'json',
+                    timeout: 15000,
+                    success: function(dt) {
+                        //console.log(dt);
+                        layer.closeAll();
+                        if(dt.isRedirect) {
+                            location.href = dt.redirectURL;
+                        }else{
+                            if(dt.resultCode== '200') {
+                                var obj = JSON.parse("{" + dt.data.info + "}");
+                                WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                                    if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                        layer.open({
+                                            type: 2,
+                                            shadeClose: false,
+                                            content: "正在请求加载订单信息..."
+                                        }); // 调用加载弹出层
+                                        $.ajax({
+                                            type: 'post',
+                                            url: base_path +'/rent_order/check_rent_order_status',
+                                            data: {"orderId":dt.data.orderId},
+                                            dataType: 'json',
+                                            timeout: 15000,
+                                            success: function(data) {
+                                                //console.log(data);
+                                                if(data.status) {
+                                                    if(data.data.rentStatus == 2){
+                                                        isPay = true;
+                                                        mui.openWindow({url:'/watero/view/lease_order_win.html'});
+                                                    }else{
+                                                        mui.alert('如果已支付,请等待同步支付状态!', '', function() {
+                                                            isPay = true;
+                                                        });
+                                                    }
+                                                } else {
+                                                    isPay = true;
+                                                    mui.alert(data.message);
+                                                }
                                             },
-											type: 'post',
-											url: base_path +'/rent_order/check_rent_order_status',
-											data: {"orderId":dt.data.orderId},
-											dataType: 'json',
-											timeout: 15000,
-											success: function(data) {
-												//console.log(data);
-												if(data.status) {
-													if(data.data.rentStatus == 2){
-														isPay = true;
-														mui.openWindow({url:'/watero/view/lease_order_win.html'});
-													}else{
-														mui.alert('如果已支付,请等待同步支付状态!', '', function() {
-															isPay = true;
-														});
-													}
-												} else {
-													isPay = true;
-													mui.alert(data.message);
-												}
-											},
-											error: function(xhr, type, errorThrown) {
-												//异常处理;
-												console.log(xhr);
-												isPay = true;
-												mui.alert("请检查网络或刷新页面重试!");
-											}
-										});
-									} else {
-										isPay = true;
-										mui(th).button('reset');
-										mui.alert("对不起,支付失败!请稍后重试!");
-									}
-								});
-							} else {
-								mui(th).button('reset');
-								isPay = true;
-								mui.alert(dt.message);
-							}
-							} 
-						},
-						error: function(xhr, type, errorThrown) {
-							//异常处理;
-							console.log(xhr);
-							isPay = true;
-							layer.closeAll();
-							mui.alert("请检查网络或刷新页面重试!");
-							mui(th).button('reset');
-						}
-					});
-				}else{
-					mui.alert("正在请求支付中~~请稍后!");
-					return;
-				}
-			}
-		});
-		
-		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;
-					$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-					var btn_submit=$("#btn_submit");
-					if ($('#btn-tongyi').hasClass("mui-active")) {
-						btn_submit.addClass("mui-active").prop("disabled","disabled");
-						btn_submit.removeClass("active");
-					} else {
-						btn_submit.removeClass("mui-active").removeAttr("disabled");
-						btn_submit.addClass("active");
-					}
-				},
-				function() {
-					if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-						wechatAddr.status = true;
-					} else {
-						wechatAddr.status = false;
-						// 用户取消拉出地址
-						$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-						mui.alert("您没有选择收货地址!");
-					}
-				}
-			);
+                                            error: function(xhr, type, errorThrown) {
+                                                //异常处理;
+                                                console.log(xhr);
+                                                isPay = true;
+                                                mui.alert("请检查网络或刷新页面重试!");
+                                            }
+                                        });
+                                    } else {
+                                        isPay = true;
+                                        mui(th).button('reset');
+                                        mui.alert("对不起,支付失败!请稍后重试!");
+                                    }
+                                });
+                            } else {
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.message);
+                            }
+                        }
+                    },
+                    error: function(xhr, type, errorThrown) {
+                        //异常处理;
+                        console.log(xhr);
+                        isPay = true;
+                        layer.closeAll();
+                        mui.alert("请检查网络或刷新页面重试!");
+                        mui(th).button('reset');
+                    }
+                });
+            }else{
+                mui.alert("正在请求支付中~~请稍后!");
+                return;
+            }
+        }
+    });
+
+    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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                var btn_submit=$("#btn_submit");
+                if ($('#btn-tongyi').hasClass("mui-active")) {
+                    btn_submit.addClass("mui-active").prop("disabled","disabled");
+                    btn_submit.removeClass("active");
+                } else {
+                    btn_submit.removeClass("mui-active").removeAttr("disabled");
+                    btn_submit.addClass("active");
+                }
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                    mui.alert("您没有选择收货地址!");
+                }
+            }
+        );
+
+    });
 
-		});
-		
-$(".ul_radio li").each(function() {
-	$(this).on("click", function() {
-		$(this).addClass("active");
-		$(this).siblings().removeClass("active");
-	});
-});
+    $(".ul_radio li").each(function() {
+        $(this).on("click", function() {
+            $(this).addClass("active");
+            $(this).siblings().removeClass("active");
+        });
+    });
 
-$('#couponSelect').change(function(){
-	var serMoney = $('#couponSelect').val();
-	var money = rentMoney - serMoney;
-	$('#couponMoney').html('-¥' + accDiv(serMoney,100));
-	if(serMoney!=0){
-		$(".for_money").show();
-	}else{
-		$(".for_money").hide();
-	}
-	$('#rentPayMoney').html('¥' + accDiv(money,100));
-});
+    $('#couponSelect').change(function(){
+        var serMoney = $('#couponSelect').val();
+        var money = rentMoney - serMoney;
+        $('#couponMoney').html('-¥' + accDiv(serMoney,100));
+        if(serMoney!=0){
+            $(".for_money").show();
+        }else{
+            $(".for_money").hide();
+        }
+        $('#rentPayMoney').html('¥' + accDiv(money,100));
+    });
 
-$(document).on('tap', '#btn-tongyi', function() {
-	var btn_submit=$("#btn_submit");
-	if($(this).hasClass("mui-active")){
-		$(this).removeClass("mui-active");
-		if(wechatAddr.status){
-			btn_submit.removeClass("mui-active").removeAttr("disabled");
-			btn_submit.addClass("active");
-		}else{
-			btn_submit.addClass("mui-active").prop("disabled","disabled");
-			btn_submit.removeClass("active");
-		}
-	}else{
-		$(this).addClass("mui-active");
-		btn_submit.addClass("mui-active").prop("disabled","disabled");
-		btn_submit.removeClass("active");
-	}
-});
-/*
-$(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");
-	}
-}); */
-mui('body').on('tap', '#xieyi-dalog', function() {
-	mui.openWindow({
-		url: '/watero/html/rent/try_xieyi.html'
-	});
-});
-		</script>
-	</body>
+    $(document).on('tap', '#btn-tongyi', function() {
+        var btn_submit=$("#btn_submit");
+        if($(this).hasClass("mui-active")){
+            $(this).removeClass("mui-active");
+            if(wechatAddr.status){
+                btn_submit.removeClass("mui-active").removeAttr("disabled");
+                btn_submit.addClass("active");
+            }else{
+                btn_submit.addClass("mui-active").prop("disabled","disabled");
+                btn_submit.removeClass("active");
+            }
+        }else{
+            $(this).addClass("mui-active");
+            btn_submit.addClass("mui-active").prop("disabled","disabled");
+            btn_submit.removeClass("active");
+        }
+    });
+	/*
+	 $(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");
+	 }
+	 }); */
+    mui('body').on('tap', '#xieyi-dalog', function() {
+        mui.openWindow({
+            url: '/watero/view/rent/try_xieyi.html'
+        });
+    });
+</script>
+</body>
 
 </html>

+ 393 - 399
watero-wechat-web/src/main/webapp/view/i_want_lease_test.html

@@ -1,413 +1,407 @@
 <!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">
-			.mui-backdrop {
-				position: fixed;
-				z-index: 998;
-				top: 0;
-				right: 0;
-				bottom: 0;
-				left: 0;
-				background: url(/watero/images/shop/share-lease.png) top center no-repeat rgba(0, 0, 0, .4);
-				background-size: 100%;
-			}
-			.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;font-size: 20px;}
-    .my-btn-hand.active{background-color: #ccc;}
-    .cl-blue{color: #1cc9f4;}
-    .iconfont{font-size: 20px;}
-    .mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
-    .lease-ul{font-size: 14px;color: #999;}
-    .lease-ul:after,.no-line:after,.no-line:before{display: none;}
-    .lease-left{display: inline-block;width: 20%;}
-    .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;}
-	.ul_radio .radio5,.ul_radio .radio6,.ul_radio .radio7,.ul_radio .radio8{border: 0;}
-	.radio5{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio5:before,.radio6:before,.radio7:before,.radio8:before{content: 'watero水杯';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
-	.radio6{background: url(/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio7{background: url(/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio8{background: url(/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.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;}
-	.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color: #1cc9f4;}
-	.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio]{left: 0;}
-	.mui-checkbox.mui-left label, .mui-radio.mui-left label{padding-left: 35px;font-size: 12px;color: #999;}
-	.icon-lease2{font-size: 15px;padding-left: 22px;}
-	.icon-lease2:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-	#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
-	.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-	.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
-	.my-btn-exchange{background: #f5f5f5 !important;text-align: center;border: 0 !important;font-size: 14px;margin-bottom: 0 !important;}
-	.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
-	.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
-	.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
-	.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
-		</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": "已取消分享"
-	};
-	//getConfig();
-		</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">
+		.mui-backdrop {
+			position: fixed;
+			z-index: 998;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background: url(//s.iamberry.com/watero/images/shop/share-lease.png) top center no-repeat rgba(0, 0, 0, .4);
+			background-size: 100%;
+		}
+		.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;font-size: 20px;}
+		.my-btn-hand.active{background-color: #ccc;}
+		.cl-blue{color: #1cc9f4;}
+		.iconfont{font-size: 20px;}
+		.mui-content-madded{background: #fff;padding: 10px 10px 40px 10px;}
+		.lease-ul{font-size: 14px;color: #999;}
+		.lease-ul:after,.no-line:after,.no-line:before{display: none;}
+		.lease-left{display: inline-block;width: 20%;}
+		.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;}
+		.ul_radio .radio5,.ul_radio .radio6,.ul_radio .radio7,.ul_radio .radio8{border: 0;}
+		.radio5{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio5:before,.radio6:before,.radio7:before,.radio8:before{content: 'watero水杯';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
+		.radio6{background: url(//s.iamberry.com/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio7{background: url(//s.iamberry.com/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio8{background: url(//s.iamberry.com/watero/images/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.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;}
+		.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color: #1cc9f4;}
+		.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio]{left: 0;}
+		.mui-checkbox.mui-left label, .mui-radio.mui-left label{padding-left: 35px;font-size: 12px;color: #999;}
+		.icon-lease2{font-size: 15px;padding-left: 22px;}
+		.icon-lease2:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		#open-wechat-addres-a{margin: -15px -15px -15px -28px !important;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		.mui-h5, h5 {margin-left: 30px;font-size: 12px;}
+		.my-btn-exchange{background: #f5f5f5 !important;text-align: center;border: 0 !important;font-size: 14px;margin-bottom: 0 !important;}
+		.icon-fuxuankuang a{color: #24cae9;text-decoration:underline;font-size: 12px;}
+		.icon-fuxuankuang{font-size: 14px;padding:5px 5px 5px 22px;}
+		.icon-fuxuankuang:before{font-size: 15px;margin-top: 5px;margin-right: 3px;color:#e4004d;}
+		.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
+	</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": "已取消分享"
+        };
+        //getConfig();
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div id="lease-slider" class="mui-slider">
+		<div class="mui-slider-group">
+			<div class="mui-slider-item">
+				<a>
+					<img src="//s.iamberry.com/watero/images/shop/banner-lease2.png">
+				</a>
 			</div>
 		</div>
-		<div class="mui-content">
-				<div id="lease-slider" class="mui-slider">
-					<div class="mui-slider-group">
-						<div class="mui-slider-item">
-							<a>
-								<img src="/watero/wateroimages/shop/banner-lease2.png">
-							</a>
-						</div>
-					</div>
-					<!-- <div class="mui-slider-indicator">
-						<div class="mui-indicator"></div>
-					</div> -->
-				</div>
-				<ul class="mui-table-view no-line">
-					<li class="mui-table-view-cell">
-						<span class="iconfont icon-lease3 cl-blue"></span>&nbsp;美国watero净饮水一体机
-					</li>
-				</ul>
-				<div class="mui-content-madded" style="padding-bottom: 80px;padding-top: 0;">
-					<div class="lease-select-box">
-					<div class="lease-left"><span class="lease-select">选择颜色:</span></div>
-					<div style="display:inline-block;width:73%;text-align: right;">
-					<ul class="ul_radio">
-						<li class="radio1 active" id="3"></li>
-						<li class="radio2" id="2"></li>
-						<li class="radio3" id="4"></li>
-						<li class="radio4" id="1"></li>
-					</ul>
-					</div>
-					</div>
-					<div style="padding:0 0 10px 0;"><span>选择租期:</span></div>
-				<form class="my-input-group">
-					<div class="mui-input-row mui-radio mui-left">
-						<label>租一年   <span class="cl-red">¥1599.00   (800元押金+799元服务费)</span></label>
-						<input name="radio1" type="radio" value="1" checked>
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>租两年(免押金) <span class="cl-red">¥1499.00(0元押金+1499元服务费)</span></label>
-						<input name="radio1" type="radio" value="2">
-					</div>
-				</form>
-				<ul class="mui-table-view" style="padding: 10px 0;margin: 10px 0 0 0;">
-					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
-						<span class="iconfont icon-lease2">收货信息</span><span class="mui-h5">请选择收货地址</span>
-						<!-- <ul class="ft-12" style="color: #333;">
-							<li>收  货  人:林林</li>
-							<li>手 机 号:15999999999</li>
-							<li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
-						</ul> -->
-						</a>	
-					</li>
-				</ul>
-				 <div style="padding:10px 0;"><span>推荐人</span><span class="mui-h6">(核实后,将会为推荐人免去半年服务费)</span></div>
-				 <div>
-				 		<input type="tel" value="" placeholder="请填写推荐人手机号码" maxlength="11" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
-				 </div>
-				  <ul class="mui-table-view no-line">
-				<li style="padding:20px 10px 20px 10px;text-align: center;">
-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero租赁协议》</a></span>
-					</li>
+		<!-- <div class="mui-slider-indicator">
+            <div class="mui-indicator"></div>
+        </div> -->
+	</div>
+	<ul class="mui-table-view no-line">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-lease3 cl-blue"></span>&nbsp;美国watero净饮水一体机
+		</li>
+	</ul>
+	<div class="mui-content-madded" style="padding-bottom: 80px;padding-top: 0;">
+		<div class="lease-select-box">
+			<div class="lease-left"><span class="lease-select">选择颜色:</span></div>
+			<div style="display:inline-block;width:73%;text-align: right;">
+				<ul class="ul_radio">
+					<li class="radio1 active" id="3"></li>
+					<li class="radio2" id="2"></li>
+					<li class="radio3" id="4"></li>
+					<li class="radio4" id="1"></li>
 				</ul>
-				<div class="mui-text-center">
-					<span id="pay_text">支付定金:</span><span class="cl-red" id="pay_price">¥99.00</span>
-				</div>
-				</div>
-				
-			<div class="buy-footer">
-				<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn my-btn-hand active" id="btn_submit" disabled="disabled">立即支付</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>
-		//wechatAddr.status=true;
-		var check = false,alert_msg='';
-		var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
-		var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
-		var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
-			mui.ready(function() {
-				$(".ul_radio li").each(function() {
-					$(this).on("click", function() {
-						$(this).addClass("active");
-						$(this).siblings().removeClass("active");
-					});
-				});
-				$(".mui-radio input[name=radio1]").each(function() {
-					$(this).on("click", function() {
-						if(city=='深圳市' || wechatAddr.status==false){
-							$("#pay_price").text('¥99.00');
-							$("#pay_text").text('支付定金:');
-						}else{
-							$("#pay_text").text('支付金额:');
-							if($(this).val()=='1'){
-								$("#pay_price").text('¥1599.00');
-							}else{
-								$("#pay_price").text('¥1499.00');
-							}
-						}
-					});
-				});
-				$.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
-					data: {},
-                    xhrFields: {
-                        withCredentials: true
+		<div style="padding:0 0 10px 0;"><span>选择租期:</span></div>
+		<form class="my-input-group">
+			<div class="mui-input-row mui-radio mui-left">
+				<label>租一年   <span class="cl-red">¥1599.00   (800元押金+799元服务费)</span></label>
+				<input name="radio1" type="radio" value="1" checked>
+			</div>
+			<div class="mui-input-row mui-radio mui-left">
+				<label>租两年(免押金) <span class="cl-red">¥1499.00(0元押金+1499元服务费)</span></label>
+				<input name="radio1" type="radio" value="2">
+			</div>
+		</form>
+		<ul class="mui-table-view" style="padding: 10px 0;margin: 10px 0 0 0;">
+			<li class="mui-table-view-cell">
+				<a class="mui-navigate-right" id="open-wechat-addres-a">
+					<span class="iconfont icon-lease2">收货信息</span><span class="mui-h5">请选择收货地址</span>
+					<!-- <ul class="ft-12" style="color: #333;">
+                        <li>收  货  人:林林</li>
+                        <li>手 机 号:15999999999</li>
+                        <li>详细地址:广东省深圳市福田区莲花街道特区报业大厦12B</li>
+                    </ul> -->
+				</a>
+			</li>
+		</ul>
+		<div style="padding:10px 0;"><span>推荐人</span><span class="mui-h6">(核实后,将会为推荐人免去半年服务费)</span></div>
+		<div>
+			<input type="tel" value="" placeholder="请填写推荐人手机号码" maxlength="11" class="mui-input-clear my-btn-exchange" id="ipt-exchange"/>
+		</div>
+		<ul class="mui-table-view no-line">
+			<li style="padding:20px 10px 20px 10px;text-align: center;">
+				<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">我已经阅读并同意<a id="xieyi-dalog">《美国watero租赁协议》</a></span>
+			</li>
+		</ul>
+		<div class="mui-text-center">
+			<span id="pay_text">支付定金:</span><span class="cl-red" id="pay_price">¥99.00</span>
+		</div>
+	</div>
+
+	<div class="buy-footer">
+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn my-btn-hand active" 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>
+    //wechatAddr.status=true;
+    var check = false,alert_msg='';
+    var uname = /^[A-Za-z\-\u4e00-\u9fa5]{1,10}$/;//简体中文英文
+    var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //11位手机号码
+    var isPay = true; // 是否在请求支付,false表示正在请求,true可以请求
+    mui.ready(function() {
+        $(".ul_radio li").each(function() {
+            $(this).on("click", function() {
+                $(this).addClass("active");
+                $(this).siblings().removeClass("active");
+            });
+        });
+        $(".mui-radio input[name=radio1]").each(function() {
+            $(this).on("click", function() {
+                if(city=='深圳市' || wechatAddr.status==false){
+                    $("#pay_price").text('¥99.00');
+                    $("#pay_text").text('支付定金:');
+                }else{
+                    $("#pay_text").text('支付金额:');
+                    if($(this).val()=='1'){
+                        $("#pay_price").text('¥1599.00');
+                    }else{
+                        $("#pay_price").text('¥1499.00');
+                    }
+                }
+            });
+        });
+        mui.ajax(base_path + '/giftCard/card/product/details?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        });
+
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
+    mui('body').on('tap', '#btn_submit', function() {
+        change_input();
+        var th=this;
+        if(check){
+            if(isPay) {
+                isPay = false; // 锁定请求按钮
+                mui(this).button('loading');
+                var param = {
+                    "applyColor":$(".ul_radio .active").attr("id"),
+                    "applyTime": $("input[name=radio1]:checked").val(),
+                    "applyAddr": address,
+                    "applyName": nickname,
+                    "applyTel":ads_tel,
+                    "applyReTel":$("#ipt-exchange").val().trim(),
+                };
+                $.ajax({
+                    type: 'post',
+                    url: '/watero/wechat/leaseOrder/apply?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.resultCode=='200' && dt.returnCode=='200') {
+                                var obj = JSON.parse("{" + dt.returnMsg.returnMsg + "}");
+                                WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                                    if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                        mui.openWindow({url:'/watero/view/lease_order_win.html'});
+                                    } else {
+                                        isPay = true;
+                                        mui(th).button('reset');
+                                        mui.alert("对不起,支付失败!请稍后重试!");
+                                    }
+                                });
+                            } else {
+                                mui(th).button('reset');
+                                isPay = true;
+                                mui.alert(dt.returnMsg);
+                            }
+                        }
                     },
-					dataType: 'json',
-					type: 'post',
-					timeout: 15000,
-					success: function(dt) {
-						//console.log(dt);
-						if(dt.isRedirect) {
-							location.href = dt.redirectURL;
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						console.log(xhr)
-					}
-				});
-				
-				document.querySelector('.loading-bg').style.display = 'none';
-			});
-mui('body').on('tap', '#btn_submit', function() {
-	change_input();
-	var th=this;
-	if(check){
-			if(isPay) {
-			isPay = false; // 锁定请求按钮
-			mui(this).button('loading');
-			var param = {
-					"applyColor":$(".ul_radio .active").attr("id"),
-					"applyTime": $("input[name=radio1]:checked").val(),
-					"applyAddr": address,
-					"applyName": nickname,
-					"applyTel":ads_tel,
-					"applyReTel":$("#ipt-exchange").val().trim(),
-				};
-			$.ajax({
-                xhrFields: {
-                    withCredentials: true
-                },
-				type: 'post',
-				url: '/watero/wechat/leaseOrder/apply?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.resultCode=='200' && dt.returnCode=='200') {
-						var obj = JSON.parse("{" + dt.returnMsg.returnMsg + "}");
-						WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-							if(res.err_msg == 'get_brand_wcpay_request:ok') {
-								mui.openWindow({url:'/watero/view/lease_order_win.html'});
-							} else {
-								isPay = true;
-								mui(th).button('reset');
-								mui.alert("对不起,支付失败!请稍后重试!");
-							}
-						});
-					} else {
-						mui(th).button('reset');
-						isPay = true;
-						mui.alert(dt.returnMsg);
-					}
-					} 
-				},
-				error: function(xhr, type, errorThrown) {
-					//异常处理;
-					console.log(xhr);
-					isPay = true;
-					mui.alert("请检查网络或刷新页面重试!");
-					mui(th).button('reset');
-				}
-			});
-		}else{
-			mui.alert("正在请求支付中~~请稍后!");
-			return;
-		}
-	}else{
-		mui.alert(alert_msg);
-	}
-});
-mui('body').on('tap', '#xieyi-dalog', function() {
-	mui.openWindow({
-		url: '/watero/view/lease_test_xieyi.html'
-	});
-});
-$(document).on('tap', '#btn-tongyi', function() {
-	var btn_submit=$("#btn_submit");
-	if($(this).hasClass("mui-active")){
-		$(this).removeClass("mui-active");
-		check=true;
-		if(wechatAddr.status){
-			btn_submit.removeClass("active").removeAttr("disabled");
-		}else{
-			btn_submit.addClass("active").prop("disabled","disabled");
-		}
-	}else{
-		check=false;
-		$(this).addClass("mui-active");
-		btn_submit.addClass("active").prop("disabled","disabled");
-	}
-});
-var address='',nickname='',ads_tel='',city='';
-//获取微信共享地址
-mui('body').on('tap', '#open-wechat-addres-a', function() {
-	editAddrV1(
-		function(res) {
-			// 用户成功拉出地址 
-			address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
-			city=res.cityName;
-			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;
-			$("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
-			if(city=='深圳市'){
-				$("#pay_price").text('¥99.00');
-				$("#pay_text").text('支付定金:');
-			}else{
-				$("#pay_text").text('支付金额:');
-				if($("input[name=radio1]:checked").val()=='1'){
-					$("#pay_price").text('¥1599.00');
-				}else{
-					$("#pay_price").text('¥1499.00');
-				}
-			}
-			if(check){
-				$(this).removeClass("mui-active");
-				$("#btn_submit").removeClass("active").removeAttr("disabled");
-			}
-		},
-		function() {
-			if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
-				wechatAddr.status = true;
-			} else {
-				wechatAddr.status = false;
-				// 用户取消拉出地址
-				$('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
-			}
-		}
-	);
+                    error: function(xhr, type, errorThrown) {
+                        //异常处理;
+                        console.log(xhr);
+                        isPay = true;
+                        mui.alert("请检查网络或刷新页面重试!");
+                        mui(th).button('reset');
+                    }
+                });
+            }else{
+                mui.alert("正在请求支付中~~请稍后!");
+                return;
+            }
+        }else{
+            mui.alert(alert_msg);
+        }
+    });
+    mui('body').on('tap', '#xieyi-dalog', function() {
+        mui.openWindow({
+            url: '/watero/view/lease_test_xieyi.html'
+        });
+    });
+    $(document).on('tap', '#btn-tongyi', function() {
+        var btn_submit=$("#btn_submit");
+        if($(this).hasClass("mui-active")){
+            $(this).removeClass("mui-active");
+            check=true;
+            if(wechatAddr.status){
+                btn_submit.removeClass("active").removeAttr("disabled");
+            }else{
+                btn_submit.addClass("active").prop("disabled","disabled");
+            }
+        }else{
+            check=false;
+            $(this).addClass("mui-active");
+            btn_submit.addClass("active").prop("disabled","disabled");
+        }
+    });
+    var address='',nickname='',ads_tel='',city='';
+    //获取微信共享地址
+    mui('body').on('tap', '#open-wechat-addres-a', function() {
+        editAddrV1(
+            function(res) {
+                // 用户成功拉出地址 
+                address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
+                city=res.cityName;
+                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;
+                $("#open-wechat-addres-a").empty().append('<ul class="ft-12" style="color: #333;"><li>收  货  人:'+ wechatAddr.userName +'</li><li>手 机 号:' + wechatAddr.userTel + '</li><li>详细地址:'+ wechatAddr.detailInfo+'</li></ul>');
+                if(city=='深圳市'){
+                    $("#pay_price").text('¥99.00');
+                    $("#pay_text").text('支付定金:');
+                }else{
+                    $("#pay_text").text('支付金额:');
+                    if($("input[name=radio1]:checked").val()=='1'){
+                        $("#pay_price").text('¥1599.00');
+                    }else{
+                        $("#pay_price").text('¥1499.00');
+                    }
+                }
+                if(check){
+                    $(this).removeClass("mui-active");
+                    $("#btn_submit").removeClass("active").removeAttr("disabled");
+                }
+            },
+            function() {
+                if($('#open-wechat-addres-a').html() != null && $('#open-wechat-addres-a').html() != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    $('#open-wechat-addres-a').html('收货地址<span class="mui-h5">请选择收货地址</span>');
+                }
+            }
+        );
 
-});
-function change_input() {
-	if($("#btn-tongyi").hasClass("mui-active")){
-		alert_msg="请勾选同意《美国watero代理说明》";
-		check=false;
-		return false;
-	}else{
-		check=true;
-	}
-	if(mobile.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
-		check=true;
-	}else{
-		alert_msg="手机号码不正确,请重新填写";
-		check=false;
-		return false;
-	}
-	if(wechatAddr.status){
-		check=true;
-	}else{
-		alert_msg="请选择收货地址";
-		check=false;
-		return false;
-	}
-	if(check) {
-		$("#btn_submit").removeClass("mui-active").removeAttr("disabled");
-	}else{
-		$("#btn_submit").addClass("mui-active").prop("disabled","disabled");
-	}
-}
-mui.os.ios ? listener_ipt() : keyup_fn();
+    });
+    function change_input() {
+        if($("#btn-tongyi").hasClass("mui-active")){
+            alert_msg="请勾选同意《美国watero代理说明》";
+            check=false;
+            return false;
+        }else{
+            check=true;
+        }
+        if(mobile.test($("#ipt-exchange").val().trim()) || $("#ipt-exchange").val().trim()==''){
+            check=true;
+        }else{
+            alert_msg="手机号码不正确,请重新填写";
+            check=false;
+            return false;
+        }
+        if(wechatAddr.status){
+            check=true;
+        }else{
+            alert_msg="请选择收货地址";
+            check=false;
+            return false;
+        }
+        if(check) {
+            $("#btn_submit").removeClass("mui-active").removeAttr("disabled");
+        }else{
+            $("#btn_submit").addClass("mui-active").prop("disabled","disabled");
+        }
+    }
+    mui.os.ios ? listener_ipt() : keyup_fn();
 
-function keyup_fn() {
-	$(document).on('keyup', '#ipt-exchange', function(e) {
-		change_input();
-			if(check){
-				$("#btn_submit").removeClass("active").removeAttr("disabled");
-			}else{
-				$("#btn_submit").addClass("active").prop("disabled","disabled");
-			}
-	});
-}
+    function keyup_fn() {
+        $(document).on('keyup', '#ipt-exchange', function(e) {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
+            }
+        });
+    }
 
-function listener_ipt() {
-	document.getElementById('ipt-exchange').onblur = function() {
-		change_input();
-		if(check){
-			$("#btn_submit").removeClass("active").removeAttr("disabled");
-		}else{
-			$("#btn_submit").addClass("active").prop("disabled","disabled");
-		}
-	}
-}
-mui('body').on('tap', '#btn-share-mask', function() {
-			mask.show();//显示遮罩
-	});
-var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调;
-//mask.close();//关闭遮罩
-		</script>
-	</body>
+    function listener_ipt() {
+        document.getElementById('ipt-exchange').onblur = function() {
+            change_input();
+            if(check){
+                $("#btn_submit").removeClass("active").removeAttr("disabled");
+            }else{
+                $("#btn_submit").addClass("active").prop("disabled","disabled");
+            }
+        }
+    }
+    mui('body').on('tap', '#btn-share-mask', function() {
+        mask.show();//显示遮罩
+    });
+    var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调;
+    //mask.close();//关闭遮罩
+</script>
+</body>
 
 </html>

+ 346 - 355
watero-wechat-web/src/main/webapp/view/i_want_to_renew.html

@@ -1,366 +1,357 @@
 <!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;}
-			.year-list{width: 100%;}
-			.year-list>li{float: left;width: 22%;text-align: center;color: #1cc9f4;}
-			.year-list>li:first-child{text-align: left;width: 17%;}
-			.year-list>li:last-child{text-align: right;width: 17%;}
-			.mui-input-row.mui-input-range{padding-right: 0;}
-			.my-select {border:0!important;color: #999;background-color: #f5f5f5;margin-bottom: 0;padding: 3px 14px;text-align: center;-webkit-appearance: none;height: 40px;}
-			.after{padding: 0 11px;position: relative;}
-			.after:before{content:'';position:absolute;right: 20px;top: 16px;width: 0;height: 0;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 7px solid #666;}
-			.my-view1:after,.my-view1 li:after{display: none;}
-			.loading{position: fixed;display:none;left: 0;top: 0;right: 0;bottom: 0;width: 100%;height: 100%;background: rgba(0,0,0,.8);color: #fff;text-align: center;padding-top: 50%;font-size: 18px;}
-			/* 设定WebKit浏览器下range */  
-			/*拖动块的样式*/  
-			.mui-input-range input[type=range]::-webkit-slider-thumb {  
-			  -webkit-appearance: none;/*清除系统默认样式*/  
-			  height: 26px;/*拖动块高度*/  
-			  width: 26px;/*拖动块宽度*/  
-			  background: #1cc9f4;/*拖动块背景*/  
-			  border-radius: 50%; /*外观设置为圆形*/  
-			  border: solid 1px #ddd; /*设置边框*/  
-			} 
-			/*横条样式*/  
-			input[type=range] {  
-			  -webkit-appearance: none;/*清除系统默认样式*/  
-			  width: 100%;  
-			  background: -webkit-linear-gradient(#1cc9f4, #1cc9f4) no-repeat, #ddd;/*设置左边颜色为#61bd12,右边颜色为#ddd*/  
-			  background-size: 0% 100%;/*设置左右宽度比例*/  
-			  height: 3px;/*横条的高度*/  
-			} 
-		</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;}
+		.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;}
+		.year-list{width: 100%;}
+		.year-list>li{float: left;width: 22%;text-align: center;color: #1cc9f4;}
+		.year-list>li:first-child{text-align: left;width: 17%;}
+		.year-list>li:last-child{text-align: right;width: 17%;}
+		.mui-input-row.mui-input-range{padding-right: 0;}
+		.my-select {border:0!important;color: #999;background-color: #f5f5f5;margin-bottom: 0;padding: 3px 14px;text-align: center;-webkit-appearance: none;height: 40px;}
+		.after{padding: 0 11px;position: relative;}
+		.after:before{content:'';position:absolute;right: 20px;top: 16px;width: 0;height: 0;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 7px solid #666;}
+		.my-view1:after,.my-view1 li:after{display: none;}
+		.loading{position: fixed;display:none;left: 0;top: 0;right: 0;bottom: 0;width: 100%;height: 100%;background: rgba(0,0,0,.8);color: #fff;text-align: center;padding-top: 50%;font-size: 18px;}
+		/* 设定WebKit浏览器下range */
+		/*拖动块的样式*/
+		.mui-input-range input[type=range]::-webkit-slider-thumb {
+			-webkit-appearance: none;/*清除系统默认样式*/
+			height: 26px;/*拖动块高度*/
+			width: 26px;/*拖动块宽度*/
+			background: #1cc9f4;/*拖动块背景*/
+			border-radius: 50%; /*外观设置为圆形*/
+			border: solid 1px #ddd; /*设置边框*/
+		}
+		/*横条样式*/
+		input[type=range] {
+			-webkit-appearance: none;/*清除系统默认样式*/
+			width: 100%;
+			background: -webkit-linear-gradient(#1cc9f4, #1cc9f4) no-repeat, #ddd;/*设置左边颜色为#61bd12,右边颜色为#ddd*/
+			background-size: 0% 100%;/*设置左右宽度比例*/
+			height: 3px;/*横条的高度*/
+		}
+	</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;">
-			<ul class="mui-table-view mui-text-center my-table-noline">
-				<li class="mui-table-view-cell">
-					<span id="machineStopDate" class="mui-h6" ></span>
-				</li>
-				<li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/my_equipment.png" width="50%" />
-					<span id="machineNO" style="position: absolute;color: #fff;left: 50%;top: 70%;-webkit-transform: translateX(-50%);"></span>
-				</li>
-				<li class="mui-table-view-cell">
-					<button type="button" id="machineConnectState" class="my-btn-bluetooth mui-btn-link">
-						未连接
-					</button>
-				</li>
-				<li class="mui-table-view-cell" style="padding: 0 35px;">
-					 <div class="mui-input-row mui-input-range">
-		            <input type="range" id='block-range' name="rechargeDuration" value="1" min="1" max="5" >
-					 </div>
-					 <ul class="year-list">
-					 	<li>1年</li>
-					 	<li>2年</li>
-					 	<li>3年</li>
-					 	<li>4年</li>
-					 	<li>5年</li>
-					 </ul>
-				</li>
-				<li class="mui-table-view-cell mui-text-left">
-					<span class="mui-h5">服务费:</span><span class="cl-red" id="serviceCharge">¥799 元</span><span class="mui-h6 mui-pull-right">到期时间:<span id="rechargeStopDate"></span></span>
-				</li>
-				<li class="mui-table-view-cell" style="text-align: left;">
-						<span class="mui-h6">使用抵扣券</span>
-					</li>
-					<li class="after">
-						<select class="my-select" id="couponSelect" name="couponId">
-							
-						</select>
-					</li>
-					<li class="mui-table-view-cell" style="text-align: left;">
-						<div><span class="mui-h6">抵扣金额:</span><span id="couponMoney" class="cl-red mui-pull-right">- ¥0 元</span></div>
-					</li>
-					<li class="mui-table-view-cell">
-					支付金额:<span class="cl-red" id="payCharge">¥799 元</span>
-					</li>
-				<li class="mui-table-view-cell">
-					<button id="sbumitRent" type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="支付中,请稍候"  class="" disabled>
-						确认续租
-					</button>
-				</li>
-				<li class="mui-table-view-cell">
-					<a id="toRechargeLog" style="text-decoration: underline;font-size: 13px;color: #999;">续租记录</a>
-				</li>
+</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">
+			<span id="machineStopDate" class="mui-h6" ></span>
+		</li>
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/my_equipment.png" width="50%" />
+			<span id="machineNO" style="position: absolute;color: #fff;left: 50%;top: 70%;-webkit-transform: translateX(-50%);"></span>
+		</li>
+		<li class="mui-table-view-cell">
+			<button type="button" id="machineConnectState" class="my-btn-bluetooth mui-btn-link">
+				未连接
+			</button>
+		</li>
+		<li class="mui-table-view-cell" style="padding: 0 35px;">
+			<div class="mui-input-row mui-input-range">
+				<input type="range" id='block-range' name="rechargeDuration" value="1" min="1" max="5" >
+			</div>
+			<ul class="year-list">
+				<li>1年</li>
+				<li>2年</li>
+				<li>3年</li>
+				<li>4年</li>
+				<li>5年</li>
 			</ul>
-	</div>
-	<div class="loading">
+		</li>
+		<li class="mui-table-view-cell mui-text-left">
+			<span class="mui-h5">服务费:</span><span class="cl-red" id="serviceCharge">¥799 元</span><span class="mui-h6 mui-pull-right">到期时间:<span id="rechargeStopDate"></span></span>
+		</li>
+		<li class="mui-table-view-cell" style="text-align: left;">
+			<span class="mui-h6">使用抵扣券</span>
+		</li>
+		<li class="after">
+			<select class="my-select" id="couponSelect" name="couponId">
+
+			</select>
+		</li>
+		<li class="mui-table-view-cell" style="text-align: left;">
+			<div><span class="mui-h6">抵扣金额:</span><span id="couponMoney" class="cl-red mui-pull-right">- ¥0 元</span></div>
+		</li>
+		<li class="mui-table-view-cell">
+			支付金额:<span class="cl-red" id="payCharge">¥799 元</span>
+		</li>
+		<li class="mui-table-view-cell">
+			<button id="sbumitRent" type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="支付中,请稍候"  class="" disabled>
+				确认续租
+			</button>
+		</li>
+		<li class="mui-table-view-cell">
+			<a id="toRechargeLog" style="text-decoration: underline;font-size: 13px;color: #999;">续租记录</a>
+		</li>
+	</ul>
+</div>
+<div class="loading">
 	支付中,请稍候<span class="dian">...</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 src="/watero/waterojs/shop/layer.js"></script>
-	<script src="/watero/waterojs/wechat_iot.js?v=6734343"></script>
-	<script type="text/javascript">
-	var machineDeviceId = '',machineId = '',couponId = '',stopDate = '';
-	var rechargeOrderId = '', payUrl = '';
-	var payData = {};
-	var yearNum = 1;//最后要充值的年数
-	var isPay = true;
-	//每充一年需要多少钱			最后要充值的费用		优惠金额
-	var payMoneyOne = 799, payMoney = 799,couponMoney = 0;
-	mui.ready(function(){
-		machineId = getParam("machineId");
-		$('#block-range').val(1);
-		initMachine(machineId);
-		//判断机器是否在线
-		setTimeout("myInterval()",3000);//1000为1秒钟
-		document.querySelector('.loading-bg').style.display='none';
-	});
-	function myInterval(){
-		sendMsgAndReceiveData(machineDeviceId,"*getData#",function(state,res){
-			 if(200 == state){
-				//1.去掉遮罩
-				document.querySelector('.loading-bg').style.display='none';
-				//2.“确认续租”按钮亮起
-				$("#sbumitRent").addClass("my-btn-water-quality");
-				$("#sbumitRent").addClass("active");
-				$("#sbumitRent").removeAttr("disabled");
-			 }
-			 if(500 == state){
-				//1.去掉遮罩
-				document.querySelector('.loading-bg').style.display='none';
-				//2.弹框该机器不可续费
-				$("#sbumitRent").prop("disabled","disabled");
-				$("#machineConnectState").text('未连接');
-			}
-		}); 
-	}
-	/**
-	*	初始化服务费抵扣券下拉框和机器信息
-	*/
-	function initMachine(machineId){
-		$.ajax(base_path + '/machine/get_coupons_machine?dates=' + new Date().getTime(), {
-			data:{
-				"machineId":machineId
-			},
-            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 src="//s.iamberry.com/watero/js/shop/layer.js"></script>
+<script src="//s.iamberry.com/watero/js/wechat_iot.js?v=6734343"></script>
+<script type="text/javascript">
+    var machineDeviceId = '',machineId = '',couponId = '',stopDate = '';
+    var rechargeOrderId = '', payUrl = '';
+    var payData = {};
+    var yearNum = 1;//最后要充值的年数
+    var isPay = true;
+    //每充一年需要多少钱			最后要充值的费用		优惠金额
+    var payMoneyOne = 799, payMoney = 799,couponMoney = 0;
+    mui.ready(function(){
+        machineId = getParam("machineId");
+        $('#block-range').val(1);
+        initMachine(machineId);
+        //判断机器是否在线
+        setTimeout("myInterval()",3000);//1000为1秒钟
+        document.querySelector('.loading-bg').style.display='none';
+    });
+    function myInterval(){
+        sendMsgAndReceiveData(machineDeviceId,"*getData#",function(state,res){
+            if(200 == state){
+                //1.去掉遮罩
+                document.querySelector('.loading-bg').style.display='none';
+                //2.“确认续租”按钮亮起
+                $("#sbumitRent").addClass("my-btn-water-quality");
+                $("#sbumitRent").addClass("active");
+                $("#sbumitRent").removeAttr("disabled");
+            }
+            if(500 == state){
+                //1.去掉遮罩
+                document.querySelector('.loading-bg').style.display='none';
+                //2.弹框该机器不可续费
+                $("#sbumitRent").prop("disabled","disabled");
+                $("#machineConnectState").text('未连接');
+            }
+        });
+    }
+    /**
+     *	初始化服务费抵扣券下拉框和机器信息
+     */
+    function initMachine(machineId){
+        mui.ajax(base_path + '/machine/get_coupons_machine?dates=' + new Date().getTime(), {
+            data:{
+                "machineId":machineId
+            },
+            dataType:'json',
+            type:'post',
+            timeout:15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.resultCode == 200 && dt.returnCode == 200){
+                        var couponList = dt.returnMsg.couponList;
+                        var machine = dt.returnMsg.machine;
+                        machineDeviceId = machine.machineDeviceId;
+                        stopDate = machine.machineStopDate;
+                        $("#machineStopDate").text(stopDate + '  到期');
+                        $("#rechargeStopDate").text(addYears(stopDate,1));
+
+                        $("#machineNO").text("NO." + (10000 + parseInt(machineId)));
+                        if(machine.machineConnectState == 1){
+                            $("#machineConnectState").text('已连接');
+                        }else{
+                            $("#machineConnectState").text('未连接');
+                        }
+
+                        var couponSelect = $("#couponSelect");
+                        if(couponList.length == 0){
+                            $("#couponSelect").append('<option value="0">没有可用的抵扣券</option>');
+                        }else{
+                            couponSelect.append('<option serviceMoney="0" value="0">请选择抵扣券</option>');
+                            mui(couponList).each(function(index) {
+                                couponSelect.append('<option value="' + this.serviceId + '" serviceMoney="' + accDiv(this.serviceMoney,100) + '">' + this.serviceName + '</option>');
+                            });
+                        }
+                    }else{
+                        mui.alert("该机器不可以续费!请选择正确的机器!");
+                    }
+                }
             },
-			dataType:'json',
-			type:'post',
-			timeout:15000,
-			success: function(dt) {
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-					if(dt.resultCode == 200 && dt.returnCode == 200){
-						var couponList = dt.returnMsg.couponList;
-						var machine = dt.returnMsg.machine;
-						machineDeviceId = machine.machineDeviceId;
-						stopDate = machine.machineStopDate;
-						$("#machineStopDate").text(stopDate + '  到期');
-						$("#rechargeStopDate").text(addYears(stopDate,1));
-						
-						$("#machineNO").text("NO." + (10000 + parseInt(machineId)));
-						if(machine.machineConnectState == 1){
-							$("#machineConnectState").text('已连接');
-						}else{
-							$("#machineConnectState").text('未连接');
-						}
-						
-						var couponSelect = $("#couponSelect");
-						if(couponList.length == 0){
-							$("#couponSelect").append('<option value="0">没有可用的抵扣券</option>');
-						}else{
-							couponSelect.append('<option serviceMoney="0" value="0">请选择抵扣券</option>');
-							mui(couponList).each(function(index) {
-								couponSelect.append('<option value="' + this.serviceId + '" serviceMoney="' + accDiv(this.serviceMoney,100) + '">' + this.serviceName + '</option>');
-							});
-						}
-					}else{
-						mui.alert("该机器不可以续费!请选择正确的机器!");
-					}
-				}
-			},
-			error:function(xhr, type, errorThrown){
-				console.log(xhr);
-				mui.alert("该机器不可以续费!!");
-			}
-		});
-	}
-	/**
-	*	点击年数进度条点击事件
-	*/
-	document.getElementById('block-range').addEventListener('input',function(){
-	    document.getElementById('block-range').value = this.value;
-    	//修改服务费、到期时间
-    	yearNum = parseInt(this.value);
-    	this.style.backgroundSize= (yearNum - 1) * 25 + "% 100%";
-    	payMoney = yearNum * payMoneyOne;
-    	//year_num = yearNum;
-    	$("#serviceCharge").text('¥' + payMoney + ' 元');
-    	$("#payCharge").text('¥' + (payMoney - couponMoney) + ' 元');
-    	$("#rechargeStopDate").text(addYears(stopDate,yearNum));
+            error:function(xhr, type, errorThrown){
+                console.log(xhr);
+                mui.alert("该机器不可以续费!!");
+            }
+        });
+    }
+    /**
+     *	点击年数进度条点击事件
+     */
+    document.getElementById('block-range').addEventListener('input',function(){
+        document.getElementById('block-range').value = this.value;
+        //修改服务费、到期时间
+        yearNum = parseInt(this.value);
+        this.style.backgroundSize= (yearNum - 1) * 25 + "% 100%";
+        payMoney = yearNum * payMoneyOne;
+        //year_num = yearNum;
+        $("#serviceCharge").text('¥' + payMoney + ' 元');
+        $("#payCharge").text('¥' + (payMoney - couponMoney) + ' 元');
+        $("#rechargeStopDate").text(addYears(stopDate,yearNum));
     });
-	
-	/**
-	*	抵扣券下拉框change事件
-	*/
-	$('#couponSelect').change(function(){
-		couponMoney = $($('#couponSelect option')[$(this)[0].selectedIndex]).attr("serviceMoney");
-		$('#couponMoney').text('-¥' + couponMoney + ' 元');
-		$("#payCharge").text('¥' + (payMoney - couponMoney) + ' 元');
-		couponId = this.value;
-	});
-	
-	/**
-	 * 立即续费
-	 * 校验机器在线、获取预支付id、发起支付
-	 */
-	mui('body').on('tap', '#sbumitRent', function() {
-		sendMsgAndReceiveData(machineDeviceId,"*getData#",function(state,res){
-			 if(200 == state){
-				 toPay();
-			 }
-			 if(500 == state){
-				 mui.alert("请保持机器在线!");
-			}
-		});
-	});
-		
-	function toPay(){
-		if(rechargeOrderId == ''){
-			payUrl = base_path + '/machine/machine_pay?dates=';
-			payData = {
-					"machineId":machineId,
-					"year_num":yearNum,
-					"couponId":couponId
-				};
-		}else{
-			payUrl = base_path + '/machine/recharge_pay?dates=';
-			payData = {"orderId":rechargeOrderId};
-		}
-		if(isPay) {
-			isPay = false;
-			layer.open({
-				type: 2,
-				shadeClose: false,
-				content: "正在请求加载订单信息..."
-			}); // 调用加载弹出层
-			$.ajax(payUrl + new Date().getTime(), {
-				data:payData,
-                xhrFields: {
-                    withCredentials: true
-                },
-				dataType:'json',
-				type:'post',
-				timeout:15000,
-				success: function(dt) {
-					layer.closeAll();
-					if(dt.resultCode == 200 && dt.returnCode == 200){
-						$('#couponSelect').css("display","none");
-						$("#block-range").prop("disabled","disabled");
-						var dataObj = dt.returnMsg;
-						rechargeOrderId = dataObj.returnMsg;
-						var obj = JSON.parse("{" + dataObj.wechat_pay_id + "}");
-						WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-							if(res.err_msg == 'get_brand_wcpay_request:ok') {
-								layer.open({
-									type: 2,
-									shadeClose: false,
-									content: "正在请求加载订单信息..."
-								}); // 调用加载弹出层
-								$.ajax({
-                                    xhrFields: {
-                                        withCredentials: true
+
+    /**
+     *	抵扣券下拉框change事件
+     */
+    $('#couponSelect').change(function(){
+        couponMoney = $($('#couponSelect option')[$(this)[0].selectedIndex]).attr("serviceMoney");
+        $('#couponMoney').text('-¥' + couponMoney + ' 元');
+        $("#payCharge").text('¥' + (payMoney - couponMoney) + ' 元');
+        couponId = this.value;
+    });
+
+    /**
+     * 立即续费
+     * 校验机器在线、获取预支付id、发起支付
+     */
+    mui('body').on('tap', '#sbumitRent', function() {
+        sendMsgAndReceiveData(machineDeviceId,"*getData#",function(state,res){
+            if(200 == state){
+                toPay();
+            }
+            if(500 == state){
+                mui.alert("请保持机器在线!");
+            }
+        });
+    });
+
+    function toPay(){
+        if(rechargeOrderId == ''){
+            payUrl = base_path + '/machine/machine_pay?dates=';
+            payData = {
+                "machineId":machineId,
+                "year_num":yearNum,
+                "couponId":couponId
+            };
+        }else{
+            payUrl = base_path + '/machine/recharge_pay?dates=';
+            payData = {"orderId":rechargeOrderId};
+        }
+        if(isPay) {
+            isPay = false;
+            layer.open({
+                type: 2,
+                shadeClose: false,
+                content: "正在请求加载订单信息..."
+            }); // 调用加载弹出层
+            mui.ajax(payUrl + new Date().getTime(), {
+                data:payData,
+                dataType:'json',
+                type:'post',
+                timeout:15000,
+                success: function(dt) {
+                    layer.closeAll();
+                    if(dt.resultCode == 200 && dt.returnCode == 200){
+                        $('#couponSelect').css("display","none");
+                        $("#block-range").prop("disabled","disabled");
+                        var dataObj = dt.returnMsg;
+                        rechargeOrderId = dataObj.returnMsg;
+                        var obj = JSON.parse("{" + dataObj.wechat_pay_id + "}");
+                        WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                            if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                layer.open({
+                                    type: 2,
+                                    shadeClose: false,
+                                    content: "正在请求加载订单信息..."
+                                }); // 调用加载弹出层
+                                $.ajax({
+                                    type: 'post',
+                                    url: base_path + '/machine/check_recharge_pay_status',
+                                    data: {"rechargeOrderId":rechargeOrderId},
+                                    dataType: 'json',
+                                    timeout: 15000,
+                                    success: function(data) {
+                                        //console.log(data);
+                                        if(data.status) {
+                                            if(data.data.rechargeState == 1){
+                                                isPay = true;
+                                                //mui.alert("支付成功!跳转到我的设备!");
+                                                mui.openWindow({url:'/watero/view/rent/my_equipment.html'});
+                                            }else{
+                                                mui.alert('如果已支付,请等待同步支付状态!', '', function() {
+                                                    isPay = true;
+                                                });
+                                            }
+                                        } else {
+                                            isPay = true;
+                                            mui.alert(data.message);
+                                        }
                                     },
-									type: 'post',
-									url: base_path + '/machine/check_recharge_pay_status',
-									data: {"rechargeOrderId":rechargeOrderId},
-									dataType: 'json',
-									timeout: 15000,
-									success: function(data) {
-										//console.log(data);
-										if(data.status) {
-											if(data.data.rechargeState == 1){
-												isPay = true;
-												//mui.alert("支付成功!跳转到我的设备!");
-												mui.openWindow({url:'/watero/html/rent/my_equipment.html'});
-											}else{
-												mui.alert('如果已支付,请等待同步支付状态!', '', function() {
-													isPay = true;
-												});
-											}
-										} else {
-											isPay = true;
-											mui.alert(data.message);
-										}
-									},
-									error: function(xhr, type, errorThrown) {
-										//异常处理;
-										console.log(xhr);
-										isPay = true;
-										mui.alert("请检查网络或刷新页面重试!");
-									}
-								});
-							} else {
-								isPay = true;
-								mui.alert("对不起,支付失败!请稍后重试!");
-							}
-						});
-						
-					}else{
-						//console.log(xhr);
-						isPay = true;
-						mui.alert("该机器不可以续费!请确保机器已经激活并连接!");
-					}
-				},
-				error:function(xhr, type, errorThrown){
-					console.log(xhr);
-					layer.closeAll();
-					isPay = true;
-					mui.alert("支付失败!请检查网络或刷新页面重试!");
-				}
-			});
-		} else{
-			mui.alert("正在请求支付中~~请稍后!");
-			return;
-		}
-	}
-	mui('body').on('tap', '#toRechargeLog', function() {
-		window.location.href = '/watero/html/rent/renew_logs.html?machineId=' + machineId;
-	});
-	
-	/**
-	* 给日期字符串增加年
-	*/
-	function addYears(dateStr,years){
-		var date = new Date(Date.parse(stopDate.replace(/-/g, "/")));
-		var yearStr = date.getFullYear() + years;
-		var otherStr = dateStr.substring(4,dateStr.length);
-		return yearStr + otherStr;
-	}
-	</script>
-	</body>
+                                    error: function(xhr, type, errorThrown) {
+                                        //异常处理;
+                                        console.log(xhr);
+                                        isPay = true;
+                                        mui.alert("请检查网络或刷新页面重试!");
+                                    }
+                                });
+                            } else {
+                                isPay = true;
+                                mui.alert("对不起,支付失败!请稍后重试!");
+                            }
+                        });
+
+                    }else{
+                        //console.log(xhr);
+                        isPay = true;
+                        mui.alert("该机器不可以续费!请确保机器已经激活并连接!");
+                    }
+                },
+                error:function(xhr, type, errorThrown){
+                    console.log(xhr);
+                    layer.closeAll();
+                    isPay = true;
+                    mui.alert("支付失败!请检查网络或刷新页面重试!");
+                }
+            });
+        } else{
+            mui.alert("正在请求支付中~~请稍后!");
+            return;
+        }
+    }
+    mui('body').on('tap', '#toRechargeLog', function() {
+        window.location.href = '/watero/view/rent/renew_logs.html?machineId=' + machineId;
+    });
+
+    /**
+     * 给日期字符串增加年
+     */
+    function addYears(dateStr,years){
+        var date = new Date(Date.parse(stopDate.replace(/-/g, "/")));
+        var yearStr = date.getFullYear() + years;
+        var otherStr = dateStr.substring(4,dateStr.length);
+        return yearStr + otherStr;
+    }
+</script>
+</body>
 </html>

+ 74 - 74
watero-wechat-web/src/main/webapp/view/product/certificate.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>
-			.mui-table-view .mui-table-view-cell img {
-				width: 100%;
-			}
-		</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%;
+		}
+	</style>
+</head>
 
-	<body style="background: #fff;">
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item">
-				<div class="iconfont icon-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;">
-			<ul class="mui-table-view">
-			    <li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/cp-z-01.png" />
-				</li>
-				<li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/certificate1.jpg" />
-				</li>
-				<li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/certificate2.jpg" />
-				</li>
-				<li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/certificate3.jpg" />
-				</li>
-				<li class="mui-table-view-cell">
-					<img src="/watero/wateroimages/shop/certificate4.jpg" />
-				</li>
-			</ul>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item">
+		<div class="iconfont icon-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;">
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/cp-z-01.png" />
+		</li>
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/certificate1.jpg" />
+		</li>
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/certificate2.jpg" />
+		</li>
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/certificate3.jpg" />
+		</li>
+		<li class="mui-table-view-cell">
+			<img src="//s.iamberry.com/watero/images/shop/certificate4.jpg" />
+		</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 type="text/javascript">
-			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 type="text/javascript">
+    mui.ready(function() {
+        console.log("页面加载完毕")
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
+</script>
+</body>
 
 </html>

+ 421 - 424
watero-wechat-web/src/main/webapp/view/rent/i_want_lease.html

@@ -1,445 +1,442 @@
 <!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">
-			.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:19px;}
-			.mui-backdrop:before{content:'如果您是新用户,分享好友并成功租用后,将奖励您300元服务费抵扣券;如果您已经租用过我们的净水机,分享后奖励,请 点击查看!';position: absolute;left:0;top:0;width:90%; text-align: left;color:#fff;font-size:16px;padding:60% 5% 10px 5%;}
-			.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: #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: 14px;color: #999;}
-    .lease-ul li{margin:10px 0;}
-    .lease-ul:after{display: none;}
-    .lease-left{display: inline-block;width: 20%;}
-    .ul_radio{width: 100%;}
-    .gift_radio{margin-bottom:20px;}
-	.ul_radio li{width:23%;height: 55px;margin: 10px 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;}
-	.radio16{background: url(/watero/images/rent/rent_product_img.png) center center /auto 85% no-repeat;}
-	.radio20:before,.radio21:before,.radio22:before,.radio23:before,.radio24:before,.radio25:before,.radio26:before,.radio27:before,.radio28:before{content: 'watero水杯';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
-	.radio20{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio21{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio22{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio23{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio24{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio25{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio26{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio27{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio28{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio29{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio30{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio31{background: url(/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
-	.radio24:before,.radio25:before,.radio26:before,.radio27:before{content: '赠品1';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
-	.radio28:before,.radio29:before,.radio30:before,.radio31:before{content: '赠品2';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
-	.lease-r-center{position: absolute;left: 70px;top: 20px;}
-	.lease-select-box{padding:4px 0;position: relative;}
-	.lease-select{position: absolute;left: 0;top:30px;}
-	.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color: #1cc9f4;}
-	.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio]{left: 0;}
-	.mui-checkbox.mui-left label, .mui-radio.mui-left label{padding-left: 35px;font-size: 14px;color: #999;}
-	.chanpin-ditails-dic img{width:100%;height:100%;}
-	.chanpin-ditails-dic {
-    padding: 0px;
-    background: #fff;
-    margin:0;
-    color: #444;
-}
-.icon-lease8{position: relative;}
-.icon-lease8:before{position: absolute;
-    right: 0;
-    top: 2px;}
-		</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">
+		.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:19px;}
+		.mui-backdrop:before{content:'如果您是新用户,分享好友并成功租用后,将奖励您300元服务费抵扣券;如果您已经租用过我们的净水机,分享后奖励,请 点击查看!';position: absolute;left:0;top:0;width:90%; text-align: left;color:#fff;font-size:16px;padding:60% 5% 10px 5%;}
+		.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: #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: 14px;color: #999;}
+		.lease-ul li{margin:10px 0;}
+		.lease-ul:after{display: none;}
+		.lease-left{display: inline-block;width: 20%;}
+		.ul_radio{width: 100%;}
+		.gift_radio{margin-bottom:20px;}
+		.ul_radio li{width:23%;height: 55px;margin: 10px 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;}
+		.radio16{background: url(//s.iamberry.com/watero/images/rent/rent_product_img.png) center center /auto 85% no-repeat;}
+		.radio20:before,.radio21:before,.radio22:before,.radio23:before,.radio24:before,.radio25:before,.radio26:before,.radio27:before,.radio28:before{content: 'watero水杯';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
+		.radio20{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio21{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio22{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio23{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio24{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio25{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio26{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio27{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio28{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio29{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio30{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio31{background: url(//s.iamberry.com/watero/images/shop/lease-zeng1.jpg) center center /auto 85% no-repeat;}
+		.radio24:before,.radio25:before,.radio26:before,.radio27:before{content: '赠品1';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
+		.radio28:before,.radio29:before,.radio30:before,.radio31:before{content: '赠品2';position: absolute;bottom: -20px;font-size: 12px;text-align: center;width: 100%;color: #999;}
+		.lease-r-center{position: absolute;left: 70px;top: 20px;}
+		.lease-select-box{padding:4px 0;position: relative;}
+		.lease-select{position: absolute;left: 0;top:30px;}
+		.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color: #1cc9f4;}
+		.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio]{left: 0;}
+		.mui-checkbox.mui-left label, .mui-radio.mui-left label{padding-left: 35px;font-size: 14px;color: #999;}
+		.chanpin-ditails-dic img{width:100%;height:100%;}
+		.chanpin-ditails-dic {
+			padding: 0px;
+			background: #fff;
+			margin:0;
+			color: #444;
+		}
+		.icon-lease8{position: relative;}
+		.icon-lease8:before{position: absolute;
+			right: 0;
+			top: 2px;}
+	</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;加载中...
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div id="lease-slider" class="mui-slider">
+		<div class="mui-slider-group mui-slider-loop">
+			<!-- 额外增加的一个节点(循环轮播:第一个节点是最后一张轮播) -->
+			<div class="mui-slider-item mui-slider-item-duplicate">
+				<a>
+					<img src="//s.iamberry.com/watero/images/rent/rent_banner3.png">
+				</a>
+			</div>
+			<!-- 第一张 -->
+			<div class="mui-slider-item">
+				<a>
+					<img src="//s.iamberry.com/watero/images/rent/rent_banner1.png">
+				</a>
+			</div>
+			<!-- 第二张 -->
+			<div class="mui-slider-item">
+				<a href="#">
+					<img src="//s.iamberry.com/watero/images/rent/rent_banner2.png">
+				</a>
+			</div>
+			<!-- 第三张 -->
+			<div class="mui-slider-item">
+				<a href="#">
+					<img src="//s.iamberry.com/watero/images/rent/rent_banner3.png">
+				</a>
+			</div>
+			<!-- 额外增加的一个节点(循环轮播:最后一个节点是第一张轮播) -->
+			<div class="mui-slider-item mui-slider-item-duplicate">
+				<a href="#">
+					<img src="//s.iamberry.com/watero/images/rent/rent_banner1.png">
+				</a>
 			</div>
 		</div>
-		<div class="mui-content">
-				<div id="lease-slider" class="mui-slider">
-					<div class="mui-slider-group mui-slider-loop">
-						<!-- 额外增加的一个节点(循环轮播:第一个节点是最后一张轮播) -->
-						<div class="mui-slider-item mui-slider-item-duplicate">
-							<a>
-								<img src="/watero/wateroimages/rent/rent_banner3.png">
-							</a>
-						</div>
-						<!-- 第一张 -->
-						<div class="mui-slider-item">
-							<a>
-								<img src="/watero/wateroimages/rent/rent_banner1.png">
-							</a>
-						</div>
-						<!-- 第二张 -->
-						<div class="mui-slider-item">
-							<a href="#">
-								<img src="/watero/wateroimages/rent/rent_banner2.png">
-							</a>
-						</div>
-						<!-- 第三张 -->
-						<div class="mui-slider-item">
-							<a href="#">
-								<img src="/watero/wateroimages/rent/rent_banner3.png">
-							</a>
-						</div>
-						<!-- 额外增加的一个节点(循环轮播:最后一个节点是第一张轮播) -->
-						<div class="mui-slider-item mui-slider-item-duplicate">
-							<a href="#">
-								<img src="/watero/wateroimages/rent/rent_banner1.png">
-							</a>
-						</div>
-					</div>
-					<div class="mui-slider-indicator">
-						<div class="mui-indicator mui-active"></div>
-						<div class="mui-indicator"></div>
-						<div class="mui-indicator"></div>
-					</div>
-				</div>
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell">
-						<span class="iconfont icon-lease3 cl-blue"></span >&nbsp;<span id="rentProductName"></span><span class="mui-pull-right cl-blue" id="btn-share-mask"><span class="iconfont icon-lease8"></span>分享</span>
-					</li>
+		<div class="mui-slider-indicator">
+			<div class="mui-indicator mui-active"></div>
+			<div class="mui-indicator"></div>
+			<div class="mui-indicator"></div>
+		</div>
+	</div>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-lease3 cl-blue"></span >&nbsp;<span id="rentProductName"></span><span class="mui-pull-right cl-blue" id="btn-share-mask"><span class="iconfont icon-lease8"></span>分享</span>
+		</li>
+	</ul>
+	<div class="mui-content-madded" style="padding-bottom: 80px;">
+		<ul class="lease-ul">
+			<li>设备押金:<span class="cl-red" id="pledgeMoney"></span> (租期终止后押金退还)</li>
+			<li>年服务费:<span class="cl-red" id="serviceMoney"></span> (租期内免费更换滤芯)</li>
+		</ul>
+		<div class="lease-select-box">
+			<div class="lease-left"><span class="lease-select">选择颜色:</span></div>
+			<div style="display:inline-block;width:73%;text-align: left;">
+				<ul class="ul_radio lease-order-list" style="padding-left: 20px;">
+
 				</ul>
-				<div class="mui-content-madded" style="padding-bottom: 80px;">
-					<ul class="lease-ul">
-						<li>设备押金:<span class="cl-red" id="pledgeMoney"></span> (租期终止后押金退还)</li>
-						<li>年服务费:<span class="cl-red" id="serviceMoney"></span> (租期内免费更换滤芯)</li>
-					</ul>
-					<div class="lease-select-box">
-					<div class="lease-left"><span class="lease-select">选择颜色:</span></div>
-					<div style="display:inline-block;width:73%;text-align: left;">
-					<ul class="ul_radio lease-order-list" style="padding-left: 20px;">
-						
-					</ul>
-					</div>
-					</div>
-					<div style="padding:0 0 10px 0;"><span>选择租期:</span></div>
-				<form class="my-input-group" id="rentType">
-					
-				</form>
-				<div style="padding: 10px 0;"><span>选择赠品:</span></div>
-				<ul class="ul_radio gift_radio1" id="gift_radio1"></ul>
-				<ul class="ul_radio gift_radio2" style="display: none;" id="gift_radio2"></ul>
-				<ul class="ul_radio gift_radio3" style="display: none;" id="gift_radio3"></ul>
-					<ul class="mui-table-view lease-ul" style="margin-top: 20px;">
-						<li class="mui-table-view-cell mui-collapse">
-						<a class="mui-navigate-right" id="goProductInfo" proid="" colorid="" href="#productImage">查看产品详情</a>
-						<div class="mui-collapse-content" style="padding: 0;">
-						<div class="chanpin-ditails-dic" id="productImage" style="display: none;">
+			</div>
+		</div>
+		<div style="padding:0 0 10px 0;"><span>选择租期:</span></div>
+		<form class="my-input-group" id="rentType">
+
+		</form>
+		<div style="padding: 10px 0;"><span>选择赠品:</span></div>
+		<ul class="ul_radio gift_radio1" id="gift_radio1"></ul>
+		<ul class="ul_radio gift_radio2" style="display: none;" id="gift_radio2"></ul>
+		<ul class="ul_radio gift_radio3" style="display: none;" id="gift_radio3"></ul>
+		<ul class="mui-table-view lease-ul" style="margin-top: 20px;">
+			<li class="mui-table-view-cell mui-collapse">
+				<a class="mui-navigate-right" id="goProductInfo" proid="" colorid="" href="#productImage">查看产品详情</a>
+				<div class="mui-collapse-content" style="padding: 0;">
+					<div class="chanpin-ditails-dic" id="productImage" style="display: none;">
 						<ul>
 							<li>
 								<img id="product_image_info" src="">
 							</li>
 						</ul>
 					</div>
-						</div>
-						</li>
-					</ul>	
-					
 				</div>
-				
-			<div class="buy-footer">
-				<button type="button" class="mui-btn my-btn-hand btn-pay active">我要租用</button>
-			</div>
-		</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 type="text/javascript">
-		var productId = 0;
-		var shareOpenid = '';
-		var ruleOne = 0;
-		var ruleTwo = 0;
-		var ruleThree = 0;
-		
-			mui.ready(function() {
-				document.querySelector('.loading-bg').style.display = 'none';
-				$.ajax(base_path + '/rent_order/selectRentProduct?dates=' + new Date().getTime(), {
-                    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 type_data = dt.data.typeList;
-								var product_data = dt.data.rentProductList;
-								var gift_data = dt.data.giftList;
-								ruleOne = dt.data.ruleOne;
-								ruleTwo = dt.data.ruleTwo;
-								ruleThree = dt.data.ruleThree;
-								var type_item = '';
-								shareOpenid = dt.data.shareOpenid;
-								var table = document.body.querySelector('.lease-order-list');
+			</li>
+		</ul>
 
-								//banner图循环播放
-                                var bannerstr = "",
-                                    dian = "";
-                                dc('mui-slider-loop').innerHTML = bannerstr;
-                                dc('my-slider-indicator').innerHTML = dian;
-                                $("<div id='lease-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
-                                dc('lease-slider').style.display = 'block';
-                                var banner = mui('#lease-slider');
-                                banner.slider({
-                                    interval: 5000
-                                });
-                                mui.each(document.querySelectorAll('#lease-slider a'), function(index, el) {
-                                    el.addEventListener('tap', function() {
-                                        //document.querySelector('.loading-bg').style.display = 'block';
-                                        var str=this.getAttribute('href');
-                                        //console.log(this.getAttribute('href'));
-                                        if(str!="#" && str!=''){
-                                            location.href = this.getAttribute('href')
-                                        }
-                                    }, false)
-                                });
+	</div>
 
-								//循环显示租赁类型
-								mui(type_data).each(function(index) {
-									var cheType = '';
-									//默认选中租一年的选项
-									if (this.typeId == 1){
-										cheType = 'checked';
-										$('#pledgeMoney').val(this.typePledgeMoney);
-										$('#serviceMoney').val(this.typeServiceMoney);
-										$('#pledgeMoney').html('¥' + accDiv( this.typePledgeMoney, 100) + '/台');
-										$('#serviceMoney').html('¥' + accDiv( this.typeServiceMoney, 100) + '/年');
-									}
-									type_item += '<div class="mui-input-row mui-radio mui-left">' 
-												+ '<label>' + this.typeName + '<span class="cl-red"> ' + accDiv(this.typeMoney, 100) + '元</span></label>' 
-												+ '<input name="radio1" value="' + this.typeId + '" rentMoney = ' + this.typeMoney + ' type="radio" ' + cheType + '>' 
-												+ '</div>';
-								});
-								//循环显示租赁商品信息
-								mui(product_data).each(function(index) {
-									productName = this.productName;
-									$('#rentProductName').html(productName);
-									$('#product_image_info').attr('src',this.productParameterImg);
-									var li = document.createElement('li');
-									if(index==0){
-										li.className ='radio'+this.colorId+' active';
-										$('#goProductInfo').attr('proid',this.productId);
-										$('#goProductInfo').attr('colorid',this.colorId);
-									}else{
-										li.className ='radio'+this.colorId;
-									}
-									li.setAttribute("id",this.colorId);
-									li.setAttribute("value",this.productColor);
-									table.appendChild(li);
-								});
-								$(".lease-order-list li").each(function() {
-									$(this).on("click", function() {
-										$(this).addClass("active");
-										$(this).siblings().removeClass("active");
-										var productColorId = $(".lease-order-list .active").attr("id");
-										$('#goProductInfo').attr('colorid',productColorId);
-									});
-								});
-								
-								//循环显示赠品信息
-								var gift1 = document.body.querySelector('.gift_radio1');
-								var gift2 = document.body.querySelector('.gift_radio2');
-								var gift3 = document.body.querySelector('.gift_radio3');
-								 mui(gift_data).each(function(index) {
-									var li = document.createElement('li');
-									if (this.productId == ruleOne) {
-										if($("#gift_radio1 li").length==0){
-											li.className ='radio'+this.colorId+' active';
-										}else{
-											li.className ='radio'+this.colorId;
-										}
-										li.setAttribute("id",this.colorId);
-										gift1.appendChild(li);
-									}
-									if (this.productId == ruleTwo) {
-										if($("#gift_radio2 li").length==0){
-											li.className ='radio'+this.colorId+' active';
-										}else{
-											li.className ='radio'+this.colorId;
-										}
-										li.setAttribute("id",this.colorId);
-										gift2.appendChild(li);
-									}
-									if (this.productId == ruleThree) {
-										if($("#gift_radio3 li").length==0){
-											li.className ='radio'+this.colorId+' active';
-										}else{
-											li.className ='radio'+this.colorId;
-										}
-										li.setAttribute("id",this.colorId);
-										gift3.appendChild(li);
-									}
-								});
-								$(".gift_radio1 li").each(function() {
-									$(this).on("click", function() {
-										$(this).addClass("active");
-										$(this).siblings().removeClass("active");
-									});
-								}); 
-								$(".gift_radio2 li").each(function() {
-									$(this).on("click", function() {
-										$(this).addClass("active");
-										$(this).siblings().removeClass("active");
-									});
-								}); 
-								$(".gift_radio3 li").each(function() {
-									$(this).on("click", function() {
-										$(this).addClass("active");
-										$(this).siblings().removeClass("active");
-									});
-								}); 
-								$('#rentType').html(type_item);
-								
-								//分享
-								var url = domanUrl + base_path + "/rent_order/goWantLease?shareOpenid=" + shareOpenid;
-								window.repleFlag = false;
-								window.wxFriend = {
-									"appId": "",
-									"imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
-									"link": url,
-									"desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
-									"title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
-									"netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
-									"shareTimeSuccess": "分享成功",
-									"shareTimeCancel": "已取消分享",
-									"shareAppSuccess": "分享成功!",
-									"shareAppCancel": "已取消分享"
-								};
-								getConfig();
-							} else {
-								//mui('#pullrefresh_chanpin_list').pullRefresh().endPullupToRefresh(true);
-							}
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						console.log(xhr)
-					}
-				})
-			});
-			
-	mui('body').on('tap', '#btn-share-mask', function() {
-			mask.show();//显示遮罩
-	});
-	
-	$(document).on('click', 'input[name=radio1]', function() {
-		var value = $("input[name=radio1]:checked").val(); //获取选中的值
-		switch (value) {
-			case '1':
-				$('.gift_radio1').show();
-		    	$('.gift_radio2').hide();
-		    	$('.gift_radio3').hide();
-				break;
-			case '2':
-				$('.gift_radio1').hide();
-		    	$('.gift_radio2').show();
-		    	$('.gift_radio3').hide();
-				break;
-			case '3':
-				$('.gift_radio1').hide();
-		    	$('.gift_radio2').hide();
-		    	$('.gift_radio3').show();
-				break;
-			default:
-				$('.gift_radio1').show();
-		    	$('.gift_radio2').hide();
-		    	$('.gift_radio3').hide();
-				break;
-		}
-	});
-	
-	mui('body').on('tap', '#goProductInfo', function() {
-		if($("#productImage").is(":hidden")){
-			$('#productImage').show();    //如果元素为隐藏,则将它显现
-			setTimeout(function(){
-				window.scrollTo(0,580)
-			},1000)
-		}else{
-			$('#productImage').hide();     //如果元素为显现,则将其隐藏
-		}
-		
-	});
-	
-mui('body').on('tap', '.btn-pay', function() {
-	var pledgeMoney = $('#pledgeMoney').val();
-	var serviceMoney = $('#serviceMoney').val();
-	var radio1 = $("input[name='radio1']:checked").val();
-	var rentMoney = $("input[name='radio1']:checked").attr("rentMoney");
-	var rentProduct = $(".lease-order-list .active").attr("id");
-	var giftId = 0;
-	var productColor = $(".lease-order-list .active").attr("value");
-	switch (radio1) {
-	case '1':
-		giftId = $(".gift_radio1 .active").attr("id");
-		break;
-	case '2':
-		giftId = $(".gift_radio2 .active").attr("id");
-		break;
-	case '3':
-		giftId = $(".gift_radio3 .active").attr("id");
-		break;
-	default:
-		giftId = $(".gift_radio1 .active").attr("id");
-		break;
-}
-	mui.openWindow({url: encodeURI('/watero/view/i_want_lease_pay.html?pledgeMoney='+pledgeMoney+'&serviceMoney='+serviceMoney + '&radio1=' + radio1 + '&rentProduct=' + rentProduct + '&giftId=' + giftId + '&productName=' + productName + '&productColor=' + productColor + '&rentMoney=' + rentMoney) });
-});
-var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调;
-$(window).on("scroll", function() {
-	if($(window).scrollTop() > 280) {
-		$(".return").show()
-	} else {
-		$(".return").hide()
-	}
-});
+	<div class="buy-footer">
+		<button type="button" class="mui-btn my-btn-hand btn-pay active">我要租用</button>
+	</div>
+</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 type="text/javascript">
+    var productId = 0;
+    var shareOpenid = '';
+    var ruleOne = 0;
+    var ruleTwo = 0;
+    var ruleThree = 0;
+
+    mui.ready(function() {
+        document.querySelector('.loading-bg').style.display = 'none';
+        mui.ajax(base_path + '/rent_order/selectRentProduct?dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.status) {
+                        var type_data = dt.data.typeList;
+                        var product_data = dt.data.rentProductList;
+                        var gift_data = dt.data.giftList;
+                        ruleOne = dt.data.ruleOne;
+                        ruleTwo = dt.data.ruleTwo;
+                        ruleThree = dt.data.ruleThree;
+                        var type_item = '';
+                        shareOpenid = dt.data.shareOpenid;
+                        var table = document.body.querySelector('.lease-order-list');
+
+                        //banner图循环播放
+                        var bannerstr = "",
+                            dian = "";
+                        dc('mui-slider-loop').innerHTML = bannerstr;
+                        dc('my-slider-indicator').innerHTML = dian;
+                        $("<div id='lease-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
+                        dc('lease-slider').style.display = 'block';
+                        var banner = mui('#lease-slider');
+                        banner.slider({
+                            interval: 5000
+                        });
+                        mui.each(document.querySelectorAll('#lease-slider a'), function(index, el) {
+                            el.addEventListener('tap', function() {
+                                //document.querySelector('.loading-bg').style.display = 'block';
+                                var str=this.getAttribute('href');
+                                //console.log(this.getAttribute('href'));
+                                if(str!="#" && str!=''){
+                                    location.href = this.getAttribute('href')
+                                }
+                            }, false)
+                        });
+
+                        //循环显示租赁类型
+                        mui(type_data).each(function(index) {
+                            var cheType = '';
+                            //默认选中租一年的选项
+                            if (this.typeId == 1){
+                                cheType = 'checked';
+                                $('#pledgeMoney').val(this.typePledgeMoney);
+                                $('#serviceMoney').val(this.typeServiceMoney);
+                                $('#pledgeMoney').html('¥' + accDiv( this.typePledgeMoney, 100) + '/台');
+                                $('#serviceMoney').html('¥' + accDiv( this.typeServiceMoney, 100) + '/年');
+                            }
+                            type_item += '<div class="mui-input-row mui-radio mui-left">'
+                                + '<label>' + this.typeName + '<span class="cl-red"> ' + accDiv(this.typeMoney, 100) + '元</span></label>'
+                                + '<input name="radio1" value="' + this.typeId + '" rentMoney = ' + this.typeMoney + ' type="radio" ' + cheType + '>'
+                                + '</div>';
+                        });
+                        //循环显示租赁商品信息
+                        mui(product_data).each(function(index) {
+                            productName = this.productName;
+                            $('#rentProductName').html(productName);
+                            $('#product_image_info').attr('src',this.productParameterImg);
+                            var li = document.createElement('li');
+                            if(index==0){
+                                li.className ='radio'+this.colorId+' active';
+                                $('#goProductInfo').attr('proid',this.productId);
+                                $('#goProductInfo').attr('colorid',this.colorId);
+                            }else{
+                                li.className ='radio'+this.colorId;
+                            }
+                            li.setAttribute("id",this.colorId);
+                            li.setAttribute("value",this.productColor);
+                            table.appendChild(li);
+                        });
+                        $(".lease-order-list li").each(function() {
+                            $(this).on("click", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                                var productColorId = $(".lease-order-list .active").attr("id");
+                                $('#goProductInfo').attr('colorid',productColorId);
+                            });
+                        });
+
+                        //循环显示赠品信息
+                        var gift1 = document.body.querySelector('.gift_radio1');
+                        var gift2 = document.body.querySelector('.gift_radio2');
+                        var gift3 = document.body.querySelector('.gift_radio3');
+                        mui(gift_data).each(function(index) {
+                            var li = document.createElement('li');
+                            if (this.productId == ruleOne) {
+                                if($("#gift_radio1 li").length==0){
+                                    li.className ='radio'+this.colorId+' active';
+                                }else{
+                                    li.className ='radio'+this.colorId;
+                                }
+                                li.setAttribute("id",this.colorId);
+                                gift1.appendChild(li);
+                            }
+                            if (this.productId == ruleTwo) {
+                                if($("#gift_radio2 li").length==0){
+                                    li.className ='radio'+this.colorId+' active';
+                                }else{
+                                    li.className ='radio'+this.colorId;
+                                }
+                                li.setAttribute("id",this.colorId);
+                                gift2.appendChild(li);
+                            }
+                            if (this.productId == ruleThree) {
+                                if($("#gift_radio3 li").length==0){
+                                    li.className ='radio'+this.colorId+' active';
+                                }else{
+                                    li.className ='radio'+this.colorId;
+                                }
+                                li.setAttribute("id",this.colorId);
+                                gift3.appendChild(li);
+                            }
+                        });
+                        $(".gift_radio1 li").each(function() {
+                            $(this).on("click", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        $(".gift_radio2 li").each(function() {
+                            $(this).on("click", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        $(".gift_radio3 li").each(function() {
+                            $(this).on("click", function() {
+                                $(this).addClass("active");
+                                $(this).siblings().removeClass("active");
+                            });
+                        });
+                        $('#rentType').html(type_item);
+
+                        //分享
+                        var url = domanUrl + base_path + "/rent_order/goWantLease?shareOpenid=" + shareOpenid;
+                        window.repleFlag = false;
+                        window.wxFriend = {
+                            "appId": "",
+                            "imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
+                            "link": url,
+                            "desc": "美国标准,4级净化,5档水温,废水比3:1,水质TDS智能显示。",
+                            "title": "Watero,美国高端净水专家,4级净化,5档水温,免安装饮水一体机。",
+                            "netError": "您的网络异常,请刷新重试!如多次刷新无效,请向我们反应 ~",
+                            "shareTimeSuccess": "分享成功",
+                            "shareTimeCancel": "已取消分享",
+                            "shareAppSuccess": "分享成功!",
+                            "shareAppCancel": "已取消分享"
+                        };
+                        getConfig();
+                    } else {
+                        //mui('#pullrefresh_chanpin_list').pullRefresh().endPullupToRefresh(true);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+
+    mui('body').on('tap', '#btn-share-mask', function() {
+        mask.show();//显示遮罩
+    });
+
+    $(document).on('click', 'input[name=radio1]', function() {
+        var value = $("input[name=radio1]:checked").val(); //获取选中的值
+        switch (value) {
+            case '1':
+                $('.gift_radio1').show();
+                $('.gift_radio2').hide();
+                $('.gift_radio3').hide();
+                break;
+            case '2':
+                $('.gift_radio1').hide();
+                $('.gift_radio2').show();
+                $('.gift_radio3').hide();
+                break;
+            case '3':
+                $('.gift_radio1').hide();
+                $('.gift_radio2').hide();
+                $('.gift_radio3').show();
+                break;
+            default:
+                $('.gift_radio1').show();
+                $('.gift_radio2').hide();
+                $('.gift_radio3').hide();
+                break;
+        }
+    });
+
+    mui('body').on('tap', '#goProductInfo', function() {
+        if($("#productImage").is(":hidden")){
+            $('#productImage').show();    //如果元素为隐藏,则将它显现
+            setTimeout(function(){
+                window.scrollTo(0,580)
+            },1000)
+        }else{
+            $('#productImage').hide();     //如果元素为显现,则将其隐藏
+        }
+
+    });
+
+    mui('body').on('tap', '.btn-pay', function() {
+        var pledgeMoney = $('#pledgeMoney').val();
+        var serviceMoney = $('#serviceMoney').val();
+        var radio1 = $("input[name='radio1']:checked").val();
+        var rentMoney = $("input[name='radio1']:checked").attr("rentMoney");
+        var rentProduct = $(".lease-order-list .active").attr("id");
+        var giftId = 0;
+        var productColor = $(".lease-order-list .active").attr("value");
+        switch (radio1) {
+            case '1':
+                giftId = $(".gift_radio1 .active").attr("id");
+                break;
+            case '2':
+                giftId = $(".gift_radio2 .active").attr("id");
+                break;
+            case '3':
+                giftId = $(".gift_radio3 .active").attr("id");
+                break;
+            default:
+                giftId = $(".gift_radio1 .active").attr("id");
+                break;
+        }
+        mui.openWindow({url: encodeURI('/watero/view/i_want_lease_pay.html?pledgeMoney='+pledgeMoney+'&serviceMoney='+serviceMoney + '&radio1=' + radio1 + '&rentProduct=' + rentProduct + '&giftId=' + giftId + '&productName=' + productName + '&productColor=' + productColor + '&rentMoney=' + rentMoney) });
+    });
+    var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调;
+    $(window).on("scroll", function() {
+        if($(window).scrollTop() > 280) {
+            $(".return").show()
+        } else {
+            $(".return").hide()
+        }
+    });
 </script>
 </body>