qihanjiao 6 lat temu
rodzic
commit
d8f5fc3d6f

+ 5 - 4
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/free_collection.html

@@ -80,7 +80,7 @@
 			var mobile = /^(13|14|15|16|17|18|19)[0-9]{9}$/; //手机号码
 			var code = /^[0-9]{4}$/; //数字
 			var validate_flag = false,
-				show_msg = '',userNick='';
+				show_msg = '',phone='';
 			//ready事件
 			mui.ready(function() {
 				if(!window.localStorage) {
@@ -133,6 +133,7 @@
 								return;
 							} else {
 								if($(this).hasClass("active")) {
+                                    phone=$("#ipt-phone").val().trim();
 									$.ajax(base_path + '/tanksgiv/send_veri?dates=' + new Date().getTime(), {
 										data: {
 											"phone": $("#ipt-phone").val().trim()
@@ -218,14 +219,14 @@
 			}
 			//提交
 			mui('body').on('tap', '#btn-confirm', function() {
-				var val = $("#code").val(),
+				var val = $("#code").val().trim(),
 					th = this;
 				if(code.test(val)) {
 					mui(th).button('loading');
 					$.ajax(base_path + '/tanksgiv/receive_coupon?dates=' + new Date().getTime(), {
 						data: {
-							"phone": $("#ipt-phone").val().trim(),
-							"code": $("#code").val().trim()
+							"phone": phone,
+							"code": val
 						},
 						dataType: 'json',
 						xhrFields: {

+ 6 - 99
watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html

@@ -264,7 +264,7 @@
 				</div>
 			</div>
 		</li>
-		<li class="mui-table-view-cell" href="//www.aiberletech.com/iamberry_wechat/after_service_watero.html">
+		<li class="mui-table-view-cell" href="/watero/view/after_service_watero.html">
 			<div class="mui-table">
 				<div class="mui-table-cell mui-col-xs-5">
 					售后服务
@@ -285,38 +285,6 @@
 			</div>
 		</li>
 	</ul>
-	<!-- <ul class="mui-table-view mui-grid-view mui-grid-9" id="my-grid-8">
-            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-                    <span class="iconfont icon-xiaxian"></span>
-                    <div class="mui-media-body">我的好友</div></a></li>
-            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-                    <span class="iconfont icon-shouhou"></span>
-                    <div class="mui-media-body">售后服务</div></a></li>
-            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-                    <span class="iconfont icon-kefu"></span>
-                    <div class="mui-media-body">客服电话</div></a></li>
-            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-                    <span class="iconfont icon-order"></span>
-                    <div class="mui-media-body">常见问答</div></a></li>
-    </ul>
-      <ul class="mui-table-view my-view-order" id="try_order_list">
-        <li class="mui-table-view-cell">
-                试用订单
-        </li>
-        <li class="mui-table-view-cell mui-media">
-            <a proid="32" style="margin-left: -20px;">
-                <span class="mui-media-object mui-pull-left wh-80">
-                    <img src="//h5.iamberry.com/iamberry/common/images/uploadimages/image/20160930/8D648B0F3CFDD6342D41_20160930142724_6071.jpg">
-                </span>
-                <div class="mui-media-body ft-12">
-                    <div>待派送</div>
-                    <div>watero水时代净水机<small>(品黑)</small></div>
-                    <div>订单号1548265444951449</div>
-                </div>
-            </a>
-            <div class="btn-box"><a proid="32" class="go_chanpin_details"></a><a class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="32">立即支付</a></div>
-        </li>
-    </ul>	 -->
 </div>
 <script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
 <script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
@@ -327,44 +295,6 @@
     mui.ready(function() {
         marquee_Show();
         getCartNum();
-        mui.each(document.querySelectorAll('#menu-lease-other .mui-control-item'), function(index, el) {
-            el.addEventListener('tap', function() {
-                switch(index) {
-                    case 0:
-                        mui.openWindow({
-                            url: base_path + '/agentWechat/agentNext'
-                        });
-                        break;
-                    case 1:
-                        mui.openWindow({
-                            url: '//www.iamberry.com/iamberry_wechat/after_service_watero.html'
-                        });
-                        break;
-                    case 2:
-                        mui.confirm('服务时间:工作日9:00-18:00', '客服电话:<a>400-8006692</a>', ['取消', '拨打'], function(e) {
-                            if(e.index == 1) {
-                                location.href = 'tel:4008006692'
-                            }
-                        });
-                        break;
-                    case 3:
-                        mui.openWindow({
-                            url: '//w.iamberry.com/watero/view/faq.html'
-                        });
-                        break;
-                    default:
-                        break
-                }
-            }, false)
-        });
-        mui.each(document.querySelectorAll('#menu-nav .mui-control-item'), function(index, el) {
-            var th=this;
-            el.addEventListener('tap', function() {
-                mui.openWindow({
-                    url: th.getAttribute("href")
-                });
-            }, false)
-        });
         mui.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
             dataType: 'json',
             type: 'post',
@@ -380,16 +310,17 @@
                         $("#userNickname").html(decodeURI(data.userNickname))
                     }
                     var userNickname = $("#userNickname").html();
-                    if(data.shareType != null && typeof(data.shareType) != "undefined" && data.shareType == 2) {
+                    if(data.userIsVip == 2) {
                         //$("#2WM").show();
                         if(userNickname != "") {
                             $("#userNickname").html(userNickname )
-							$("#vipName").html('<span class="mui-h6">VIP用户</span>');
+							$("#vipName").html('<img style="width: 12px;" src="//s.iamberry.com/watero/images/s-vip.png" /><span class="mui-h6">VIP用户</span>');
                         }
                     } else {
                         if(userNickname != "") {
                             $("#userNickname").html(userNickname)
                             $("#vipName").html('<span class="mui-h6">普通用户</span>');
+                            $(".see-rights").hide();
                         }
                     }
                     $.ajax({
@@ -463,31 +394,7 @@
             $('body').append('<div class="marquee-show"><div></div></div>')
         }
     });
-    mui('body').on('tap', '#rent_wait_deliver', function() {
-        mui.openWindow({
-            url: '/watero/view/rent/lease_order_details.html?rentStatus=-1'
-        })
-    });
-    mui('body').on('tap', '#rent_already_deliver', function() {
-        mui.openWindow({
-            url: '/watero/view/rent/lease_order_details.html?rentStatus=5'
-        })
-    });
-    mui('body').on('tap', '.icon-shebeiliebiao', function() {
-        mui.openWindow({
-            url: '/watero/view/rent/my_equipment.html'
-        })
-    });
-    mui('body').on('tap', '#xieyi-dalog', function() {
-        mui.openWindow({
-            url: '/watero/view/rent/try_xieyi.html'
-        });
-    });
-    mui('body').on('tap', '.go_try_order', function() {
-        mui.openWindow({
-            url: base_path + '/probation/try_order?orderId=' + this.getAttribute("proid")
-        })
-    });
+
     var isPay = true;
     mui('body').on('tap', '.try-btn-pay', function() {
         var th = this;
@@ -599,7 +506,7 @@
 		location.href =href;
 	});
     $(document).on('tap', '.see-rights', function() {
-        location.href ='//w.iamberry.com/watero/view/faq.html';
+        location.href ='/watero/view/member_benefits.html';
     });
 
 </script>

+ 96 - 0
watero-wechat-web/src/main/webapp/view/after_service_watero.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>售后服务</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=3, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<style>
+		.after-table-view li{position: relative;padding-left: 10px;font-size: 13px;}
+		.after-table-view li:after{content: '';position: absolute;left: 0;top:7px;width: 6px;height: 6px;border-radius: 50%;background: #63ccdf;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content" style="background: #fff;">
+	<div class="mui-content-padded">
+	<h4 class="mui-text-center" style="padding: 20px 0 10px 0;">watero净水机售后服务政策</h4>
+	<p style="font-size: 13px;text-indent: 2em;">
+		依据中国产品质量监督委员会规定的《部分商品修理更换退货
+		责任规定》、《中华人民共和国消费者权益保护法》以及《产品质
+		量法》的有关规定,为维护公司销售产品及品牌的信誉,维护消费
+		者权益,制定以下售后服务细则,消费者可通过售后服务热线:
+		400-8006692或关注对应品牌产品的微信公众号联系客服,享受
+		相关售后服务
+	</p>
+	<ul class="after-table-view">
+		<li>
+			一.	产品签收开箱检查发现配件损坏、漏发情况,经沟通核实后给予补寄,补寄运费由公司承担
+		</li>
+		<li>
+			二.	自签收之日起七天内(含)消费者可享受以下售后服务:
+			<div>
+				1. 产品未出现性能问题,消费者可无理由退货,无理由退货具体要求如下:
+				<p class="mui-h6">
+				(1)影响二次销售的情况:产品被人为损坏、包装箱破损人为导致零配件缺失、随机耗材被消耗使用均不在七天无理由退货范围内,需按各产品的 价目表 收取折旧费用(含耗材费用)运费由消费者承担
+				</p>
+				<p class="mui-h6">(2)除以上不影响二次销售情况,消费者只需承担寄回运费</p>
+				2.	发生非人为损坏的性能问题,消费者可选择退货、换货或维修,所产生的来回运费、耗材、人工费用由公司承担
+			</div>
+		</li>
+		<li>
+			三.	自签收之日起三个月内(含)发生非人为损坏的性能问题消费者可以选择换货或修理,所产生的来回运费、人工费用由公司承担。耗材滤芯不在换货范围内,换货寄回时用户需取下机器上的滤芯(可用保鲜膜封住滤芯口并放冰箱冷藏保存)
+		</li>
+		<li>
+			四.	自签收之日起至一年内(含),主机(不包含配件、耗材)发生非人为损坏的性能问题,消费者可以选择修理,所产生的来回运费、耗材、人工费用由公司承担。
+		</li>
+		<li>
+			五.	自签收之日起超出一年,消费者可以选择修理,消费都需按各产品的价目表自费修理,并自费承担来回运费
+		</li>
+		<li>
+			六.	三包有效期内,因性能故障经两次修理仍不能正常使用的核实修理记录后,免费为消费者调换同型号同规格的商品同型号同规格产品停产的,应当调换不低于原产品性能的同品牌商品
+		</li>
+		<li>
+			七.	三包有效期内,符合换货条件的,消费者不愿意换货而要求退货的,应当予以退货,并按各产品价目表的规定收取相关费用
+		</li>
+		<li>
+			八.	产品发生以下情况的,属于非保修范围,需按各产品价目表规定付费维修:
+			<div>1.已超过三包有效期限</div>
+			<div>2.不能出示发票或购买凭证</div>
+			<div>3.发票或者购买记录与实际不符,或者发票有涂改、严重污损</div>
+			<div>4.因不可抗力造成的损坏</div>
+			<div>5.未经授权的维修、误用、碰撞、疏忽、滥用、进液、事故、改动、拆动、不正确使用非本机配件;或撕毁、涂改标贴、机 身序号、防伪标记等行为</div>
+			<div>6.“三包”凭证的型号与修理产品型号不符或涂改的</div>
+			<div>7.使用环境(如电压、湿度、温度、通风条件等)不符合产品</div>
+			<div>说明书的表述,造成的损坏</div>
+		</li>
+		<li>
+			九.	消费者产品在三个月有进行过换新的,自换新日开始计算质保期限;消费者产品在三个月至一年内有维修的,维修期限从维修后签收日开始延续计算
+		</li>
+	</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
+</html>

Plik diff jest za duży
+ 6 - 6
watero-wechat-web/src/main/webapp/view/coupon_bag.html


+ 43 - 0
watero-wechat-web/src/main/webapp/view/member_benefits.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>会员权益</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/icons-extra.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+
+<div class="mui-content" style="background: #fff;">
+	<div class="mui-text-center">
+		<h3 style="padding: 70px 0 30px 0;">WaterO会员权益</h3>
+		<img style="width:80%;display: block;margin: 0 auto;" src="//s.iamberry.com/watero/images/vip-4.jpg" />
+	</div>
+</div>
+
+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        console.log("页面加载完毕")
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
+</html>

+ 37 - 0
watero-wechat-web/src/main/webapp/view/wechat_sweep.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<img width="100%" src="//s.iamberry.com/watero/images/hb-1.jpg" />
+</div>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script>
+    mui.ready(function() {
+        document.querySelector('.loading-bg').style.display = 'none';
+    });
+</script>
+</body>
+</html>