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

watero修改

wangxiaoming 6 years ago
parent
f6d2a00366
commit
381ebea020
46 changed files with 931 additions and 292 deletions
Split View Show Diff Stats
  1. 1 1
      watero/after_service_watero.html
  2. 5 4
      watero/chanpin_list.html
  3. 114 73
      watero/clearing.html
  4. 2 2
      watero/coupon.html
  5. 21 20
      watero/coupon_bag.html
  6. 2 2
      watero/coupon_list.html
  7. 1 0
      watero/css/chanpin_details.css
  8. 2 2
      watero/css/clearing.css
  9. 8 2
      watero/css/order_list.css
  10. 21 16
      watero/css/style.css
  11. 2 2
      watero/daili_order_list.html
  12. 2 2
      watero/daili_rebackOrder_list.html
  13. 2 2
      watero/fenxiao_apply_submitSuccess.html
  14. 2 2
      watero/fenxiao_mendian_next_user_list.html
  15. 2 2
      watero/fenxiao_next_user_list2.html
  16. 2 2
      watero/fenxiao_order_list.html
  17. 2 2
      watero/fenxiao_tixian_apply.html
  18. 2 2
      watero/fenxiao_tixian_log.html
  19. 2 2
      watero/fenxiao_to_accounts_list.html
  20. 2 2
      watero/fenxiao_to_accounts_list2.html
  21. 2 2
      watero/fenxiao_to_transfer_accounts_list.html
  22. 2 2
      watero/iamberry_video.html
  23. BIN
      watero/images/c_checkbox_off.png
  24. BIN
      watero/images/c_checkbox_on.png
  25. BIN
      watero/images/empty_cart.png
  26. BIN
      watero/images/null-3.png
  27. BIN
      watero/images/pay-win.png
  28. BIN
      watero/images/yhq_used_bg.png
  29. 6 6
      watero/index.html
  30. 2 0
      watero/js/page/chanpin_details.js
  31. 2 2
      watero/js/page/chanpin_list.js
  32. 552 0
      watero/js/page/main.js
  33. 15 11
      watero/js/page/order_details.js
  34. 60 58
      watero/js/page/order_list.js
  35. 7 3
      watero/js/page/pay_win.js
  36. 33 6
      watero/order_details.html
  37. 9 9
      watero/order_list.html
  38. 15 23
      watero/pay_win.html
  39. 12 12
      watero/shopping_cart.html
  40. 2 2
      watero/tixian_apply_cash.html
  41. 2 2
      watero/tixian_cash_success.html
  42. 2 2
      watero/tixian_log.html
  43. 2 2
      watero/tixian_log_cash.html
  44. 5 4
      watero/vip_center.html
  45. 2 2
      watero/win.html
  46. 2 2
      watero/xiaxian_list.html

+ 1 - 1
watero/after_service_watero.html
View File 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+!DOCTYPE html>
 
 <html>
 
 <head>
 
 	<meta charset="UTF-8">

+ 5 - 4
watero/chanpin_list.html
View File 

@@ -14,8 +14,8 @@
 
 		#pullrefresh_chanpin_list .mui-table-view-chevron .wh-100{padding:0;}
 
 		.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-object:nth-of-type(odd){padding-right: 4px;}
 
 		.mui-pull-caption{font-size: 12px;}
 
-		.tab-with-chanpin-list{margin-top: 0;}
 
-		#pullrefresh_chanpin_list{padding-top: 51px;}
 
+		.tab-with-chanpin-list{margin-top: 0;padding-top: 5px;}
 
+		#pullrefresh_chanpin_list{padding-top: 56px;}
 
 		#pullrefresh_chanpin_list .mui-table-view-cell{border-bottom: 0;text-align: left;}
 
 		#pullrefresh_chanpin_list .mui-table-view-chevron .mui-table-view-cell:last-child{border-bottom: 0;}
 
 		#pullrefresh_chanpin_list .mui-table-view-cell:after{display: none;}
 
@@ -28,6 +28,7 @@
 
 		#pullrefresh_chanpin_list .mui-table-view-chevron .wh-100{padding:0;}
 
 		#pullrefresh_chanpin_list .mui-grid-view .shop-price {padding:0;}
 
 		#pullrefresh_chanpin_list .my-tab-view-pull:after{display: none;}
 
+		.go_chanpin_details .mui-h6{margin-top: 5px;}
 
 	</style>
 
 	<script type="text/javascript">
 
         // 屏蔽分享
 
@@ -53,11 +54,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <!--<header class="mui-bar mui-bar-nav header">

File diff suppressed because it is too large
+ 114 - 73
watero/clearing.html


+ 2 - 2
watero/coupon.html
View File 

@@ -34,11 +34,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">

File diff suppressed because it is too large
+ 21 - 20
watero/coupon_bag.html


+ 2 - 2
watero/coupon_list.html
View File 

@@ -34,11 +34,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">

+ 1 - 0
watero/css/chanpin_details.css
View File 

