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

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

@@ -291,7 +291,11 @@
 				$(".pay_discount").text("￥" + shouldPay);
 				$(".pay_before").text("￥" + beforePay)
 			}
-			$(function() {            	
+			$(function() {     
+				//
+				if(sessionStorage.email_sign=="1"){
+					$(".form-control").show();
+				}
 				//返回键
 					$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
 							setTimeout(function(){
@@ -317,21 +321,32 @@
 				}
 				//软键盘弹起 
 				var oHeight = $(document).height(); //浏览器当前的高度
+				var mainHeight=$(".main").height();
+				
 				$(window).resize(function(){
 					 if($(document).height() < oHeight){
 					    $("#bottombox").css("position","static");
 					}else{
-					    $("#bottombox").css("position","absolute");
+					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				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);
@@ -533,6 +548,7 @@
 								finishEmailVerity = false;
 								//发送成功
 								sendemailTimer(60 * 5);
+								sessionStorage.email_sign="1";
 								$(".verity_input").removeAttr("readonly");;
 								$(".sendCode").attr("disabled", "disabled");
 								$(".email_input").attr("readonly", true);
@@ -550,6 +566,7 @@
 				//校验验证码
 				$(".verity_input").bind("input propertychange",function(){
 					var verity=$(this).val()
+					console.log("-------"+verity)
 					var email=$(".email_input").val().replace(/\s*/g,"");
 					if(verity.length==6){
 						$.post("/jyapp/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
@@ -615,11 +632,11 @@
 					param.pay_way = pay_way;
 					if (sessionStorage.pay_way){
 						param.pay_way=sessionStorage.pay_way;
+						pay_way=sessionStorage.pay_way;
 					}
 					param.data_spec = dataType == 2 ? "senior" : "standard";
 					param.id = {{.T._id}}
 					console.log(param.id)
-					alert(param.pay_way);
 					param.sourcePage = "weixin"
 					//先去创建预支付订单
 					/*-----------------*/
@@ -665,10 +682,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/dataExport/dataExport_previewData.html

@@ -175,6 +175,7 @@
 						$(this).addClass("active").siblings().removeClass("active");
 					})
 				})
+				$(".buttons-tab .tab-link").eq((parseInt({{.T.dataType}})-parseInt(1))).addClass("active").siblings().removeClass("active");
 				//
 				$(".app-layout-header .app-back").click(function(){
 					window.history.back();

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

@@ -468,7 +468,7 @@
 				}
 			}
 			
-			function onceMore(){
+			function onceMore(obj){
 				window.location.href="/jyapp/front/dataExport/toSieve";
 			}
 
@@ -1052,6 +1052,8 @@
 						var listhtml='';
 						for(var index in object){
 					    var obj=object[index];
+//					    var objstr="\""+JSON.stringify(obj);
+//					    objstr=objstr+"\""
 				    	count++;
 						var id = obj.id;
 						//订单编号
@@ -1130,6 +1132,7 @@
                         	iconHtml+='<div class="card-footer">'
 										//+'<a href="/jyapp/front/dataExport/toSieve" class="btn cancle">再次购买</a>'
 										+'<a onclick="onceMore()" class="btn cancle">再次购买</a>'
+										//+"<a onclick=\"onceMore("+objstr+")\" class=\"btn cancle\">再次购买</a>"
 									+'</div>'
                         }
                         //订单总数

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

@@ -279,7 +279,11 @@
 				$(".pay_discount").text("￥"+shouldPay);
 				$(".pay_before").text("￥"+beforePay)
 			}
-            $(function() {
+            $(function() {			
+            	//
+				if(sessionStorage.email_sign=="1"){
+					$(".form-control").show();
+				}
             	if(sessionStorage.index=="1"){
             		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
             		dataType=2;
@@ -300,17 +304,26 @@
 					 if($(document).height() < oHeight){
 					    $("#bottombox").css("position","static");
 					}else{
-					    $("#bottombox").css("position","absolute");
+					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				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 +422,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);
@@ -483,6 +495,7 @@
 								finishEmailVerity=false;
 								//发送成功
 								sendemailTimer(60*5);
+								sessionStorage.email_sign="1";
 								$(".verity_input").removeAttr("readonly");
 								$(".sendCode").attr("disabled","disabled");
 								$(".email_input").attr("readonly",true);
@@ -504,6 +517,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")
@@ -544,9 +559,6 @@
 					if(previewDataTime<50){
 						previewDataTime++
 						var dataType = $(".choose").find("div.active").index()+1;
-						//清除我已阅读缓存
-						sessionStorage.removeItem("readClause");
-						sessionStorage.removeItem("index");
 						window.open("/front/wx_dataExport/toPreview/"+{{.T._id}}+"?dataType="+dataType);
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);
@@ -557,11 +569,12 @@
 				$(".toPay").on("click",function(){
 					if(!finishEmailVerity||!readClause||!canpay||!finishPhoneVerity){
 						return	
-					}else{
-						//清除我已阅读缓存
-						sessionStorage.removeItem("readClause");
-						sessionStorage.removeItem("index");
 					}
+//					}else{
+//						//清除我已阅读缓存
+//						sessionStorage.removeItem("readClause");
+//						sessionStorage.removeItem("index");
+//					}
 					$(".loading_").show();
 					canpay=false;
 					
@@ -571,6 +584,7 @@
 					param.id={{.T._id}}
 					//先去创建预支付订单
 					$.post("/dataExport/wx_sacnPay/createOrder",param,function(data){
+
 						if(data.status=="y"){
 							sessionStorage.setItem("order_spec"+{{.T._id}}, dataType);
 							sessionStorage.setItem("order_email"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
@@ -610,17 +624,24 @@
 						}else{
 							EasyAlert.show("系统异常，请稍微再试","",3000);
 					}
+					//清除我已阅读缓存
+					sessionStorage.removeItem("readClause");
+					sessionStorage.removeItem("index");
 				});
 			}
 			//倒计时
 			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/dataExport/dataExport_toMyOrder.html

@@ -449,7 +449,7 @@
 			}
 			
 			function onceMore(){
-				window.location.href="/jyapp/front/dataExport/toSieve";
+				window.location.href="/front/wx_dataExport/toSieve";
 			}
 
 			function deleteOrder(id,obj) {

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"}}">