qihanjiao 6 anni fa
parent
commit
4817582a3f
100 ha cambiato i file con 54 aggiunte e 45 eliminazioni
  1. 1 1
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html
  2. 11 1
      watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html
  3. 42 42
      watero-wechat-web/src/main/webapp/common/shop/css/style.css
  4. 0 1
      watero-wechat-web/src/main/webapp/common/shop/css/vip_center.css
  5. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/coupon_dsc.jpg
  6. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/1.png
  7. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/2.png
  8. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/3.png
  9. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/4.png
  10. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/404.jpg
  11. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/5.png
  12. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/6.png
  13. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/7.png
  14. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/8.png
  15. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/alert-bg1.png
  16. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/alert-bg2.png
  17. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/all1_icon.png
  18. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/all_icon.png
  19. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/allorder_icon.png
  20. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-1.jpg
  21. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-2.jpg
  22. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-51.png
  23. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/banner.jpg
  24. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/banner_4.jpg
  25. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/bg_2wm.jpg
  26. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/bg_gz_2wm.png
  27. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-guize.png
  28. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-guize1.png
  29. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jilu.png
  30. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jilu1.png
  31. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jixu.png
  32. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-share.png
  33. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-wheel-bg.png
  34. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-wheel-bg1.png
  35. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/c_checkbox_off.png
  36. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/c_checkbox_on.png
  37. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/camera.jpg
  38. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/camera.png
  39. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-1.jpg
  40. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-1.png
  41. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-2.png
  42. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-3.png
  43. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-4.png
  44. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-5.png
  45. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-6.png
  46. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-details.jpg
  47. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-list-1.jpg
  48. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-load.jpg
  49. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-load.png
  50. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/contac_us.jpg
  51. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/corner_icon.png
  52. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/coupon.png
  53. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-1.jpg
  54. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-2.jpg
  55. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-3.jpg
  56. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-4.jpg
  57. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/daili-2wm.png
  58. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/daili-banner.jpg
  59. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/daili_bg.jpg
  60. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/default_qrcode.png
  61. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/default_watermark.png
  62. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/delivery_icon.png
  63. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/delivery_icon1.png
  64. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/dl_icon.png
  65. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/empty_cart.png
  66. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/fenxiao-banner.jpg
  67. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/firstCare.png
  68. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/five.png
  69. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/four.png
  70. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu1.png
  71. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu2.png
  72. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu3.png
  73. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu4.png
  74. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/guanggao-1.jpg
  75. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/guanggao.jpg
  76. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/guize-bg.png
  77. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/guize-bg1.png
  78. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/i-want-daili.png
  79. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/image-12.jpg
  80. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/image-7.jpg
  81. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/index-load.gif
  82. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/index.jpg
  83. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/jianjie_content.jpg
  84. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/jiao1.png
  85. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/jiao2.png
  86. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/jifen-shop.png
  87. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/left_1_51.jpg
  88. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/line-color.png
  89. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/logo.png
  90. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/logo_head.png
  91. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_1.jpg
  92. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_2.png
  93. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_3.jpg
  94. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/myorder_icon.png
  95. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/naiji_xuanchuan.jpg
  96. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/no_yhq.png
  97. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/noused1_icon.png
  98. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/noused_icon.png
  99. BIN
      watero-wechat-web/src/main/webapp/common/shop/images/shop/one.png
  100. 0 0
      watero-wechat-web/src/main/webapp/common/shop/images/shop/overdue1_icon.png

+ 1 - 1
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html

