Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/web/templates/weixin/historypush.html

@@ -235,6 +235,7 @@
 			$(".tab_left .time").show();
 			//地区渲染
   			mapData();
+			//
 			if(!isVipSub){
 				$(".normal_set").show();
 				$(".tab_left .area").hide();
@@ -246,15 +247,9 @@
 				if(!firstPage.length>0 && !haskey){
 					if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
 						sessionStorage.removeItem("keysetindexToHistory");
-						if(sessionStorage.keysetindexToHistory=="1"){
-							wx.ready(function () {
-								wx.closeWindow();
-							});
-						}else{
-							setTimeout(function(){
-								wx.closeWindow();
-							},2000);
-						}
+						setTimeout(function(){
+							wx.closeWindow();
+						},2000);
 						return
 					}
 					history.pushState({},"","");
@@ -794,7 +789,7 @@
 		}
 		._header{
 			position: fixed;
-			top: 0;
+			top: 0.02rem;
 			width: 100%;
 			z-index: 999;
 		}

src/web/templates/weixin/vipsubscribe/vip_seniorset.html

@@ -140,6 +140,7 @@
 					parentLi.children(".turn-on").hide();
 				}else{
 					if(s_email == ""){
+						$("input#email").focus();
 						emailSetModalShow();
 						return;
 					}else{
@@ -150,10 +151,14 @@
 				saveData();
 			});
 			$(".emailset>img").click(function(){
+				$("input#email").focus();
 				emailSetModalShow();
 			});
 			$("#sure").click(function(){
-				var thisValue = $("#email").val();
+				var thisValue = $.trim($("#email").val());
+				if(thisValue==""){
+					return
+				}
 				var szReg=/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|-|\-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/; 
 				if(!szReg.test(thisValue)){
 					$(".error").removeClass("hide");
@@ -201,6 +206,7 @@
 				"matchtype":1,
 				"email": $("#email").val(),
 			};
+			s_email = $("#email").val();
 			if($("#matchType li:eq(2)").hasClass("checked")){
 				param["matchtype"] = 2;
 			}

src/web/templates/weixin/wxkeyset/index.html

@@ -703,6 +703,7 @@ function saveSeniorset(r){
 }
 //
 function tointroducepage(){
+	sessionStorage.removeItem("keysetindexToHistory");
 	window.location.replace("/front/vipsubscribe/introducePage");
 }