@@ -21,6 +21,7 @@
 
 .my-picker{position: fixed;bottom: 0;padding-top: 0;max-height: 500px; left: 0;width: 100%;z-index: 999; background-color: #fff; -webkit-transform: translateY(100%);transform: translateY(100%); -webkit-transition: .5s;transition: .5s;}
 
 .my-picker.active{-webkit-transform: translateY(0%);transform: translateY(0%);}
 
 .my-picker .icon-guanbi{position: absolute;right:0;top:0;color: #999;font-size: 16px;padding: 10px;}
 
+.my-picker .mui-numbox{border-radius: 25px;}
 
 .pro-select-color{padding: 3px 0;background: #f8f8f8;color: #999;border-radius: 15px;margin-right: 8px;margin-bottom: 15px; display: inline-block;width: 22.4%;text-align: center;}
 
 .pro-select-color.active{background: #63ccde;color: #fff;}
 
 .my-btn-block{font-size: 16px;display: block;width: 100%;margin-bottom:0;padding: 15px 0;border-radius: 0;}

+ 2 - 2
watero/css/clearing.css
View File 

@@ -10,8 +10,8 @@
 
 .my-popover .mui-radio{border-bottom: 1px solid rgba(0,0,0,.1);height: 50px;padding: 5px 0;color: #666;}
 
 .mui-checkbox input[type=checkbox], .mui-radio input[type=radio] {top: 8px;}
 
 .mui-input-row{color: #666;}
 
-.my-yhq-tab .mui-input-row label{width:36%;}
 
-.my-yhq-tab .mui-input-row label~input{width:64%;}
 
+.my-yhq-tab .mui-input-row label{width: 25%;padding-right: 0;}
 
+.my-yhq-tab .mui-input-row label~input{width:73%;}
 
 .yhq-right{right: 35px;position: absolute;top: 50%;-webkit-transform: translateY(-50%);transform: translateY(-50%);}
 
 #accSub,#accSub>div{display:none;}
 
 .mui-btn-weixin-pay {color: #fff;border: 1px solid #cf0c4c;background-color: #cf0c4c;margin-bottom: 0 !important;}

+ 8 - 2
watero/css/order_list.css
View File 

@@ -1,8 +1,8 @@
 
 .mui-table-view-chevron .mui-table-view-cell {padding-right: 15px;}
 
-.tab-with-orderlist{margin-top:56px;z-index: 10;}
 
+.tab-with-orderlist{margin-top:0;z-index: 10;padding-top: 5px;}
 
 .mui-bar-nav~.mui-content {padding-top: 107px;background: #fff;}
 
 .mui-segmented-control .mui-control-item.mui-active {background-color: transparent !important;border-bottom: 2px solid #55c0dc !important;}
 
-.mui-segmented-control .mui-control-item {line-height: 1;height: 50px;vertical-align: bottom;border: 0;border-bottom: 2px solid transparent;color:#bfbfbf;background-color: transparent !important;padding-bottom: 3px;}
 
+.mui-segmented-control .mui-control-item {line-height: 1;height: 50px;vertical-align: bottom;border: 0;border-bottom: 2px solid transparent;color:#333;background-color: transparent !important;padding-bottom: 3px;}
 
 .tab-with-orderlist {background: #fff;border: 0;}
 
 .my-scroll-order .mui-table-view:after{display:none;}
 
 .go-index{float: inherit;}
 
@@ -16,5 +16,11 @@
 
 .mui-bar .my-right:before{font-size:30px}
 
 .mui-bar-nav.mui-bar .mui-placeholder .mui-icon-search:before{font-size:20px}
 
 .mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -15px;}
 
+.mui-table-view-chevron .mui-table-view-cell>a.mui-active,.mui-table-view-chevron .mui-table-view-cell{background: #fff;}
 
 #pullrefresh_order_list .mui-table-view-cell:after{display: none;}
 
+#pullrefresh_order_list{top: 56px;background: #fff;}
 
 .my-scroll-order>li{border-bottom: 0;}
 
+.my-btn-danger,.my-btn-orange{border-radius: 20px;}
 
+.my-scroll-order .mui-table-view{font-size: 14px;}
 
+.my-scroll-order .mui-table-view:first-child:before{display: none;}
 
+.my-scroll-order .mui-table-view:last-child:after{display: block;}

+ 21 - 16
watero/css/style.css
View File 

@@ -80,7 +80,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .gwc-pp {color: #999;}
 
 .ft-12 {font-size: 12px;}
 
 .ft-13 {font-size: 12px;}
 
-.price-sp {color: #55c0dc;font-size:16px;margin-right: 15px;}
 
+.price-sp {color: #e06974;font-size:16px;margin-right: 15px;}
 
 .shop-price{padding:0;text-align: left;}
 
 .shop-price s{font-size: 12px;color: #d0d0d0;}
 
 .tab-with-chanpin-list {background: #fff;border: 0;margin-top: 55px;z-index: 10;}
 
@@ -147,7 +147,9 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .buy-footer>div:nth-of-type(2) {display: table-cell;width: 30%;background: #a6c8ce;font-size: 18px;color: #fff;vertical-align: middle;}
 
 .buy-footer>div:last-child {display: table-cell;width: 30%;background: #55c0dc;font-size: 18px;color: #fff;vertical-align: middle;}
 
 #gwc_list .mui-table-view-cell {padding: 15px 10px;}
 
-.gwc_null {padding: 12% 0 8% 0;text-align: center;display: none;}
 
+.gwc_null {padding: 22% 0 8% 0;text-align: center;display: none;}
 
+.btn-blue-double{border: 1px solid #63ccde;color: #63ccde;background: #fff;border-radius: 25px;margin: 0 5px;padding: 7px 16px;}
 
+.btn-blue-double:active{color: #63ccde !important;background: #fff !important;}
 
 .shoping-tt {padding: 0 12px 60px 12px;position: relative;}
 
 .shoping-tt .left img,.shoping-tt .right img{width: 100%;}
 
 .shoping-tt .left{position: absolute;left: 0;top: 0;font-size: 0;}
 
@@ -155,22 +157,23 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .tt-yf {position: relative;padding: .8em 12px;}
 
 .tt-yf .my-btn-danger{position: absolute;right: 12px; top:6px;}
 
 .del {position: absolute;right: 8px;bottom:16px;}
 
-.price_sp {color:#55c0dc;font-size: 18px;margin-right: 10px;}
 
+.price_sp {color:#eb4e45;font-size: 16px;margin-right: 10px;}
 
+.shopping-cart-list .mui-numbox{border-radius: 25px;}
 
 .ft-24 {font-size: 28px;}
 
 .mt-7 {margin-top: .7em;}
 
 .jifen {position: absolute;left: 0;top: 0;width: 50px;height: 50px;}
 
 .jifen img {width: 100%;}
 
-.buy-footer1 {position: fixed;bottom: 0;left: 0;height: 50px;background-color: #f0f0f0;width: 100%;padding: 0;}
 
+.buy-footer1 {position: fixed;bottom: 0;left: 0;height: 50px;background-color: #fff;width: 100%;padding: 0;}
 
 .price{padding: 4px 0;}
 
-.price small{color: #666;}
 
+.price small{color: #666;float: right;}
 
 .buy-footer1:after {position: absolute;top: 0;left: 0;content: '';height: 1px;width: 100%;background-color: #55c0dc;-webkit-transform: scaleY(.5);transform: scaleY(.5);}
 
-.tb-clearing {width: 100%;}
 
-.tb-clearing tr td:first-child {width: 18%;text-align: center;min-width: 2.5em;}
 
+.tb-clearing {width: 100%;background-color: #fff;border-top: 1px solid rgba(0,0,0,.1);}
 
+.tb-clearing tr td:first-child {width: 22%;text-align: center;min-width: 3.5em;}
 
 .quanxuan {position: relative;}
 
-.tb-clearing tr td:nth-of-type(2) {min-width: 2.5em;}
 
+.tb-clearing tr td:nth-of-type(2) {width: 50%;}
 
 .t-r {text-align: right !important;}
 
 .tb-clearing tr td:nth-of-type(3) {min-width: 6em;max-width: 10em;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 
-.count_price_box {color: #55c0dc;text-align: center;padding-top: 5px;}
 
+.count_price_box {color: #eb4e45;text-align: center;}
 
 .tb-clearing tr:first-child td:last-child {text-align: center;}
 
 .ft-14 {font-size: 14px;}
 
 .quanxuan:after {content: '';position: absolute;width: 1px;height: 70%;background-color: #ababab;right: 0;top: 15%;-webkit-transform: scaleX(.5);transform: scaleX(.5);}
 
@@ -196,7 +199,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .how_to_get{color: #666;float: right;padding: 4px 0;}
 
 .how_to_get .d_price{color:#55c0dc;padding-left: 3px;}
 
 .how_to_get .d_price:before{content: '妤�';}
 
-.cl-red{color: #55c0dc !important;}
 
+.cl-red{color: #e06974 !important;}
 
 .pay_weixin {text-align: center;background: #fff;padding:0;position: fixed;width: 100%;bottom: 0;}
 
 .pay_weixin>div {padding: 0 0 10px 0;}
 
 .btn-weixin-pay{margin-bottom: 0 !important;}
 
@@ -212,6 +215,8 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .pay_win_list{padding: 10px 10px 10px 2.5em;}
 
 .pay_win_list li{color: #666;padding: 3px 0;}
 
 .shopping-cart-list .mui-table-view-cell{padding: 11px 12px;}
 
+.shopping-cart-list .mui-table-view-cell.mui-active{background: #fff;}
 
+.mui-table-view-cell.mui-active>.mui-slider-handle{background: #fff;}
 
 .my-order-list {padding: 10px 0 5px 0;}
 
 .my-order-list .mui-table-view-cell{padding: 5px 10px;}
 
 .my-order-list .mui-table-view-cell:after{height: 0;}
 
@@ -221,7 +226,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .order-price:before{content: '妤�';}
 
 .my-table-order{font-size: 14px;background: #fff;width: 100%;}
 
 .my-tb-order{font-size: 14px;background: #fff;width: 100%;}
 
-.my-table-order tr td:last-child{padding-right: 10px;}
 
+.my-table-order tr td:last-child{padding-right: 10px;width: 120px;}
 
 .table-middle {
 
     vertical-align: middle;
 
 }
 
@@ -231,20 +236,20 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .status-list li{font-size: 12px;color: #666;padding: 5px 15px;}
 
 .icon-allorder{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 
 .icon-allorder.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
 
-.icon-allorder>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:2px;left: 35%;}
 
+.icon-allorder>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 15%;}
 
 
 
 .icon-topay.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
 
-.icon-topay>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:2px;left: 35%;}
 
+.icon-topay>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
 
 .icon-topay{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 
 .my-scroll-order:after,.my-scroll-order:before{display:none;}
 
 
 .icon-todelivery.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
 
-.icon-todelivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:2px;left: 35%;}
 
+.icon-todelivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
 
 .icon-todelivery{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 
 
 .icon-delivery.mui-active{color:#55c0dc !important;border-bottom: 2px solid #55c0dc;}
 
-.icon-delivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:2px;left: 35%;}
 
+.icon-delivery>span:first-child{min-width: 25px;min-height: 25px;position: absolute;top:15px;left: 32%;}
 
 .icon-delivery{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 
 .mr-5{margin-right: 5px;}
 
 .btn-zu .mui-btn{margin-right:0;}
 
@@ -364,7 +369,7 @@ article, section, time, aside {display: block;}
 
 .address-cantainner .mui-table{max-height: 80px;min-height: 42px;}
 
 .address-cantainner .add-address{height: 20px;position: relative;width: 150px; margin: 0 auto;}
 
 .address-cantainner .icon-jia{position: absolute;left:0%;top: 0;font-size: 20px;}
 
-.address-cantainner p{font-size: 12px;}
 
+.address-cantainner p{font-size: 12px;padding-top: 7px;}
 
 .icon-dingwei{color: #f16071;}
 
 .btn-add-address{height: 20px;line-height: 20px; position: relative;width: 110px; margin: 0 auto;text-align: right;color: #666;}
 
 .btn-add-address .icon-jia{position: absolute;left:12%;top: 0;font-size: 25px;}

+ 2 - 2
watero/daili_order_list.html
View File 

@@ -34,11 +34,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="cash-header">

+ 2 - 2
watero/daili_rebackOrder_list.html
View File 

@@ -34,11 +34,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="cash-header">

+ 2 - 2
watero/fenxiao_apply_submitSuccess.html
View File 

@@ -33,11 +33,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <header class="mui-bar mui-bar-nav header">

+ 2 - 2
watero/fenxiao_mendian_next_user_list.html
View File 

@@ -37,11 +37,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_next_user_list2.html
View File 

@@ -37,11 +37,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_order_list.html
View File 

@@ -40,11 +40,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_tixian_apply.html
View File 

@@ -41,11 +41,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">

+ 2 - 2
watero/fenxiao_tixian_log.html
View File 

@@ -40,11 +40,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_to_accounts_list.html
View File 

@@ -38,11 +38,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_to_accounts_list2.html
View File 

@@ -37,11 +37,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/fenxiao_to_transfer_accounts_list.html
View File 

@@ -37,11 +37,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/iamberry_video.html
View File 

@@ -32,11 +32,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">

BIN
watero/images/c_checkbox_off.png
View File


BIN
watero/images/c_checkbox_on.png
View File


BIN
watero/images/empty_cart.png
View File


BIN
watero/images/null-3.png
View File


BIN
watero/images/pay-win.png
View File


BIN
watero/images/yhq_used_bg.png
View File


+ 6 - 6
watero/index.html
View File 

@@ -156,11 +156,11 @@
 
 			</a>
 
 			<a class="mui-tab-item">
 
 				<div class="iconfont icon-dingdan"></div>
 
-				<span class="mui-tab-label">我的订单</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>
 
+				<span class="mui-tab-label">我的</span>
 
 			</a>
 
 		</nav>
 
 		<!--header 开始-->
 
@@ -313,11 +313,11 @@
 
 								},
 
 							});
 
 							var shareOpenid = dt.data.memberOpenid;
 
-							var link = "https:" + domanUrl + base_path + "/index.html?shareOpenid=" + shareOpenid;
 
+							var link = domanUrl + "/wateroWechat/index.html?shareOpenid=" + shareOpenid;
 
 							window.repleFlag = false;
 
 							window.wxFriend = {
 
 								"appId": "",
 
-								"imgUrl": "https:" + domanUrl + '/watero/common/shop/images/index.jpg',
 
+								"imgUrl": domanUrl + '/wateroWechat/images/index.jpg',
 
 								"link": link,
 
 								"desc": "WaterO水时代商城，开启优雅生活",
 
 								"title": "WaterO水时代商城，好水，好茶，生活不将就！",
 
@@ -330,9 +330,9 @@
 
 							getConfig();
 
 							document.querySelector('.loading-bg').style.display = 'none'
 
 						} else {
 
-							mui.alert(dt.message, ' ', '朕知道了', function() {
 
+							mui.alert(dt.message, ' ', '我知道了', function() {
 
 								mui.openWindow({
 
-									url: domanUrl + base_path + "/index.html?dates=" + new Date().getTime()
 
+									url: "index.html?dates=" + new Date().getTime()
 
 								})
 
 							})
 
 						}

+ 2 - 0
watero/js/page/chanpin_details.js
View File 

@@ -330,6 +330,7 @@ function add() {
 
 					if(!window.sessionStorage) {
 
 						mui.alert("您的浏览器不支持sessionStorage");
 
 					} else {
 
+						getColorNumber();
 
 						//自定义json数据
 
 						var obj = {
 
 							text: [$(".mui-numbox").attr("cartid")]
 
@@ -371,6 +372,7 @@ function addCart(parameter, src) {
 
 							if(!window.sessionStorage) {
 
 								mui.alert("您的浏览器不支持sessionStorage");
 
 							} else {
 
+								getColorNumber();
 
 								setTimeout(function() {
 
 									//自定义json数据
 
 									var obj = {

File diff suppressed because it is too large
+ 2 - 2
watero/js/page/chanpin_list.js


+ 552 - 0
watero/js/page/main.js
View File 

@@ -0,0 +1,552 @@
 
+var domanUrl = "//" + window.location.host,
 
+    base_path = "/watero/wechat",
 
+    marquee = '';
 
+mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function(index, el) {
 
+    el.addEventListener('tap', function() {
 
+        switch(index) {
 
+            case 0:
 
+                mui.openWindow({
 
+                    url: 'index.html'
 
+                });
 
+                break;
 
+            case 1:
 
+                mui.openWindow({
 
+                    url: 'shopping_cart.html'
 
+                });
 
+                break;
 
+            case 2:
 
+                mui.openWindow({
 
+                    url: 'order_list.html'
 
+                });
 
+                break;
 
+            case 3:
 
+                mui.openWindow({
 
+                    url: 'vip_center.html'
 
+                });
 
+                break;
 
+            default:
 
+                break
 
+        }
 
+    }, false)
 
+});
 
+
 
+function getCartNum() {
 
+    mui.ajax(base_path + '/cart/getCartNumByCartOpenId', {
 
+        data: {
 
+            openid: '230'
 
+        },
 
+        dataType: 'json',
 
+        type: 'post',
 
+        timeout: 15000,
 
+        success: function(dt) {
 
+            if(dt.status) {
 
+                if(dt.data == "0") {
 
+                    $('.icon-gouwuche span').hide()
 
+                } else {
 
+                    $('.icon-gouwuche span').text(dt.data).show()
 
+                }
 
+            } else {
 
+                console.log(dt)
 
+            }
 
+        },
 
+        error: function(xhr, type, errorThrown) {
 
+            errorfn(xhr)
 
+        }
 
+    })
 
+};
 
+mui('body').on('tap', '.go_index', function() {
 
+    mui.openWindow({
 
+        url: 'index.html'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_gwc', function() {
 
+    mui.openWindow({
 
+        url: 'shopping_cart.html'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_web_shop', function() {
 
+    mui.openWindow({
 
+        url: 'chanpin_list.html'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_chanpin_details', function() {
 
+    mui.openWindow({
 
+        url: 'chanpin_details.html?productId=' + this.getAttribute("proid")+'&colorId='+this.getAttribute("colorid")
 
+    })
 
+});
 
+mui('body').on('tap', '.go_couponList', function() {
 
+    mui.openWindow({
 
+        url: 'coupon_list.html'
 
+    })
 
+});
 
+mui('body').on('tap', '.go-clearing', function() {
 
+    var th=this;
 
+    mui.ajax(base_path + '/cart/addProductToCart', {
 
+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
 
+        dataType: 'json',
 
+        type: 'GET',
 
+        timeout: 15000,
 
+        success: function(dt) {
 
+            if(dt.status) {
 
+                mui.openWindow({
 
+                    url: 'clearing.html?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
 
+                })
 
+            } else {
 
+                mui.alert(dt.message)
 
+            }
 
+        },
 
+        error: function(xhr, type, errorThrown) {
 
+            console.log(xhr)
 
+        }
 
+    })
 
+});
 
+mui('body').on('tap', '.go_gwc_pro', function() {
 
+    var th=this;
 
+    mui.ajax(base_path + '/cart/addProductToCart', {
 
+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
 
+        dataType: 'json',
 
+        type: 'GET',
 
+        timeout: 15000,
 
+        success: function(dt) {
 
+            if(dt.status) {
 
+                getCartNum()
 
+            } else {
 
+                mui.alert(dt.message)
 
+            }
 
+        },
 
+        error: function(xhr, type, errorThrown) {
 
+            errorfn(xhr)
 
+        }
 
+    })
 
+});
 
+
 
+function marquee_Show() {
 
+    mui.ajax(base_path + '/coupon/checkCurrentPreferential', {
 
+        dataType: 'json',
 
+        type: 'POST',
 
+        async: false,
 
+        timeout: 15000,
 
+        success: function(dt) {
 
+            if(dt.status) {
 
+                marquee = '<span class="mui-h6">专属优惠：</span>'
 
+            } else {
 
+                marquee = ''
 
+            }
 
+        },
 
+        error: function(xhr, type, errorThrown) {
 
+            console.log(xhr)
 
+        }
 
+    })
 
+};
 
+mui('body').on('tap', '.go_order_details', function() {
 
+    mui.openWindow({
 
+        url: 'order_details.html?orderId=' + this.getAttribute("value")
 
+    })
 
+});
 
+mui('body').on('tap', '.go_pay_count', function() {
 
+    mui.openWindow({
 
+        url: 'order_list.html?salesStatus=1'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_deliver_count', function() {
 
+    mui.openWindow({
 
+        url: 'order_list.html?salesStatus=2'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_delivered_count', function() {
 
+    mui.openWindow({
 
+        url: 'order_list.html?salesStatus=5'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_all_count', function() {
 
+    mui.openWindow({
 
+        url: 'order_list.html?salesStatus=-1'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_tixian_guize', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/integralWechat/withdrawRule'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_agent_rule', function() {
 
+    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: base_path + '/agentWechat/order'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_daili_rebackOrder_list', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/agentWechat/reback'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_order_list', function() {
 
+    mui.openWindow({
 
+        url: 'order_list.html'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_xiaxian_list', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/agentWechat/agentNext'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_tixian_apply', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/withdraw/index'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_tixian_cash', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/withdraw/cash'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_daili_2wm', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/member/showQrcode'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_cash_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/cashWechat/log'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_jifen_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/integralWechat/log'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_jifen_guize', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/integralWechat/integralRule'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_tixian_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/integralWechat/withdrawLog'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_tixian_cash_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/agentWechat/withdrawCashLog'
 
+    })
 
+});
 
+mui('body').on('tap', '.show_post_info', function() {
 
+    var urlStr = document.domain;
 
+    var postfirm = $(this).prop('postfirm');
 
+    if (postfirm == 'sto') {
 
+        mui.openWindow({
 
+            url: 'http://tuisong.wx.sto.cn/Track/Result163?billCode=' + this.getAttribute("postNum")
 
+        });
 
+    } else {
 
+        var href = window.location.href;
 
+        mui.openWindow({
 
+            url: '//m.kuaidi100.com/index_all.html?type=ems&postid=' + this.getAttribute("postNum") + '&callbackurl=' + href
 
+        });
 
+    }
 
+});
 
+mui('body').on('tap', '.go_fenxiao_tixian_apply', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/drp/withdrawalsPage?openid='
 
+    })
 
+});
 
+mui('body').on('tap', '.go_fenxiao_tixian_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/drp/withdrawalsList'
 
+    })
 
+});
 
+mui('body').on('tap', '.fenxiao_vip', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/drp/rulePage'
 
+    })
 
+});
 
+mui('body').on('tap', '.to-up-img', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/sharePage/upShare?userType=1'
 
+    })
 
+});
 
+mui('body').on('tap', '.fenxiao_info', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/drp/placeInfo_detail'
 
+    })
 
+});
 
+mui('body').on('tap', '.go_luck_draw', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/activity/go_luck_draw?orderId=' + this.getAttribute("value")
 
+    })
 
+});
 
+mui('body').on('tap', '.go_prize_log', function() {
 
+    mui.openWindow({
 
+        url: base_path + '/activity/go_prize_log?gameId=' + this.getAttribute("value")
 
+    })
 
+});
 
+
 
+function errorfn(xhr) {
 
+    if(xhr.readyState == 4 && xhr.status == 200) {} else {
 
+        var ref = location.href.split("#")[0],
 
+            src = '';
 
+        if(ref.indexOf('?') != -1) {
 
+            src = ref + "&date=" + new Date().getTime()
 
+        } else {
 
+            src = ref + "?date=" + new Date().getTime()
 
+        }
 
+        location.href = src;
 
+        return
 
+    }
 
+}
 
+
 
+function CheckImgExists(imgurl) {
 
+    var ImgObj = new Image();
 
+    ImgObj.src = imgurl;
 
+    if(ImgObj.fileSize > 0 || (ImgObj.width > 0 && ImgObj.height > 0)) {
 
+        return ImgObj
 
+    } else {
 
+        return false
 
+    }
 
+};
 
+
 
+function gotoTop(acceleration, stime) {
 
+    acceleration = acceleration || 0.1;
 
+    stime = stime || 10;
 
+    var x1 = 0,
 
+        y1 = 0,
 
+        x2 = 0,
 
+        y2 = 0,
 
+        x3 = 0,
 
+        y3 = 0;
 
+    if(document.documentElement) {
 
+        x1 = document.documentElement.scrollLeft || 0;
 
+        y1 = document.documentElement.scrollTop || 0
 
+    }
 
+    if(document.body) {
 
+        x2 = document.body.scrollLeft || 0;
 
+        y2 = document.body.scrollTop || 0
 
+    }
 
+    var x3 = window.scrollX || 0;
 
+    var y3 = window.scrollY || 0;
 
+    var x = Math.max(x1, Math.max(x2, x3));
 
+    var y = Math.max(y1, Math.max(y2, y3));
 
+    var speeding = 1 + acceleration;
 
+    window.scrollTo(Math.floor(x / speeding), Math.floor(y / speeding));
 
+    if(x > 0 || y > 0) {
 
+        var run = "gotoTop(" + acceleration + ", " + stime + ")";
 
+        window.setTimeout(run, stime)
 
+    }
 
+};
 
+
 
+function accDiv(arg1, arg2) {
 
+    var t1 = 0,
 
+        t2 = 0,
 
+        r1, r2;
 
+    try {
 
+        t1 = arg1.toString().split(".")[1].length
 
+    } catch(e) {}
 
+    try {
 
+        t2 = arg2.toString().split(".")[1].length
 
+    } catch(e) {}
 
+    with(Math) {
 
+        r1 = Number(arg1.toString().replace(".", ""));
 
+        r2 = Number(arg2.toString().replace(".", ""));
 
+        return(r1 / r2) * pow(10, t2 - t1)
 
+    }
 
+};
 
+Number.prototype.div = function(arg) {
 
+    return accDiv(this, arg)
 
+};
 
+
 
+function accAdd(arg1, arg2) {
 
+    var r1, r2, m, c;
 
+    try {
 
+        r1 = arg1.toString().split(".")[1].length
 
+    } catch(e) {
 
+        r1 = 0
 
+    }
 
+    try {
 
+        r2 = arg2.toString().split(".")[1].length
 
+    } catch(e) {
 
+        r2 = 0
 
+    }
 
+    c = Math.abs(r1 - r2);
 
+    m = Math.pow(10, Math.max(r1, r2));
 
+    if(c > 0) {
 
+        var cm = Math.pow(10, c);
 
+        if(r1 > r2) {
 
+            arg1 = Number(arg1.toString().replace(".", ""));
 
+            arg2 = Number(arg2.toString().replace(".", "")) * cm
 
+        } else {
 
+            arg1 = Number(arg1.toString().replace(".", "")) * cm;
 
+            arg2 = Number(arg2.toString().replace(".", ""))
 
+        }
 
+    } else {
 
+        arg1 = Number(arg1.toString().replace(".", ""));
 
+        arg2 = Number(arg2.toString().replace(".", ""))
 
+    }
 
+    return(arg1 + arg2) / m
 
+};
 
+Number.prototype.add = function(arg) {
 
+    return accAdd(arg, this)
 
+};
 
+
 
+function accSub(arg1, arg2) {
 
+    var r1, r2, m, n;
 
+    try {
 
+        r1 = arg1.toString().split(".")[1].length
 
+    } catch(e) {
 
+        r1 = 0
 
+    }
 
+    try {
 
+        r2 = arg2.toString().split(".")[1].length
 
+    } catch(e) {
 
+        r2 = 0
 
+    }
 
+    m = Math.pow(10, Math.max(r1, r2));
 
+    n = (r1 >= r2) ? r1 : r2;
 
+    return((arg1 * m - arg2 * m) / m).toFixed(n)
 
+};
 
+Number.prototype.sub = function(arg) {
 
+    return accMul(arg, this)
 
+};
 
+
 
+function accMul(arg1, arg2) {
 
+    var m = 0,
 
+        s1 = arg1.toString(),
 
+        s2 = arg2.toString();
 
+    try {
 
+        m += s1.split(".")[1].length
 
+    } catch(e) {}
 
+    try {
 
+        m += s2.split(".")[1].length
 
+    } catch(e) {}
 
+    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
 
+};
 
+Number.prototype.mul = function(arg) {
 
+    return accMul(arg, this)
 
+};
 
+
 
+function switchcolor(color) {
 
+    var pro_color = "";
 
+    switch(color) {
 
+        case 1:
 
+            pro_color = "品蓝";
 
+            break;
 
+        case 2:
 
+            pro_color = "品黑";
 
+            break;
 
+        case 3:
 
+            pro_color = "苹果绿";
 
+            break;
 
+        case 4:
 
+            pro_color = "西瓜红";
 
+            break;
 
+        case 5:
 
+            pro_color = "白色";
 
+            break;
 
+        case 36:
 
+            pro_color = "银色";
 
+            break;
 
+        case 37:
 
+            pro_color = "磨砂";
 
+            break;
 
+        case 39:
 
+            pro_color = "无色透明";
 
+            break;
 
+        default:
 
+            pro_color = "品蓝";
 
+            break
 
+    }
 
+    return pro_color
 
+};
 
+
 
+function switchColorImg(colorId){
 
+    var img='';
 
+    switch (colorId){
 
+        case 1:
 
+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
 
+            break;
 
+        case 2:
 
+            img='//s.iamberry.com/watero/images/shop/cp-black.png'
 
+            break;
 
+        case 3:
 
+            img='//s.iamberry.com/watero/images/shop/cp-green.png'
 
+            break;
 
+        case 4:
 
+            img='//s.iamberry.com/watero/images/shop/cp-red.png'
 
+            break;
 
+        case 39:
 
+            img='//w.iamberry.com/watero/common/images/uploadimages/image/20171212/971ECE348D1F7D9F8628_20171212154024_8556.jpg'
 
+            break;
 
+        default:
 
+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
 
+            break;
 
+    }
 
+    return img;
 
+};
 
+
 
+function getParam(paramName) {
 
+    paramValue = "", isFound = !1;
 
+    if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
 
+        arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
 
+        while(i < arrSource.length && !isFound) {
 
+            arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
 
+        }
 
+    }
 
+    return paramValue == "" && (paramValue = null), paramValue
 
+};
 
+
 
+function dc(objectid) {
 
+    if(document.getElementById && document.getElementById(objectid)) {
 
+        return document.getElementById(objectid)
 
+    } else if(document.all && document.all(objectid)) {
 
+        return document.all(objectid)
 
+    } else if(document.layers && document.layers[objectid]) {
 
+        return document.layers[objectid]
 
+    } else {
 
+        return false
 
+    }
 
+};
 
+
 
+function formatDate(now) {
 
+    now = new Date(now);
 
+    var year = now.getFullYear();
 
+    var month = now.getMonth() + 1;
 
+    var date = now.getDate();
 
+    var hour = now.getHours();
 
+    var minute = now.getMinutes();
 
+    var second = now.getSeconds();
 
+    return year + "-" + month + "-" + date + "   " + hour + ":" + minute + ":" + second
 
+};
 
+
 
+function springFestivalPop() {
 
+    if(getCookie("WATERO_WEB_") == null) {
 
+        maskspringFestival.show();
 
+        $(".mui-backdrop").append('<div style="position:relative;"><img src="//s.iamberry.com/watero/images/shop/springFestival_2017.png" style="width:80%;margin:10% 10% auto 10%;"/><button type="button" id="close-springFestival" class="mui-btn my-btn-red" style="position: absolute;bottom: 5%;left: 50%;-webkit-transform: translateX(-50%)">我知道了</button></div>');
 
+        mui('body').on('tap', '#close-springFestival', function(e) {
 
+            setCookie();
 
+            $(".mui-backdrop").hide();
 
+        });
 
+    }
 
+};
 
+
 
+function getCookie(name) {
 
+    var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
 
+    if(arr = document.cookie.match(reg))
 
+        return unescape(arr[2]);
 
+    else
 
+        return null;
 
+};
 
+var maskspringFestival = mui.createMask(function() {
 
+    return false;
 
+}); //callback为用户点击蒙版时自动执行的回调；
 
+function setCookie() {
 
+    var Days = 30;
 
+    var exp = new Date();
 
+    exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
 
+    document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
 
+};

File diff suppressed because it is too large
+ 15 - 11
watero/js/page/order_details.js


File diff suppressed because it is too large
+ 60 - 58
watero/js/page/order_list.js


+ 7 - 3
watero/js/page/pay_win.js
View File 

@@ -3,13 +3,17 @@ mui.ready(function() {
 
 	var nowUrl = location.href;
 
 	var orderId = nowUrl.split("?")[1].split("&")[0].split("=")[1];
 
 	nowOrderId = orderId;
 
-	selectUser({
 
-		"orderId": orderId
 
+//	selectUser({
 
+//		"orderId": orderId
 
+//	});
 
+	//getCartNum();
 
+	$(document).on('tap', '#check-order-desc', function() {
 
+		location.href='order_details.html?orderId='+nowOrderId
 
 	});
 
-	getCartNum();
 
 	document.querySelector('.loading-bg').style.display = 'none'
 
 });
 
 
+
 
 function selectUser(orderId) {
 
 	var btnArray = ['否', '是'];
 
 	$.ajax(base_path + '/order/getOrderInfo', {

+ 33 - 6
watero/order_details.html
View File 

@@ -10,6 +10,9 @@
 
 	<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
 
 	<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
 
 	<link rel="stylesheet" type="text/css" href="css/style.css" />
 
+	<style>
 
+		.mui-btn-grey{color: #666;border: 1px solid #c7c7cc;background-color: #fff;border-radius: 20px;padding: 6px 18px;}
 
+	</style>
 
 	<script>
 
         // 屏蔽分享
 
         window.hiddenAllWechatMenu = true;
 
@@ -34,11 +37,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content" style="background: #fff;">
 
@@ -66,12 +69,12 @@
 
 <ul class="mui-table-view">
 
 <li class="mui-table-view-cell" style="padding-left:7px;">
 
 <a class="btn-youhuiquan">
 
-商品总价<span class="mui-pull-right"><span id="salesAmount" class="cl-red">0.00</span></span>
 
+商品总价<span class="mui-pull-right"><span id="salesAmount">0.00</span></span>
 
 </a>
 
 </li>
 
 <li class="mui-table-view-cell" style="padding-left:7px;" id="isCouponReduce">
 
 <a class="btn-youhuiquan">
 
-抵扣金额<span class="mui-pull-right">- <span id="couponReduce" style="color: #f00;">¥0.00</span></span>
 
+优惠金额<span class="mui-pull-right" style="color: #e06974;">- <span id="couponReduce">¥0.00</span></span>
 
 </a>
 
 </li>
 
 <!--<li class="mui-table-view-cell" style="padding-left:7px;" id="">
 
@@ -80,7 +83,7 @@
 
 </a>
 
 </li>-->
 
 </ul>
 
-<div class="mui-content-padded mui-text-right">实付：<span class="pro-price"><span id="salesYetAmount" class="cl-red">0.00</span></span></div>
 
+<div class="mui-content-padded mui-text-right">共<span id="all-count"></span>件&nbsp;&nbsp;&nbsp;实付款：<span class="pro-price"><span id="salesYetAmount" class="cl-red">0.00</span></span></div>
 
 </div>
 
 <ul class="mui-table-view my-grid-view-no status-list">
 
 <li class="mui-table-view-cell">
 
@@ -93,9 +96,33 @@
 
 下单时间：<span id="salesCreateDate"></span>
 
 </li>
 
 <li class="mui-table-view-cell" id="isShowOrderRemark">
 
-订单留言：<span id="salesUserRemark"></span>
 
+订单备注：<span id="salesUserRemark"></span>
 
 </li>
 
 </ul>
 
+<div style="background: #fff;padding: 0 10px;">
 
+		<div><input type="hidden" id="salesLockType" value=""></div>
 
+		<div><input type="hidden" id="oldStatus" value=""></div>
 
+		<div style="text-align: center;padding: 10px 0; display: none" id="cancelOrder"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">取消订单</button></div>
 
+		<!-- <input name="" id="changeOrderId"/>-->
 
+		<div style="text-align: center;padding: 10px 0; display: none" id="exchangeOrder">
 
+			<button type="button" class="mui-btn mui-btn-grey" onclick="operation('1');">申请换货</button>
 
+		</div>
 
+		<div id="refund" style="display: none">
 
+			<br>
 
+			<textarea placeholder="退款备注，必填" id="return-money-id"></textarea>
 
+			<div>
 
+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">申请退款</button></div>
 
+			</div>
 
+		</div>
 
+		<div id="salesReturn" style="display: none">
 
+			<br>
 
+			<textarea placeholder="退货备注，必填" id="return-pay-id"></textarea>
 
+			<div>
 
+				<!-- <input name="" id="returnOrderId"/>-->
 
+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation('2');">申请退货</button></div>
 
+			</div>
 
+		</div>
 
+	</div>
 
 <br />
 
 <ul class="mui-table-view my-grid-view-no">
 
 		<li class="mui-table-view-cell" id="showLogistics">

+ 9 - 9
watero/order_list.html
View File 

@@ -39,14 +39,14 @@
 
 	</a>
 
 	<a class="mui-tab-item mui-active">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
-<header class="mui-bar mui-bar-nav header">
 
+<!--<header class="mui-bar mui-bar-nav header">
 
 	<div class="go-index go_index">
 
 		<img src="images/logo-blue.png" />
 
 	</div>
 
@@ -59,22 +59,22 @@
 
 			<input id='mydate' type="text" class="mui-text-center" placeholder="选择日期">
 
 		</div>
 
 	</div>
 
-</header>
 
+</header>-->
 
 <div class="mui-segmented-control tab-with-orderlist">
 
 	<a class="mui-control-item icon-topay mui-active" tabindex="0">
 
-		<span class="iconfont icon-daifukuan"></span>
 
-		<span class="mui-tab-label">待支付</span>
 
+		<!--<span class="iconfont icon-daifukuan"></span>-->
 
+		<span class="mui-tab-label">待付款</span>
 
 	</a>
 
 	<a class="mui-control-item icon-todelivery" tabindex="1">
 
-		<span class="iconfont icon-daifahuo"></span>
 
+		<!--<span class="iconfont icon-daifahuo"></span>-->
 
 		<span class="mui-tab-label">待发货</span>
 
 	</a>
 
 	<a class="mui-control-item icon-delivery" tabindex="2">
 
-		<span class="iconfont icon-yifahuo"></span>
 
+		<!--<span class="iconfont icon-yifahuo"></span>-->
 
 		<span class="mui-tab-label">已发货</span>
 
 	</a>
 
 	<a class="mui-control-item icon-allorder" tabindex="3">
 
-		<span class="iconfont icon-alldingdan"></span>
 
+		<!--<span class="iconfont icon-alldingdan"></span>-->
 
 		<span class="mui-tab-label">全部订单</span>
 
 	</a>
 
 </div>

+ 15 - 23
watero/pay_win.html
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 <head>
 
 	<meta charset="UTF-8">
 
-	<title></title>
 
+	<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">
 
@@ -38,36 +38,28 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
-<header class="mui-bar mui-bar-nav header">
 
+<!--<header class="mui-bar mui-bar-nav header">
 
 	<div class="go-index go_index">
 
 		<img src="images/logo.png" />
 
 	</div>
 
-</header>
 
-<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
 
-	<div class="pl-win-tt">
 
-		<img style="width: 1.5em;" src="images/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
 
-		<div>已支付：<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
 
+</header>-->
 
+<div class="mui-content" style="background: #fff;" id="show-div-data">
 
+	<div style="margin: 70px auto 25px auto;">
 
+		<img style="width:100px;display: block;margin: 0 auto;" src="images/pay-win.png">
 
+		<h6 class="mui-text-center"> 恭喜您，支付成功！</h6>
 
 	</div>
 
-	<ul class="pay_win_list">
 
-		<li>订单编号：<span class="cl-0" id="orderid-span">加载中...</span></li>
 
-		<li>支付时间：<span class="cl-0" id="pay-date-span">加载中...</span></li>
 
-		<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
 
-		<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
 
-	</ul>
 
-</div>
 
-<!-- <div class="mui-content-padded">
 
-        <a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
 
-    </div> -->
 
-<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
 
-	<ul class="pay_win_list">
 
-		<li><span class="cl-0">正在加载数据...</span></li>
 
+	<ul>
 
+		<li class="mui-text-center">
 
+			<a class="mui-btn btn-blue-double" id="check-order-desc" value="">订单详情</a> 
+			<a class="mui-btn btn-blue-double go_web_shop">继续逛逛</a>
 
+		</li>
 
 	</ul>
 
 </div>
 
 <!--春节放假通知-->
 
@@ -75,7 +67,7 @@
 
 <script src="js/mui.min.js"></script>
 
 <script src="js/jquery-2.1.1.min.js"></script>
 
 <script src="js/main.js"></script>
 
-<script src="js/page/wechat-utils-1.0.js"></script>
 
+<!--<script src="js/page/wechat-utils-1.0.js"></script>-->
 
 <script src="js/page/pay_win.js"></script>
 
 </body>
 
 <script>

+ 12 - 12
watero/shopping_cart.html
View File 

@@ -26,7 +26,7 @@
 
         window.hiddenAllWechatMenu = true;
 
 	</script>
 
 </head>
 
-<body>
 
+<body style="background: #fff;">
 
 <div class="loading-bg">
 
 	<div class="mui-loading">
 
 		<div class="mui-spinner">
 
@@ -34,11 +34,11 @@
 
 		&nbsp;&nbsp;加载中...
 
 	</div>
 
 </div>
 
-<div class="mui-content">
 
+<div class="mui-content" style="background: #fff;">
 
 	<div class="gwc_null">
 
 		<img src="images/empty_cart.png">
 
-		<h3>购物车还是空的</h3>
 
-		<a href="chanpin_list.html" class="mui-btn my-btn-danger go_web_shop" style="width: 65%;padding: 10px 10px;">马上逛逛</a>
 
+		<h6 style="margin: 15px 0 50px 0;">购物车空空如也，快去抢购吧！</h6>
 
+		<a href="chanpin_list.html" class="mui-btn btn-blue-double go_web_shop" style="width: 100px;">去购买</a>
 
 		<nav class="mui-bar mui-bar-tab" id="footer-bar">
 
 			<a class="mui-tab-item" >
 
 				<div class="iconfont icon-home"></div>
 
@@ -46,30 +46,30 @@
 
 			</a>
 
 			<a class="mui-tab-item mui-active">
 
 				<div class="iconfont icon-gouwuche">
 
-					<!-- <span class="mui-badge">0</span> -->
 
+					 <span class="mui-badge">0</span>
 
 				</div>
 
 				<span class="mui-tab-label">购物车</span>
 
 			</a>
 
 			<a class="mui-tab-item">
 
 				<div class="iconfont icon-dingdan"></div>
 
-				<span class="mui-tab-label">我的订单</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>
 
+				<span class="mui-tab-label">我的</span>
 
 			</a>
 
 		</nav>
 
 	</div>
 
-	<div class="shopping-box">
 
+	<!--<div class="shopping-box">
 
 		<div class="tt-yf">
 
 			<label class="click-all-btn"><input name="checkbox" checked="checked" type="checkbox" class="all_check" />全选</label>
 
 			<a href="#" class="mui-btn my-btn-danger go_web_shop">再挑一下</a>
 
 		</div>
 
 
-	</div>
 
+	</div>-->
 
 	<div class="shoping-tt">
 
-		<span class="left"><img src="images/jiao1.png" /></span>
 
-		<span class="right"><img src="images/jiao2.png" /></span>
 
+		<!--<span class="left"><img src="images/jiao1.png" /></span>
 
+		<span class="right"><img src="images/jiao2.png" /></span>-->
 
 		<!-- 购物车项 -->
 
 		<ul class="mui-table-view shopping-cart-list" id="cart-list-ul"></ul>
 
 	</div>
 
@@ -81,7 +81,7 @@
 
 						<input type="checkbox" name="checkbox" checked="checked" class="all_check"/><br>全选
 
 					</label>
 
 				</td>
 
-				<td rowspan="2" class="t-r">总计:</td>
 
+				<td rowspan="2" class="t-r">合计:</td>
 
 				<td class="count_price_box">¥<span class="count_price" id="pay-total">0</span>元</td>
 
 				<td rowspan="2">
 
 					<a id="go-clearing" class="mui-btn mui-pull-right add_gwc">去结算(0)</a>

+ 2 - 2
watero/tixian_apply_cash.html
View File 

@@ -41,11 +41,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">

+ 2 - 2
watero/tixian_cash_success.html
View File 

@@ -33,11 +33,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <header class="mui-bar mui-bar-nav header">

+ 2 - 2
watero/tixian_log.html
View File 

@@ -40,11 +40,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 2 - 2
watero/tixian_log_cash.html
View File 

@@ -40,11 +40,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">

+ 5 - 4
watero/vip_center.html
View File 

@@ -107,11 +107,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</span>
 
+		<span class="mui-tab-label">订单</span>
 
 	</a>
 
 	<a class="mui-tab-item mui-active">
 
 		<div class="iconfont icon-vip"></div>
 
-		<span class="mui-tab-label">会员中心</span>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <div class="mui-content">
 
@@ -284,7 +284,8 @@
 
 					客服电话
 
 				</div>
 
 				<div class="mui-table-cell mui-col-xs-5 mui-text-right">
 
-					<span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 3px;">400-8006692</span><span class="mui-icon mui-icon-arrowright"></span>
 
+					<!--<span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 2px;">400-8006692</span>-->
 
+					<span class="mui-icon mui-icon-arrowright"></span>
 
 				</div>
 
 			</div>
 
 		</li>
 
@@ -294,7 +295,7 @@
 
                     滤芯兑换券
 
                 </div>
 
                 <div class="mui-table-cell mui-col-xs-5 mui-text-right">
 
-                    <span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 3px;">使用说明</span><span class="mui-icon mui-icon-arrowright"></span>
 
+                    <span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 2px;">使用说明</span><span class="mui-icon mui-icon-arrowright"></span>
 
                 </div>
 
             </div>
 
         </li>

+ 2 - 2
watero/win.html
View File 

@@ -33,11 +33,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <header class="mui-bar mui-bar-nav header">

+ 2 - 2
watero/xiaxian_list.html
View File 

@@ -39,11 +39,11 @@
 
 	</a>
 
 	<a class="mui-tab-item">
 
 		<div class="iconfont icon-dingdan"></div>
 
-		<span class="mui-tab-label">我的订单</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>
 
+		<span class="mui-tab-label">我的</span>
 
 	</a>
 
 </nav>
 
 <ul class="mui-table-view more">