活动修改

aiberle/clearing.html

@@ -132,7 +132,7 @@ var yhq_id='';			mui.ready(function() {
 											console.log("有优惠券" + dt.data.couponItems.length + "张")
 											var str='';
 											mui.each(dt.data.couponItems,function(){
-												str+= '<li class="my-table-view-cell" style="opacity:.5"><div class="mui-table"><div class="mui-table-cell table-middle mui-col-xs-11">优惠券：¥'+ ((this.couponReduce)/100).toFixed(2)+'<h6>有效期至：'+this.couponUseEndDate+'</h6></div><div class="mui-table-cell table-middle mui-col-xs-1"><input name="checkbox" val="'+(this.couponReduce/100).toFixed(2)+'" type="checkbox" class="mui-pull-left" id="'+this.couponItemId+'"/></div></div></li>';
+												str+= '<li class="my-table-view-cell" style="opacity:.5"><div class="mui-table"><div class="mui-table-cell table-middle mui-col-xs-11">'+ this.couponName +'：¥'+ ((this.couponReduce)/100).toFixed(2)+'<h6>有效期至：'+this.couponUseEndDate+'</h6></div><div class="mui-table-cell table-middle mui-col-xs-1"><input name="checkbox" val="'+(this.couponReduce/100).toFixed(2)+'" type="checkbox" class="mui-pull-left" id="'+this.couponItemId+'"/></div></div></li>';
 											});
 											$("body").append('<div class="my-picker"><ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no" style="padding: 20px 0 30px 0;overflow: scroll;max-height: 400px;">' + str + '</ul><button class="mui-btn my-btn-block my-btn-buy-know" disabled="disabled">确认使用</button></div>');
 										}
@@ -257,132 +257,133 @@ var yhq_id='';			mui.ready(function() {
 	});
 	// 去支付
 	$(document).on('tap', '#go-pay', function() {
+        
+			var remark = $("#textarea").val();
+			var ch_en_num = /^[A-Za-z0-9 _\[\]\【\】\｛\｝\{\}\(\)\（\）\《\》\<\>\,\，\.\。\、\！\!\~\·\@\#\￥\$\%\^\…\&\—\：\:\；\;\‘\’\'\'\"\"\“\”\？\?\-\=\|\*\+\-\u4e00-\u9fa5]{0,100}$/;
+			if(ch_en_num.test(remark)){
+				console.log("备注验证通过")
+			}else{
+				mui.alert("备注格式错误！仅支持中/英文,数字,普通符号");
+				return false;
+			}
+			if(wechatAddr.status) {
+				if(isPay) {
 
-		var remark = $("#textarea").val();
-		var ch_en_num = /^[A-Za-z0-9 _\[\]\【\】\｛\｝\{\}\(\)\（\）\《\》\<\>\,\，\.\。\、\！\!\~\·\@\#\￥\$\%\^\…\&\—\：\:\；\;\‘\’\'\'\"\"\“\”\？\?\-\=\|\*\+\-\u4e00-\u9fa5]{0,100}$/;
-		if(ch_en_num.test(remark)){
-			console.log("备注验证通过")
-		}else{
-			mui.alert("备注格式错误！仅支持中/英文,数字,普通符号");
-			return false;
-		}
-		if(wechatAddr.status) {
-			if(isPay) {
-
-				isPay = false; // 锁定请求按钮
+					isPay = false; // 锁定请求按钮
 
-				/* 组装数据 */
-				var dataArgs = {
-					"orderAddressInfo": wechatAddr.detailInfo,
-					"orderAddressPostNum": wechatAddr.postalCode,
-					"orderAddressMoblie": wechatAddr.userTel,
-					"orderAddressName": wechatAddr.userName,
-					"cartIdStr": cartIdStr,
-					"orderIntegralNum": 0,
-					"orderUserRemark": remark,
-					"couponId": yhq_id,
-					"balancePayAmount": 0
-				};
+					/* 组装数据 */
+					var dataArgs = {
+						"orderAddressInfo": wechatAddr.detailInfo,
+						"orderAddressPostNum": wechatAddr.postalCode,
+						"orderAddressMoblie": wechatAddr.userTel,
+						"orderAddressName": wechatAddr.userName,
+						"cartIdStr": cartIdStr,
+						"orderIntegralNum": 0,
+						"orderUserRemark": remark,
+						"couponId": yhq_id,
+						"balancePayAmount": 0
+					};
 
-				$.ajax(base_path+'/wechat/order/pay', { // 提交订单,准备支付
-					data: dataArgs,
-					dataType: 'json',
-					type: 'POST',
-					xhrFields: {
-						withCredentials: true
-					},
-					crossDomain: true,
-					timeout: 15000,
-					success: function(dt) {
-//						layer.closeAll();
+					$.ajax(base_path+'/wechat/order/pay', { // 提交订单,准备支付
+						data: dataArgs,
+						dataType: 'json',
+						type: 'POST',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						timeout: 15000,
+						success: function(dt) {
+	//						layer.closeAll();
 
-						//mui.alert(dt.resultCode=="500");
-						if(dt.resultCode == "500") {
-							mui.alert(dt.message);
-							isPay = true;
-							return;
-						};
-						if(dt.data.info == "isOK") {
-							location.href = 'pay-win.html?orderId=' + dt.data.orderId + "&dates=" + new Date().getTime();
-							return;
-						};
-						var orderId=dt.data.orderId;
-						if(dt.status) {
-							var str = dt.data.info;
-							var obj = JSON.parse("{" + str + "}");
-							WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-								//console.log(res)
-								if(res.err_msg == 'get_brand_wcpay_request:ok') {
-									$.ajax(base_path + '/wechat/order/checkOrderPaySuccess?dates=' + new Date().getTime(), {
-												data: {
-													"orderId": orderId
-												},
-												dataType: 'json',
-												xhrFields: {
-													withCredentials: true
-												},
-												crossDomain: true,
-												type: 'get',
-												timeout: 15000,
-												success: function(dataobj) {
-													if(dataobj.isRedirect) {
-														location.href = dataobj.redirectURL;
-													} else {
-														if(dataobj.status == true) { // 支付成功
-															location.href = "pay-win.html?orderId=" + orderId + "&dates=" + new Date().getTime();
+							//mui.alert(dt.resultCode=="500");
+							if(dt.resultCode == "500") {
+								mui.alert(dt.message);
+								isPay = true;
+								return;
+							};
+							if(dt.data.info == "isOK") {
+								location.href = 'pay-win.html?orderId=' + dt.data.orderId + "&dates=" + new Date().getTime();
+								return;
+							};
+							var orderId=dt.data.orderId;
+							if(dt.status) {
+								var str = dt.data.info;
+								var obj = JSON.parse("{" + str + "}");
+								WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+									//console.log(res)
+									if(res.err_msg == 'get_brand_wcpay_request:ok') {
+										$.ajax(base_path + '/wechat/order/checkOrderPaySuccess?dates=' + new Date().getTime(), {
+													data: {
+														"orderId": orderId
+													},
+													dataType: 'json',
+													xhrFields: {
+														withCredentials: true
+													},
+													crossDomain: true,
+													type: 'get',
+													timeout: 15000,
+													success: function(dataobj) {
+														if(dataobj.isRedirect) {
+															location.href = dataobj.redirectURL;
 														} else {
-															location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
+															if(dataobj.status == true) { // 支付成功
+																location.href = "pay-win.html?orderId=" + orderId + "&dates=" + new Date().getTime();
+															} else {
+																location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
+															}
 														}
+													},
+													error: function(xhr, type, errorThrown) {
+														console.log(xhr);
+														isPay = true;
+														mui.alert("支付失败!网络错误");
 													}
-												},
-												error: function(xhr, type, errorThrown) {
-													console.log(xhr);
-													isPay = true;
-													mui.alert("支付失败!网络错误");
-												}
-											});
-//									var orderIds = {
-//										"orderId": dt.data.orderId
-//									};
-//									var url =base_path+"/wechat/order/checkOrderPaySuccess";
-//									$.getJSON(url, {
-//										"s": new Date().getTime(),
-//										"orderId": dt.data.orderId
-//									}, function(data) {
-//										if(data.status == true) { // 支付成功
-//											location.href = "pay-win.html?orderId=" + orderIds.orderId + "&dates=" + new Date().getTime();
-//										} else {
-//											setTimeout("checkOrderStatus('" + dt.data.orderId + "')", 1000);
-//										}
-//									});
-								} else {
-									isPay = true;
-									mui.alert("支付失败!请稍后重试!", function() {
-										location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
-									});
-								}
-							});
-						} else {
+												});
+	//									var orderIds = {
+	//										"orderId": dt.data.orderId
+	//									};
+	//									var url =base_path+"/wechat/order/checkOrderPaySuccess";
+	//									$.getJSON(url, {
+	//										"s": new Date().getTime(),
+	//										"orderId": dt.data.orderId
+	//									}, function(data) {
+	//										if(data.status == true) { // 支付成功
+	//											location.href = "pay-win.html?orderId=" + orderIds.orderId + "&dates=" + new Date().getTime();
+	//										} else {
+	//											setTimeout("checkOrderStatus('" + dt.data.orderId + "')", 1000);
+	//										}
+	//									});
+									} else {
+										isPay = true;
+										mui.alert("支付失败!请稍后重试!", function() {
+											location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
+										});
+									}
+								});
+							} else {
+								isPay = true;
+								mui.alert(dt.message);
+								location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
+							}
+						},
+						error: function(xhr, type, errorThrown) {
 							isPay = true;
-							mui.alert(dt.message);
-							location.href = "order-details.html?orderId=" + orderId + "&dates=" + new Date().getTime(); // 前往订单详情
+	//						layer.closeAll();
+							mui.alert("您的网络异常，请刷新重试!");
+							return;
 						}
-					},
-					error: function(xhr, type, errorThrown) {
-						isPay = true;
-//						layer.closeAll();
-						mui.alert("您的网络异常，请刷新重试!");
-						return;
-					}
-				});
+					});
+				} else {
+					mui.alert("正在请求支付中~~请稍后!");
+					return;
+				}
 			} else {
-				mui.alert("正在请求支付中~~请稍后!");
+				mui.alert("请选择收货地址!");
 				return;
 			}
-		} else {
-			mui.alert("请选择收货地址!");
-			return;
-		}
+     
 	});
 	//实时监听文本框字数
 	document.getElementById("textarea").addEventListener("input", function() {

aiberle/coupon_receive.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>优惠券领取</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
+		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
+		<link rel="stylesheet" type="text/css" href="css/main.css" />
+		<style>
+		
+		</style>
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+		<script>
+			//屏蔽分享
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
+		</script>
+	</head>
+	<body>
+	<div class="loading-bg">
+			<div class="mui-loading">
+				<div class="mui-spinner">
+				</div>
+				&nbsp;&nbsp;加载中...
+			</div>
+		</div>
+	
+	<div class="mui-content">
+		<!--下拉刷新容器-->
+		<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper">
+			<div class="mui-scroll">
+				<!--数据列表-->
+				<ul class="my-yhq-list">
+						
+				</ul>
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript" src="js/mui.min.js"></script>
+	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
+	<script type="text/javascript" src="js/main.js"></script>
+	<script>
+	
+	var couponId = getParam("couponId");
+	
+	mui.ready(function() {
+       $.ajax( base_path + '/wechat/coupon/recCouRen?dates=' + new Date().getTime(),{
+                data :{
+                    couponId : couponId
+                },
+                dataType:'json',
+                type:'post',
+                xhrFields: {
+					withCredentials: true
+				},
+				crossDomain: true,
+                timeout:15000,
+                success:function(dt){
+                	console.log(dt);
+                	if(dt.isRedirect) {
+                		location.href = dt.redirectURL;
+            		} else {
+            			if(dt.status){
+            				 mui.alert('您已获得499元"以旧换新"现金券，该券仅支持购买W6净水机，点击确定进入微商城使用！','温馨提示',function () {
+            				 	location.href = 'pro-details.html?productId=39';
+            				 });
+            			}else{
+            				 mui.alert(dt.message,'温馨提示',function () {
+            				 	location.href = 'index.html';
+            				 });
+            			}
+                    }
+                },
+                error:function(xhr,type,errorThrown){
+                    //异常处理；
+                    console.log(xhr);
+                }
+            });
+		console.log("页面加载完毕")
+		document.querySelector('.loading-bg').style.display = 'none';
+
+	});
+	</script>
+	</body>
+</html>

aiberle/js/main.js

@@ -5,11 +5,10 @@ window.addEventListener('pageshow', function(e) {
 	}
 });
 var domanUrl = "//" + window.location.host;
-var base_path = "//h5.iamberry.com/iamberry";
 
+var base_path = "//h5.iamberry.com/iamberry";
 var web_url_path = "//h5.iamberry.com";
 
-//var base_path = "/iamberry";
 
 //ajax loading
 $(window).ajaxStart(function(){

aiberle/my-center.html

@@ -102,7 +102,7 @@
 						</div>
 					</div>
 				</li>
-				<li class="mui-table-view-cell" >
+				<li class="mui-table-view-cell" href="coupon_list.html" >
 					<!--href="coupon_list.html"-->
 					<div class="mui-table">
 						<div class="mui-table-cell mui-col-xs-5 table-middle">

aiberle/old-for-new.html

@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="utf-8">
+		<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">
+		<title>Aiberle以旧换新</title>
+		<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/icons-extra.css" />
+		<link rel="stylesheet" type="text/css" href="css/main.css" />
+		<style>
+			.pro-select-color{padding: 3px 0;background: #fff;border: 1px solid rgba(0,0,0,.1); color: #999;border-radius: 5px;margin-right: 8px;margin-bottom: 15px; display: inline-block;width: 46%;text-align: center;font-size: 14px;}
+			.pro-select-color.active{background: #737272;color: #fff;}
+			.mui-control-content img{display: block;max-width: 100%;}
+			.return {position: fixed;right: 10px;bottom: 140px;background: rgba(0, 0, 0, .1);padding: 12px;border-radius: 50%;height: 50px;width: 50px;text-align: center;opacity: .9;color: #333;display: none;}	
+			.my-picker {max-height: 100%;background-color: rgba(0, 0, 0, .5);}
+			.my-btn-receive {width: 100%;border-radius: 0;bottom: 0;height: 50px;line-height: 50px;text-align: center;font-size: 1.1rem; border: 0;position: fixed;right: 0;background: #f1443c;color: #fff;}
+			.mui-icon-extra-sweep{position: absolute;right: 0;top: 0;padding: 8px;}
+			.oldNew-title{position: relative;font-size: 1rem;font-weight: bold;padding-left: 15px;margin: 10px 0;}
+			.oldNew-title:after{content:''; position: absolute;left: 3px;top: 8px;width: 6px;height: 6px;border-radius: 6px;background: #f00;}
+			.oldNew-ul{border: 1px solid rgba(0,0,0,.1);border-radius: 10px;padding: 10px;font-size: .6rem;margin-bottom: 10px;color: #666;}
+			.oldNew-ul .tt{color: #333;font-size: .8rem;font-weight: bold;padding: 4px 0;}
+			.oldNew-ul li{margin: 3px 0;}
+			.link-updown{color: #666;font-size: .7rem;padding: 5px;}
+			.link-updown .mui-icon{font-size: 1.2rem;}
+			.box-content{height: 87px;overflow: hidden;}
+			.mui-input{font-size: .7rem;}
+			#ipt-scan::-webkit-input-placeholder{color: #999;}
+		</style>
+		<script>
+			//屏蔽分享
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
+		</script>
+	</head>
+
+	<body>
+		<footer class="mui-bar mui-bar-tab" style="box-shadow: 0 0 0 0;">
+			<ul class="mui-table-view mui-table-view-striped mui-table-view-condensed my-grid-view-no">
+				<li class="mui-table-view-cell">
+					<div class="my-btn-receive" style="background-color: #f2312f;">立即领取</div>
+				</li>
+			</ul>
+		</footer>
+		<div class="mui-content">
+			<div class="banner-box-pro">
+			<div id="slider" class="mui-slider">
+				<div class="mui-slider-group mui-slider-loop">
+					<!-- 额外增加的一个节点(循环轮播：第一个节点是最后一张轮播) -->
+					<div class="mui-slider-item mui-slider-item-duplicate">
+						<a>
+							<img src="images/oldfornew.jpeg">
+						</a>
+					</div>
+					<!-- 第一张 -->
+					<div class="mui-slider-item">
+						<a>
+							<img src="images/oldfornew.jpeg">
+						</a>
+					</div>
+					<!-- 额外增加的一个节点(循环轮播：最后一个节点是第一张轮播) -->
+					<div class="mui-slider-item mui-slider-item-duplicate">
+						<a>
+							<img src="images/oldfornew.jpeg">
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-indicator">
+					<div class="mui-indicator mui-active" style="display: none;"></div>
+				</div>
+			</div>
+			</div>
+		   <div class="mui-control-content mui-active" id="item1">
+			    <div class="mui-content-padded">
+			   <div class="oldNew-title">活动详情</div>
+			   <div class="box-content"> 
+			   <ul class="oldNew-ul">
+				   <li class="tt">爱贝源冲奶机以旧换新活动介绍</li>
+				   <li>1、凡是爱贝源冲奶机的客户，不论购买渠道或冲奶机好坏都可参加本次活动。</li>
+				   <li>2、用户将冲奶机按回收地址寄回。在活动页面提交快递单号，即刻发放799元折旧代金券，寄回运费统一以45元代金券形式，也发放至客户的aiberle微信公众号会员账户。</li>
+				   <li>3、代金券仅限在aiberle微商城购买aiberle桌面净水机产品可直接等额抵用现金。</li>
+			   </ul>
+			   <ul class="oldNew-ul">
+				   <li class="tt">代金券使用规则</li>
+				   <li>1、折旧价值以代金券形式返还到用户账户，可在“会员中心-券包”里查看。</li>
+				   <li>2、活动时间：3月15日-4月15日，代金券超过活动期限未使用，将自动失效。</li>
+				   <li>3、用户使用抵用券购机，发货前退款，返还付款，抵用券退至该用户账号；发货后取消订单，抵用券自动作废，仅退款差额部分。</li>
+			   </ul>
+			   </div>
+			    <div class="mui-text-center"><span class="link-updown">展开<span class="mui-icon mui-icon-arrowdown"></span></span></div>
+			   <div class="oldNew-title">物流单号</div>
+				   <div class="mui-input-row">
+					   <input type="text" class="mui-input" data-input-password="3" placeholder="请输入寄回冲奶机的物流单号或扫描条形码" id="ipt-scan"><span class="mui-icon-extra mui-icon-extra-sweep mui-active"></span>
+					</div>
+				<p>
+					提示：填写单号，即可领取799元的代金券和45元运费代金券，机器无法寄回的用户，请联系客服。
+				</p>
+			   </div>
+		   </div>
+		</div>
+		<div class="return">
+			<span onClick="gotoTop(0.1,10);return false;" class="mui-icon-extra mui-icon-extra-top"></span>
+		</div>
+		<!-- 加载ing -->
+		<div class="loading covers">
+			<div class="loading-bj"></div>
+			<p>加载中...</p>
+		</div>
+		<!-- 加载ing END -->
+		<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/wechat-utils-1.0.js"></script> 
+		<script>
+			window.addEventListener('pageshow', function(e) {
+				// 通过persisted属性判断是否存在 BF Cache
+				if(e.persisted) {
+					location.reload();
+				}
+			});
+			mui.ready(function() {
+				var slider = mui("#slider");
+				slider.slider({
+					interval: 0
+				});
+				$(".loading").hide().css("opacity", "0");
+			});
+
+			//立即领取
+			$(document).on('tap', '.my-btn-receive', function() {
+				if($("#ipt-scan").val()!=''){
+				$.ajax( base_path + '/wechat/coupon/recCouRen?dates=' + new Date().getTime(),{
+                data :{
+                    couponId : 20000
+                },
+                dataType:'json',
+                type:'post',
+                xhrFields: {
+					withCredentials: true
+				},
+				crossDomain: true,
+                timeout:15000,
+                success:function(dt){
+                	console.log(dt);
+                	if(dt.isRedirect) {
+                		location.href = dt.redirectURL;
+            		} else {
+            			if(dt.status){
+            				 mui.alert('领取成功！','提示',function () {
+            				 	location.href = 'pro-details.html?productId=39';
+            				 });
+            			}else{
+            				 mui.alert(dt.message,'提示',function () {
+            				 	location.href = 'index.html';
+            				 });
+            			}
+                    }
+                },
+                error:function(xhr,type,errorThrown){
+                    //异常处理；
+                    console.log(xhr);
+					mui.alert("领取失败！网络错误");	
+                }
+            });
+			}else{
+				mui.alert("请输入寄回冲奶机的物流单号！")
+			}
+			});
+			//扫码
+			$(document).on('tap', '#ipt-scan', function() {
+				wx.scanQRCode({
+					needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+					scanType: ["barCode"], // 可以指定扫二维码qrCode还是一维码，默认二者都有
+					success: function(res) {
+						var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+						var serial = result.split(",");
+						$("#ipt-scan").text(serial[serial.length-1]);
+					}
+				});
+			});
+			//绑定滚动条事件
+			$(window).on("scroll", function() {
+				//向下滚动距离大于180像素显示返回顶部，否则隐藏
+				if($(window).scrollTop() > 180) {
+					$(".return").show();
+				} else {
+					$(".return").hide();
+				}
+			});
+			$(document).on('tap', '.link-updown', function() {
+				if($(this).find(".mui-icon-arrowup").length>0){
+					$(".box-content").css("height","87px");
+					$(this).html('展开<span class="mui-icon mui-icon-arrowdown"></span>');
+				}else{
+					$(".box-content").css("height","auto");
+					$(this).html('收起<span class="mui-icon mui-icon-arrowup"></span>');
+				}
+			});
+		</script>
+	</body>
+
+</html>

tooth/clearing.html

@@ -458,6 +458,8 @@
 					var beginDate = parseDate(full_sb.beginDate,"yyyy-MM-dd hh:mm:ss");
 					var endDate = parseDate(full_sb.endDate,"yyyy-MM-dd hh:mm:ss");
 					
+					var ispreferential = false;
+					
 					if(time>beginDate && time<endDate){
 						$.each(full_sb.salesActivitiesList, function() {
 							if(a>=this.salesActivitiesFull && sum==0){
@@ -465,9 +467,13 @@
 								$("#full-sub-name").text(this.salesActivitiesName);
 								$("#full-sub-count").text(accDiv(this.salesActivitiesReduction,100));
 								$("#full-sub-name").parent().parent().show();
+								ispreferential = true;
 								return false;
 							}
 						});
+						if(ispreferential){
+							$("#ul-youhuiquan").hide();
+						}
 						if(sum == 0){
 							return a;
 						}else{

tooth/coupon_list.html

@@ -38,7 +38,7 @@
 				}
 			});
 			var pageNumber = 0,
-				pagesize = 10;
+				pagesize = 6;
 
 			mui.init({
 				pullRefresh: {
@@ -59,7 +59,7 @@
 				++pageNumber; //每次上拉页数+1
 				$.ajax(base_path + '/wechat/coupon/couponItemList?dates=' + new Date().getTime(), {
 					data: {
-						"pageNo": pageNumber, //pageNo第几页
+						"pageNO": pageNumber, //pageNo第几页
 						"pageSize": pagesize //pageSize每页条数
 					},
 					dataType: 'json',

tooth/index-2019-03-08.html

@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>soodo上朵</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
+		<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
+		<link rel="stylesheet" type="text/css" href="css/main.css" />
+		<style>
+			.ul-content img{width: 100%;display: block;}
+		</style>
+		<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+		<script>
+			//屏蔽分享
+			document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+				WeixinJSBridge.call('hideOptionMenu');
+			});
+		</script>
+	</head>
+	<body>
+<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
+<a class="mui-tab-item">
+<span class="iconfont icon-shouye"></span>
+<span class="mui-tab-label">首页</span>
+</a>
+<a class="mui-tab-item">
+<span class="iconfont icon-liebiao"></span>
+<span class="mui-tab-label">列表</span>
+</a>
+<a class="mui-tab-item">
+<span class="iconfont icon-gouwuche"></span>
+<span class="mui-tab-label">购物车</span>
+</a>
+<a class="mui-tab-item">
+<span class="iconfont icon-huiyuan"></span>
+<span class="mui-tab-label">会员</span>
+</a>
+</footer>
+		<div class="mui-content">
+			<ul class="ul-content">
+				<li>
+					<img src="images/20190308_01.jpg" />
+				</li>
+				<li>
+					<img src="images/20190308_02.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=301">
+					<img src="images/20190308_03.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=42">
+					<img src="images/20190308_04.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=60">
+					<img src="images/20190308_05.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=76">
+					<img src="images/20190308_06.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=319">
+					<img src="images/20190308_07.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=317">
+					<img src="images/20190308_08.jpg" />
+				</li>
+				<li name="pro-details.html?colorId=310">
+					<img src="images/20190308_09.jpg" />
+				</li>
+			</ul>
+		</div>
+		<!-- 加载ing begin-->
+		<div class="loading covers">
+			<div class="loading-bj"></div>
+			<p>正在加载...</p>
+		</div>
+		<!-- 加载ing end -->
+	<script type="text/javascript" src="js/mui.min.js"></script>
+	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
+	<script type="text/javascript" src="js/main.js"></script>
+	<script type="text/javascript">
+		window.addEventListener('pageshow', function(e) {
+				// 通过persisted属性判断是否存在 BF Cache
+				if(e.persisted) {
+					location.reload();
+				}
+		});
+	mui.ready(function(){
+		$(".loading").hide().css("opacity", "0");//隐藏（正在加载...）
+	});	
+	//跳转订单详情
+	$(document).on('tap','.ul-content>li',function(){
+		console.log($(this).attr("name"))
+		if(typeof($(this).attr("name"))!="undefined"){
+			location.href=$(this).attr("name");
+		}
+	});
+	</script>
+	</body>
+</html>

tooth/index.html

@@ -17,8 +17,8 @@
 	</head>
 	<script>
 		var d = new Date().getTime(); //当前时间戳
-		if (d > 1544284800000 && d <= 1545753599000) {
-			location.href = "index-2018-12-12.html";
+		if (d > 1551283200000 && d <= 1552233599000) {
+			location.href = "index-2019-03-08.html";
 		}
 	</script>
 	<body>
@@ -192,7 +192,7 @@
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/swiper.min.js"></script>
 		<script src="js/main.js"></script>
-		<!-- <script src="js/wechat-utils-1.0.js"></script> -->
+		<script src="js/wechat-utils-1.0.js"></script>
 		<script>
 			window.addEventListener('pageshow', function(e) {
 				// 通过persisted属性判断是否存在 BF Cache
@@ -208,7 +208,7 @@
 					$("#index-top-menu>.mui-control-item:last-child,#item2").addClass("mui-active");
 				}
 				var d = new Date().getTime(); //当前时间戳
-				//弹窗提示时间为2月8日-2月22日
+				//弹窗提示时间为1月14日-2月7日
 				if (d > 1547395200000 && d < 1549900799000) {
 					if (!window.localStorage) {
 						mui.alert("您的浏览器不支持localStorage");