双十一期间修复的bug

aiberle/20191023.html

@@ -106,6 +106,7 @@
 				<li style="width: 48%;margin-left: 1%;">
 					<img id="xs_01" style="display: none;height: 205px;" src="images/20191024/ms_before_zp.jpg" />
 					<img id="xs_02" style="display: none;height: 205px;" class="mui-media-object to_new_xs" src="images/20191024/ms_after_zp.jpg">
+					<img id="xs_03" style="display: none;height: 205px;" src="images/20191024/ms_end_zp.jpg" />
 				</li>
 			</ul>
 			<div style="position: relative; top: -104px; left: 20%; font-weight: bold; color: #FF666B;width: 80px; height: 20px; float: left;">
@@ -437,6 +438,7 @@
 		var msStartDate = new Date(2019,10,10,00,00,00);	//秒杀
 		var msEndDate = new Date(2019,10,11,00,00,00);	//秒杀结束
 		var limitPurchaseDate = new Date(2019,10,11,11,00,00);	//限时购
+		var limitPurchaseEndDate = new Date(2019,10,11,12,00,00);	//限时购-结束
 		// var msStartDate = new Date(2019,10,01,15,42,00);	//秒杀开始 
 		// var msEndDate = new Date(2019,10,01,15,43,00);	//秒杀结束
 		// var limitPurchaseDate = new Date(2019,10,01,15,43,00);	//限时购
@@ -463,15 +465,21 @@
 				  }
 			  }
 			  
-			   var lPDjetLag = getJetLag(limitPurchaseDate);
-			   if(lPDjetLag.dateDiff > 0){
-				   $("#xs_01").show();
-				   $("#xs_02").hide();
-			   }else{
-				   $("#xs_01").hide();
-				   $("#xs_02").show();
-			   }
-			  
+			 var limitPurchaseEndDateJetlag = getJetLag(limitPurchaseEndDate);
+			 if(limitPurchaseEndDateJetlag.dateDiff < 0){
+			 				  $("#xs_01").hide();
+			 				  $("#xs_02").hide();
+			 				  $("#xs_03").show();
+			 }else{
+			 				 var lPDjetLag = getJetLag(limitPurchaseDate);
+			 				 if(lPDjetLag.dateDiff > 0){
+			 				 				   $("#xs_01").show();
+			 				 				   $("#xs_02").hide();
+			 				 }else{
+			 				 				   $("#xs_01").hide();
+			 				 				   $("#xs_02").show();
+			 				 } 
+			 }
 		}
 		$(document).ready(function() {
 			//一秒刷新一次显示时间 

watero/20191023.html

@@ -105,6 +105,7 @@
 				<li style="width: 48%;margin-left: 1%;">
 					<img id="xs_01" style="display: none;height: 205px;" src="images/20191024/ms_before_zp.jpg" />
 					<img id="xs_02" style="display: none;height: 205px;" class="mui-media-object to_new_xs" src="images/20191024/ms_after_zp.jpg">
+					<img id="xs_03" style="display: none;height: 205px;" src="images/20191024/ms_end_zp.jpg" />
 				</li>
 			</ul>
 			<div style="position: relative; top: -104px; left: 20%; font-weight: bold; color: #FF666B;width: 80px; height: 20px; float: left;">
@@ -336,6 +337,7 @@
 		var msStartDate = new Date(2019,10,10,00,00,00);	//秒杀
 		var msEndDate = new Date(2019,10,11,00,00,00);	//秒杀结束
 		var limitPurchaseDate = new Date(2019,10,11,11,00,00);	//限时购
+		var limitPurchaseEndDate = new Date(2019,10,11,12,00,00);	//限时购-结束
 		// var msStartDate = new Date(2019,09,28,18,20,00);	//秒杀
 		// var msEndDate = new Date(2019,09,28,17,21,00);	//秒杀结束
 		// var limitPurchaseDate = new Date(2019,09,28,17,00,00);	//限时购
@@ -362,15 +364,21 @@
 				  }
 			  }
 			  
-			   var lPDjetLag = getJetLag(limitPurchaseDate);
-			   if(lPDjetLag.dateDiff > 0){
-				   $("#xs_01").show();
-				   $("#xs_02").hide();
-			   }else{
-				   $("#xs_01").hide();
-				   $("#xs_02").show();
-			   }
-			  
+			  var limitPurchaseEndDateJetlag = getJetLag(limitPurchaseEndDate);
+			  if(limitPurchaseEndDateJetlag.dateDiff < 0){
+				  $("#xs_01").hide();
+				  $("#xs_02").hide();
+				  $("#xs_03").show();
+			  }else{
+				 var lPDjetLag = getJetLag(limitPurchaseDate);
+				 if(lPDjetLag.dateDiff > 0){
+				 				   $("#xs_01").show();
+				 				   $("#xs_02").hide();
+				 }else{
+				 				   $("#xs_01").hide();
+				 				   $("#xs_02").show();
+				 } 
+			  }
 		}
 		$(document).ready(function() {
 			//一秒刷新一次显示时间 

watero/index.html

@@ -49,7 +49,7 @@
 	</head>
 	<script>
 		var start = new Date(2019,9,24,8,00,00);
-		var end = new Date(2019,10,11,23,59,59);
+		var end = new Date(2019,10,10,23,59,59);
 		var d = new Date().getTime(); //当前时间戳
 		if (d > start && d <= end) {
 			location.href = "20191023.html?dates="+new Date().getTime();
@@ -303,6 +303,28 @@
 					console.log(xhr)
 				}
 			});
+			
+			//刷新用户信息
+			$.ajax(base_path + '/getUserInfo?dates=' + new Date().getTime(), {
+							dataType: 'json',
+							type: 'post',
+							timeout: 15000,
+							xhrFields: {
+								withCredentials: true
+							},
+							crossDomain: true,
+							success: function(dt) {
+								if(dt.isRedirect) {
+									//location.href = dt.redirectURL;
+								} else {
+									console.log("用户信息刷新成功");
+								}
+							},
+							error: function(xhr, type, errorThrown) {
+								console.log(xhr)
+							}
+						});
+						
 			if(marquee != '') {
 				$('body').append('<div class="marquee-show"><div></div></div>')
 			}

watero/js/page/chanpin_details.js

@@ -502,11 +502,13 @@ $(document).on('tap', '.share-dalog', function() {
 });
 //分享			
 function fenxiang() {
+	console.log(domanUrl + '/watero/wechat/images/index.jpg')
 	var url = domanUrl + "/watero/wechat/chanpin_details.html?productId=" + productId + '&colorId=' + colorId + "&shareOpenid=" + shareOpenid;
 	window.repleFlag = false;
 	window.wxFriend = {
 		"appId": "",
-		"imgUrl": domanUrl + '/watero/wechat/images/index.jpg',
+		// "imgUrl": domanUrl + '/watero/wechat/images/index.jpg',
+		"imgUrl": 'https://s.iamberry.com/watero/wechat/images/index.jpg',
 		"link": url,
 		"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
 		"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",

watero/js/page/wechat-utils-1.0.js

@@ -47,6 +47,7 @@ window.wechatAddr = {
 incoldeJSFile("//res.wx.qq.com/open/js/jweixin-1.1.0.js");
 getConfig(); // 配置JSSDK组件
 
+
 /** 获取服务器JSSDK参数配置 */
 function getConfig(){
 	$.ajax({