@@ -17,7 +17,7 @@
 	<style>
 		input[name=checkbox] { width: 18px;height: 18px;-webkit-appearance: none;appearance: none;cursor: pointer;vertical-align: top;background: url(//s.iamberry.com/watero/images/shop/c_checkbox_off.png) center center no-repeat;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;position: relative;border: 0;background-size: 100%;}
 		input[name=checkbox]:checked {background: url(//s.iamberry.com/watero/images/shop/c_checkbox_on.png) center center no-repeat;background-size: 100%;}
-		.delete-cart-style{font-size: 20px;margin-top: 30px;color: red;margin-left: 20px;}
+		.delete-cart-style{font-size: 20px;margin-top: 30px;color:#55c0dc;margin-left: 20px;}
 		.btn-box {padding-left: 100px;}
 		#pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 20px;}
 	</style>

+ 11 - 1
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html

@@ -288,6 +288,16 @@
 				</div>
 			</div>
 		</li>
+        <li class="mui-table-view-cell" href="/watero/view/coupon_dec.html" id="coupon-sys" style="display: none;">
+            <div class="mui-table">
+                <div class="mui-table-cell mui-col-xs-5">
+                    滤芯兑换券
+                </div>
+                <div class="mui-table-cell mui-col-xs-5 mui-text-right">
+                    <span class="mui-h5" style="position: absolute;width: 100px;right: 25px;top: 3px;">使用说明</span><span class="mui-icon mui-icon-arrowright"></span>
+                </div>
+            </div>
+        </li>
 	</ul>
 </div>
 <script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
@@ -320,7 +330,7 @@
                             $("#userNickname").html(userNickname )
 							$("#vipName").html('<img style="width: 12px;" src="//s.iamberry.com/watero/images/s-vip.png" /><span class="mui-h6">VIP用户</span>');
                         }
-                        $(".vip-show").show();
+                        $(".vip-show,#coupon-sys").show();
                     } else {
                         if(userNickname != "") {
                             $("#userNickname").html(userNickname)

+ 42 - 42
watero-wechat-web/src/main/webapp/common/shop/css/style.css

@@ -16,31 +16,31 @@ ul{list-style: none;padding: 0;margin: 0;}
 .chanpin-box .bg-blue{background: #a8ebf7 !important;line-height: 0;}
 .chanpin-box .bg-black{background: #c9c9c9 !important;line-height: 0;}
 .chanpin-box .bg-green{background: #eefcc8 !important;line-height: 0;}
-.chanpin-box .bg-red{background: #fcc2cd !important;line-height: 0;}
+.chanpin-box .bg-red{background: #55c0dc !important;line-height: 0;}
 .chanpin-box .cl-blue{color:#60c1de;}
 .chanpin-box .cl-black{color:#525251;}
 .chanpin-box .cl-green{color:#97b500;}
-.chanpin-box .cl-red{color:#ed647f;}
+.chanpin-box .cl-red{color:#55c0dc;}
 
 .price1{font-size:1.5em;color: #fff;}
 .price2{font-size:12px;color: #898989;margin-left:1em;}
 .price1:before{content: '楼';font-size:20px;margin-right: 5px;}
-.my-btn-red{width: 90px;padding:5px 10px;line-height: 1.42 !important;background: #e4004d;color: #fff;border: 0;border-radius: 5px;}
+.my-btn-red{width: 90px;padding:5px 10px;line-height: 1.42 !important;background:#55c0dc;color: #fff;border: 0;border-radius: 5px;}
 .prev{position: absolute;left:0;top: 50%;margin-top: -20px; width: 40px;height: 40px;line-height: 30px; padding:5px 0;text-align: left;font-size:30px;color: #ccc;}
-.next{position: absolute;right:0;top: 50%;margin-top: -20px; width: 40px;height: 40px;line-height: 30px; padding:5px 0;text-align: right;font-size:30px;color: #f64e78;}
+.next{position: absolute;right:0;top: 50%;margin-top: -20px; width: 40px;height: 40px;line-height: 30px; padding:5px 0;text-align: right;font-size:30px;color:#55c0dc;}
 .my-table-view {background-color:transparent;padding: 0 10px 0 0 !important;}
 .my-table-view .mui-table-view-cell{padding: 5px 0 0 14px !important;}
 .my-table-view:before{height: 0;}
 .my-table-view:after{height: 0;}
 .my-content-padded{overflow: hidden;}
 .my-content-padded img{width: 100%;border-radius: 5px;}
-.iconfont .mui-badge {font-size: 10px;line-height: 1.3;position: absolute;top:-3px;right: 28%;padding: 1px 5px;color: #fff;background: red;}
+.iconfont .mui-badge {font-size: 10px;line-height: 1.3;position: absolute;top:-3px;right: 28%;padding: 1px 5px;color: #fff;background:#55c0dc;}
 .mui-bar-tab~.mui-content{padding-bottom: 50px !important;}
 #footer-bar{background-color: #fff;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.45);box-shadow: 0 0 1px rgba(0,0,0,0.45)}
 #footer-bar .mui-tab-label{font-size: 12px;}
 /*#footer-bar .mui-tab-item{vertical-align: bottom;color:#a6c8ce;}*/
 #footer-bar .mui-tab-item{vertical-align: bottom;color:#d5d5d5;}
-#footer-bar .mui-tab-item.mui-active{color: #fe4264;}
+#footer-bar .mui-tab-item.mui-active{color: #55c0dc;}
 /*#footer-bar .mui-tab-item.mui-active{color: #24cae9;}*/
 #footer-bar .mui-tab-item.mui-active .icon-home:before{content: "\e668";}
 #footer-bar .mui-tab-item.mui-active .icon-gouwuche:before{content: "\e66a";}
@@ -50,22 +50,22 @@ ul{list-style: none;padding: 0;margin: 0;}
 .loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}
 .go-index{float: left;width: 35%;margin-right:1%;}
 .go-index img{width: 85%;padding-top: 5px;margin-left: 12px;max-height: 42px;max-width: 135px;}
-.header{padding: 7px 0;height: 55px;background: #fe4264;}
-.marquee-show{position: fixed;top: 0;left: 0;background: rgba(255,255,255,.7);z-index: 99;white-space: nowrap;height: 40px;line-height: 40px;padding: 0 10px;color: #ba405b;width:100%;}
+.header{padding: 7px 0;height: 55px;background: #55c0dc;}
+.marquee-show{position: fixed;top: 0;left: 0;background: rgba(255,255,255,.7);z-index: 99;white-space: nowrap;height: 40px;line-height: 40px;padding: 0 10px;color: #55c0dc;width:100%;}
 .marquee-show div{position: fixed;top: 0;left: 0;;height: 40px;line-height: 40px;width:100%;background: url(http://static.iamberry.com/watero/images/shop/marquee.png) center center /100% auto no-repeat;}
 
 .marquee_cart{padding: 8px 10px;
     background: #fff;
-    color: #ba405b;
+    color: #55c0dc;
     border-top: 1px solid rgba(0,0,0,.1);}
 .search-box .mui-input-row:first-child{display: inline-block;width: 58%;}
 .search-box .mui-input-row:last-child{display: inline-block;width:37%;}
 .search-box .mui-input-row:last-child input{height: 39px !important;}
 .search-box .mui-input-row input{margin-bottom: 0;}
 .my-search{width: 50%;display: inline-block;padding-top: 3px;}
-.my-search.mui-active{color: #fe4264;}
+.my-search.mui-active{color: #55c0dc;}
 .mui-bar .my-search input[type=search]{margin:2px 0;padding:16px 25px;border-radius: 25px !important;background-color: #fff;color: #000;}
-.my-search .mui-placeholder .mui-icon-search{margin-left:0;margin-right:0;color: #fe4264;}
+.my-search .mui-placeholder .mui-icon-search{margin-left:0;margin-right:0;color: #55c0dc;}
 .my-search .mui-placeholder{text-align: right;}
 .box-list-card{display: inline-block;width: 14%;float: right;padding:10px 0;color: #fff;text-align: center;}
 .mui-bar-nav~.mui-content {padding-top: 55px;}
@@ -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: #e4004d;font-size:16px;margin-right: 15px;}
+.price-sp {color: #55c0dc;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;}
@@ -106,8 +106,8 @@ ul{list-style: none;padding: 0;margin: 0;}
 }
 .tab-with-chanpin-list .mui-control-item.mui-active {
     background-color: transparent !important;
-    border-bottom: 2px solid #fe4264 !important;
-    color: #fe4264;
+    border-bottom: 2px solid #55c0dc !important;
+    color: #55c0dc;
 }
 #pullrefresh_chanpin_list{padding-top: 106px;}
 #pullrefresh_chanpin_list .mui-table-view-cell{border-bottom: 10px solid #f5f7f9;margin-right: 0;}
@@ -123,13 +123,13 @@ ul{list-style: none;padding: 0;margin: 0;}
 
 .btn-box{display: inline-block;position: absolute;right:0;bottom:12px;width:100%;text-align: left;padding-left:120px;}
 #pullrefresh_chanpin_list .mui-grid-view .btn-box{position: relative;bottom: auto;right: auto; padding-left: 0;}
-.my-btn-orange{background: #fff;border: 1px solid #fe4264;border-radius:4px;color: #fe4264;}
+.my-btn-orange{background: #fff;border: 1px solid #55c0dc;border-radius:4px;color: #55c0dc;}
 .my-btn-orange:active{background:#ffa13d !important;}
 #pullrefresh_chanpin_list .my-btn-danger{width: 55%;}
-.my-btn-danger{background: #fe4264;border: 1px solid transparent;border-radius: 4px;color: #fff;padding: 6px 18px;margin-right: 8px;}
+.my-btn-danger{background: #55c0dc;border: 1px solid transparent;border-radius: 4px;color: #fff;padding: 6px 18px;margin-right: 8px;}
 #pullrefresh_chanpin_list .mui-grid-view .my-btn-danger{margin-right: 0;width: 70%;margin-bottom: 15px;}
 .my-btn-danger:active{background: #236d89 !important;}
-.my-btn-joincart{border:1px solid #fe4264;color: #fe4264;padding-left: 5px;padding-right:4px;font-size: 22px;}
+.my-btn-joincart{border:1px solid #55c0dc;color: #55c0dc;padding-left: 5px;padding-right:4px;font-size: 22px;}
 #pullrefresh_chanpin_list .mui-grid-view .my-btn-joincart{float: right;margin-right: 4%;}
 .mui-table-view-cell:after{left: 0;}
 .mui-content>.mui-table-view:first-child{margin-top: 0;}
@@ -138,26 +138,26 @@ ul{list-style: none;padding: 0;margin: 0;}
 .food-tt>div:last-child {display: inline-block;width: 20%;text-align: center;position: relative;padding-top: 5px;max-width: 80px;font-size: 16px;}
 .del-s {font-size: 12px;color: #ccc;position: absolute;right: 5px;}
 .bg-f{background: #fff;}
-.cl-baoyou{color: #e4004d; margin-left: 10px;font-size:24px;}
+.cl-baoyou{color: #55c0dc; margin-left: 10px;font-size:24px;}
 .food-tt>div:last-child:after {content: '';position: absolute;left: 0;top: 10%;width: 1px;height: 80%;background-color: rgba(0,0,0,.15);}
 #detail-slider{border-bottom: 1px solid rgba(228,0,77,.5);}
 #tabbar-chanpin-details{background: #fff;border: 0;height: 50px;}
 #tabbar-chanpin-details .mui-control-item{color:#444;font-weight: 500;border-left: 0;border-bottom: 2px solid transparent;line-height: 50px;font-size: 18px;}
-#tabbar-chanpin-details .mui-control-item.mui-active{color: #fe4264;border-bottom: 2px solid #fe4264;background-color: #fff;}
+#tabbar-chanpin-details .mui-control-item.mui-active{color: #55c0dc;border-bottom: 2px solid #55c0dc;background-color: #fff;}
 .go-video{background: #fff3cb;padding: 10px;position: relative;}
 .go-video .icon-guanbi{color: #ffb72c;}
-.see-2wm{background: #fef6df;padding: 10px;position: relative;color: #e4004d;}
+.see-2wm{background: #fef6df;padding: 10px;position: relative;color:#55c0dc;}
 .btn-see-2wm{position: absolute;right: 10px;top: 14px;color: #444;font-size: 14px;}
-.see-2wm .icon-guanbi{color: #e4004d;}
+.see-2wm .icon-guanbi{color:#55c0dc;}
 .video-right{position: absolute;right:0;top:0;width: 52px;padding: 13px 10px 10px 30px;}
 .video-right img{width: 100%;}
 .chanpin-ditails-dic{padding: 10px;background: #fff;margin: 10px 0 65px 0;color: #444;}
 .chanpin-ditails-dic ul li{padding: 3px 0;}
 .buy-footer {position: fixed;bottom: 0;left: 0;height: 55px;background-color: #f0f0f0;width: 100%;padding: 0;display: table;text-align: center;}
-.buy-footer>div:first-child {display: table-cell;width: 40%;border-top: 1px solid #fe4264;vertical-align: middle;}
+.buy-footer>div:first-child {display: table-cell;width: 40%;border-top: 1px solid #55c0dc;vertical-align: middle;}
 .buy-footer>div:first-child img{width: 80%;padding-top: 3px;}
 .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: #fe4264;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;}
 .shoping-tt {padding: 0 12px 60px 12px;position: relative;}
@@ -167,7 +167,7 @@ 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: #e4004d;font-size: 18px;margin-right: 10px;}
+.price_sp {color:#55c0dc;font-size: 18px;margin-right: 10px;}
 .ft-24 {font-size: 28px;}
 .mt-7 {margin-top: .7em;}
 .jifen {position: absolute;left: 0;top: 0;width: 50px;height: 50px;}
@@ -175,21 +175,21 @@ ul{list-style: none;padding: 0;margin: 0;}
 .buy-footer1 {position: fixed;bottom: 0;left: 0;height: 50px;background-color: #f0f0f0;width: 100%;padding: 0;}
 .price{padding: 4px 0;}
 .price small{color: #666;}
-.buy-footer1:after {position: absolute;top: 0;left: 0;content: '';height: 1px;width: 100%;background-color: #fe4264;-webkit-transform: scaleY(.5);transform: scaleY(.5);}
+.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;}
 .quanxuan {position: relative;}
 .tb-clearing tr td:nth-of-type(2) {min-width: 2.5em;}
 .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: #e4004d;text-align: center;padding-top: 5px;}
+.count_price_box {color: #55c0dc;text-align: center;padding-top: 5px;}
 .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);}
 .mt-mr-che {margin:2.5em .3em 0 0;}
-.add_gwc{padding: 18px 25px;border-radius: 0;background-color: #fe4264 !important;color: #fff;border: 0;}
+.add_gwc{padding: 18px 25px;border-radius: 0;background-color:#55c0dc !important;color: #fff;border: 0;}
 .add_gwc1 {padding: 18px 25px;border-radius: 0;background-color: #ababab;color: #fff;border: 0;}
-.add_gwc:active{color: #fff;background-color:#ff1b68;}
+.add_gwc:active{color: #fff;background-color#55c0dc;}
 #pullrefresh_chanpin_list .mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -115px;}
 #pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 5px;}
 #pullrefresh_chanpin_list .shop-price {padding:0;text-align: left;}
@@ -206,9 +206,9 @@ ul{list-style: none;padding: 0;margin: 0;}
 .more {border-bottom: .6em solid #f0f0f0;}
 .ipt-yhq {width: 38% !important;height: 30px !important;padding: 0 !important;margin-bottom: 0 !important;text-align: center;}
 .how_to_get{color: #666;float: right;padding: 4px 0;}
-.how_to_get .d_price{color:#e4004d;padding-left: 3px;}
+.how_to_get .d_price{color:#55c0dc;padding-left: 3px;}
 .how_to_get .d_price:before{content: '妤�';}
-.cl-red{color: #e4004d !important;}
+.cl-red{color: #55c0dc !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;}
@@ -236,20 +236,20 @@ ul{list-style: none;padding: 0;margin: 0;}
 .my-table-order tr td:last-child{padding-right: 10px;}
 
 .icon-allorder{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
-.icon-allorder.mui-active{color:#fe4264 !important;border-bottom: 2px solid #fe4264;}
+.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-topay.mui-active{color:#fe4264 !important;border-bottom: 2px solid #fe4264;}
+.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{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:#fe4264 !important;border-bottom: 2px solid #fe4264;}
+.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{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 
-.icon-delivery.mui-active{color:#fe4264 !important;border-bottom: 2px solid #fe4264;}
+.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{padding-top: 2px;position: relative;border-bottom: 2px solid rgba(0,0,0,0);}
 .mr-5{margin-right: 5px;}
@@ -260,7 +260,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 .my-scroll-order>li:first-child{border-top:8px solid #f0f0f0;}
 .vip-tt {position: relative;line-height: 0;}
 .vip-tt>img {width: 100%;}
-.tx {position: absolute;left:1em;top: 50%;width:80px;height:80px;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color:#fe4264;padding: 4px;}
+.tx {position: absolute;left:1em;top: 50%;width:80px;height:80px;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color:#55c0dc;padding: 4px;}
 .tx>img {width: 100%;border-radius: 50%;}
 .nikname {position: absolute;left: 30%;width:68%;top: 50%;color: #fff;-webkit-transform: translateY(-52%);transform: translateY(-52%);line-height: 1.5;}
 .more_vip{}
@@ -276,7 +276,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 .daili-2wm-box{position: absolute;width: 100%;left: 0;top:0;}
 .user-2wm{width: 50%;margin:30px auto;}
 .user-2wm img{width: 100%;}
-.user-2wm-dic{width: 75%;margin: 0 auto;border: 1px solid #e4004d;border-radius: 5px;padding: 10px;color: #444;background: #f0f1ec;}
+.user-2wm-dic{width: 75%;margin: 0 auto;border: 1px solid #55c0dc;border-radius: 5px;padding: 10px;color: #444;background: #f0f1ec;}
 .btn-share-box{width: 75%;margin:20px auto;}
 .my-pull {
     font-weight: 700;
@@ -292,7 +292,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 }
 .my-badge-blue{color:#007aff !important;}
 .my-badge-green{color:#4cd964 !important;}
-.my-badge-red{color: #dd524d !important;}
+.my-badge-red{color: #55c0dc !important;}
 .my-badge-white{color: #fff !important;}
 .btn-fenxiao-weixin-pay{width: 50% !important;}
 .my-table-view1{padding: 0 0 0 0 !important;}
@@ -300,7 +300,7 @@ ul{list-style: none;padding: 0;margin: 0;}
 #chanpin-slider .tit{color: #404040;font-size: 16px;line-height: .9;padding:0 0 2px 0;}
 #chanpin-slider .dic{color: #898989;font-size: 12px;padding:0 0 2px 0;}
 #chanpin-slider .price_box{padding: 8px 0 12px 0;}
-#chanpin-slider .dic-bt{color: #fff;border-radius:10px;padding: 3px 7px;font-size: 12px; background-color: #ff718f;}
+#chanpin-slider .dic-bt{color: #fff;border-radius:10px;padding: 3px 7px;font-size: 12px; background-color:#55c0dc;}
 #chanpin-slider .mui-slider-group .mui-slider-item img {width: 45%;float: right;}
 .chanpin-cell{position:absolute;right:30%;top:50%;width:60%;height:130px;-webkit-transform: translateY(-50%);transform: translateY(-50%);}
 .chanpin-cell>div{position: relative;}
@@ -328,19 +328,19 @@ ul{list-style: none;padding: 0;margin: 0;}
 .icon-gouwuche .mui-badge{display:none;}
 .my-btn-block {font-size: 18px;display: block;width: 100%;padding: 6px 12px;border-radius: 4px !important;}
 
-.title1{color:#e70444;width:75px;height:25px;padding:5px 5px;}
+.title1{color:#55c0dc;width:75px;height:25px;padding:5px 5px;}
 .font_text_yahei{font-family: "Microsoft YaHei" ! important;}
 .juli_span{color:#666;}
 article, section, time, aside {display: block;}
 .point-time {content: "";position: absolute;width: 13px;height: 13px;top: 3px;left: 20px;background: #1c87bf;margin-left: -4px;border-radius: 50%;}
-.point-red {background-color: #e70444;}
+.point-red {background-color: #55c0dc;}
 .content {width: 100%;margin: 10px auto;}
 .content article {position: relative;}
 .content article section {padding: 0 0 7px;position: relative;}
-.content article section:before {content: "";width: 1px;top: 16px;bottom: -17px;left: 22px;background: #e70444;position: absolute;}
+.content article section:before {content: "";width: 1px;top: 16px;bottom: -17px;left: 22px;background: #55c0dc;position: absolute;}
 .content article section:last-child:before {bottom:0;}
 .content article section time {display: block;}
-.content article section time > span {display: block;margin-left: 45px;color:#e70444;}
+.content article section time > span {display: block;margin-left: 45px;color:#55c0dc;}
 .content article section aside {color: #3a3a38;margin-left:45px;margin-right: 5px;}
 .content article section aside p{margin-bottom: 0;font-size:13px;}
 .content article section aside .things{color:#222;margin-top: 5px;}

+ 0 - 1
watero-wechat-web/src/main/webapp/common/shop/css/vip_center.css

@@ -62,5 +62,4 @@
     right: 28%;
     padding: 1px 5px;
     color: #fff;
-    background-color: rgba(0,0,0,.15);
 }

BIN
watero-wechat-web/src/main/webapp/common/shop/images/coupon_dsc.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/3.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/4.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/404.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/5.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/6.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/7.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/8.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/alert-bg1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/alert-bg2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/all1_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/all_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/allorder_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-2.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/banner-51.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/banner.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/banner_4.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/bg_2wm.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/bg_gz_2wm.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-guize.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-guize1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jilu.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jilu1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-jixu.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-share.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-wheel-bg.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/btn-wheel-bg1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/c_checkbox_off.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/c_checkbox_on.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/camera.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/camera.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-3.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-4.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-5.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-6.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-details.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-list-1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-load.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/chanpin-load.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/contac_us.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/corner_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/coupon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-2.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-3.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/cp-4.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/daili-2wm.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/daili-banner.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/daili_bg.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/default_qrcode.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/default_watermark.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/delivery_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/delivery_icon1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/dl_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/empty_cart.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/fenxiao-banner.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/firstCare.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/five.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/four.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu3.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/fx_menu4.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/guanggao-1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/guanggao.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/guize-bg.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/guize-bg1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/i-want-daili.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/image-12.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/image-7.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/index-load.gif


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/index.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/jianjie_content.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/jiao1.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/jiao2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/jifen-shop.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/left_1_51.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/line-color.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/logo.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/logo_head.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_1.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_2.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/member_photo-bg_3.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/myorder_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/naiji_xuanchuan.jpg


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/no_yhq.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/noused1_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/noused_icon.png


BIN
watero-wechat-web/src/main/webapp/common/shop/images/shop/one.png


+ 0 - 0
watero-wechat-web/src/main/webapp/common/shop/images/shop/overdue1_icon.png


Some files were not shown because too many files changed in this diff