缺陷

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -1407,20 +1407,24 @@ var SuperSearch = {
 	},
 	//全文搜索
 	allSearch: function(){
-	    $("#supersearchPage #search_all").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("全文搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
 	    //记录
 	    if(localStorage){
-	        //localStorage.selectType="allSearch";
+	        localStorage.selectType="all";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();
 	},
 	//标题搜索
 	titleSearch: function(){
-	    $("#supersearchPage #search_title").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("标题搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 	    //记录
 	    if(localStorage){
-	       // localStorage.selectType="titleSearch";
+	       localStorage.selectType="title";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -324,14 +324,23 @@
 					    $("#bottombox").css("position","absolute");
 					}
 			   	});
-				if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
-					$(".email_check_ok").show();
-					$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
-					finishEmailVerity = true;
-				} else if (email_lastInput != "") {
-					$(".email_check_ok").show();
-					$(".email_input").val(email_lastInput);
-					finishEmailVerity = true;
+				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+					$(".email_check_ok").hide();
+					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
+					$(".email_input").parents('div.form-control').siblings().slideDown();
+					var lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
+					//clearInterval(r)
+					//sendemailTimer(lstimes);
+				}else {
+					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
+						$(".email_check_ok").show();
+						$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
+						finishEmailVerity = true;
+					} else if (email_lastInput != "") {
+						$(".email_check_ok").show();
+						$(".email_input").val(email_lastInput);
+						finishEmailVerity = true;
+					}
 				}
 				if (email_lastVerity > 0) {
 					sendemailTimer(email_lastVerity);
@@ -665,10 +674,14 @@
 			function sendemailTimer(t) {
 				$(".sendCode").text("" + t + "s");
 				$(".sendCode").attr("disabled", "disabled");
+				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r = setInterval(function() {
 					t--;
 					$(".sendCode").text("" + t + "s")
+					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if (t <= 0) {
+						sessionStorage.removeItem("send_code_"+{{.T._id}});
+						sessionStorage.removeItem("send_email_"+{{.T._id}});
 						clearInterval(r)
 						$(".sendCode").text("发送验证码");
 						if (!finishEmailVerity) {

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -14,7 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}22111"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}22111111"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->

src/web/staticres/js/wxSupersearch.js

@@ -1323,20 +1323,24 @@ var SuperSearch = {
 	},
 	//全文搜索
 	allSearch: function(){
-	    $("#supersearchPage #search_all").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("全文搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
 	    //记录
 	    if(localStorage){
-	        //localStorage.selectType="allSearch";
+	        localStorage.selectType="all";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();
 	},
 	//标题搜索
 	titleSearch: function(){
-	    $("#supersearchPage #search_title").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("标题搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 	    //记录
 	    if(localStorage){
-	       // localStorage.selectType="titleSearch";
+	       localStorage.selectType="title";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -303,14 +303,23 @@
 					    $("#bottombox").css("position","absolute");
 					}
 			   	});
-				if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
-					$(".email_check_ok").show();
-					$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
-					finishEmailVerity=true;
-				}else if(email_lastInput!=""){
-					$(".email_check_ok").show();
-					$(".email_input").val(email_lastInput);
-					finishEmailVerity=true;
+				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+					$(".email_check_ok").hide();
+					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
+					$(".email_input").parents('div.form-control').siblings().slideDown();
+					var lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
+					//clearInterval(r)
+					//sendemailTimer(lstimes);
+				}else {
+					if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
+						$(".email_check_ok").show();
+						$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
+						finishEmailVerity=true;
+					}else if(email_lastInput!=""){
+						$(".email_check_ok").show();
+						$(".email_input").val(email_lastInput);
+						finishEmailVerity=true;
+					}
 				}
 				if(email_lastVerity>0){
 					sendemailTimer(email_lastVerity);
@@ -409,7 +418,6 @@
 					if(email_input.indexOf("@")>0){
 						if(email_input!=email_lastInput){
 							$(this).parents('div.form-control').siblings().slideDown();
-							console.log(email_lastVerity)
 							if(email_lastVerity>0){
 								$("#sendCode").attr("disabled", true);
 								$(".verity_input").attr("readonly",true);
@@ -504,6 +512,8 @@
 					if(verity.length==6){
 						$.post("/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
 							if(data.success){
+								sessionStorage.removeItem("send_code_"+{{.T._id}});
+								sessionStorage.removeItem("send_email_"+{{.T._id}});
 								finishEmailVerity=true;
 								if(readClause&&finishPhoneVerity){
 									$(".toPay").removeAttr("disabled")
@@ -616,11 +626,15 @@
 			function sendemailTimer(t){
 				$(".sendCode").text(""+t+"s");
 				$(".sendCode").attr("disabled","disabled");
+				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r=setInterval(function(){
 					t--;
 					$(".sendCode").text(""+t+"s")
+					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if(t<=0){
-						clearInterval(r)
+						sessionStorage.removeItem("send_code_"+{{.T._id}});
+						sessionStorage.removeItem("send_email_"+{{.T._id}});
+						clearInterval(r);
 						$(".sendCode").text("发送验证码");
 						if(!finishEmailVerity){
 							$(".verity_input").attr("readonly",true);

src/web/templates/weixin/search/mainSearch.html

@@ -22,7 +22,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}41"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}411"></script>
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">