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/dropload.js

@@ -96,7 +96,7 @@
         // 窗口调整
         $win.off('resize').on('resize',function(){
 			//移动端数据导出改 --> 软键盘弹起改变窗口高度问题
-		//	return;
+			return;
 			if(win != window){
 				return;
 			}

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

@@ -312,6 +312,7 @@
 				if($("#phone_input").val()){
 					sessionStorage.setItem("order_phone"+{{.T._id}}, $("#phone_input").val().replace(/\s*/g,""));
 				}
+				sessionStorage.email_lastVerity=email_lastVerity;
 				window.location.href="/jyapp/front/staticPage/dataExport_serviceterms.html";
 			}
 			$(function() {     
@@ -370,15 +371,13 @@
 			   	});
 			   
 				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null&&sessionStorage.getItem("send_email_"+{{.T._id}})!=email_lastInput){
-					console.log("if")
 					$(".email_check_ok").hide();
 					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
 					var emver = sessionStorage.getItem("EmailVerity_"+{{.T._id}});
 					if(emver==null){
-						console.log("emver==null")
 						$(".email_input").parents('div.form-control').siblings().slideDown();
+						$("#sendCode").attr("disabled", true);
 					}else{
-						console.log("emver!=null")
 						$(".verity_input").val("");
 						$(".email_check_ok").show();
 						finishEmailVerity = true;
@@ -392,14 +391,12 @@
 					}
 					sessionStorage.removeItem("send_email_"+{{.T._id}});
 				}else {
-						console.log("else")
 					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
-						console.log("id!=null")
+						alert("if")
 						$(".email_check_ok").show();
 						$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
 						finishEmailVerity = true;
 					} else if (email_lastInput != "") {
-						console.log("email_lastInput!=null")
 //						if(sessionStorage.getItem("new_email_"+userId)!=null){
 //					   		$(".email_input").val(sessionStorage.getItem("new_email_"+userId));
 //					   		$(".verification").show();
@@ -410,6 +407,7 @@
 							$(".email_input").val(email_lastInput);
 							finishEmailVerity = true;
 //					   	}
+					//新用户(未录入邮箱用户)
 					}
 				}
 				if (email_lastVerity > 0) {
@@ -429,9 +427,16 @@
 				}
 				*/
 				if (sessionStorage.getItem("order_phone"+{{.T._id}})!=null){
-					$(".phone_check_ok").show();
-					$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
-					finishPhoneVerity=true;
+					if((/^[1][3-9][0-9]{9}$/.test(sessionStorage.getItem("order_phone"+{{.T._id}})))){
+						$(".phone_check_ok").show();
+						$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
+						finishPhoneVerity=true;
+					}else{
+						$(".phone_err_msg").show();
+						$(".phone_check_ok").hide();
+						finishPhoneVerity = false;
+						$(".toPay").attr("disabled", "disabled");
+					}
 				}else if(phone_lastInput!=""){
 					$(".phone_check_ok").show();
 					$(".phone_input").val(phone_lastInput);
@@ -545,35 +550,39 @@
 				//邮箱输入监控
 				$(".email_input").on("input propertychange", function() {
 					var email_input = $(this).val().replace(/\s*/g, "");
-					console.log("email===="+email_input);
 					if (email_input.indexOf("@") > 0) {
-						console.log(email_lastInput)
 						if (email_input != email_lastInput) {
 							$(this).parents('div.form-control').siblings().slideDown();
 							if (email_lastVerity > 0) {
-								console.log("3333")
-								$("#sendCode").attr("disabled", true);
+								$("#sendCode").prop("disabled", true);
 								//返回后验证码可输入  sessionStorage
 								if((localStorage.getItem("new_email_"+userId)!=null)&&(localStorage.getItem("new_email_"+userId)==email_input)){
-									console.log("可输入")
-									$(".verity_input").attr("readonly", false);
+									$(".verity_input").prop("readonly", false);
 								}else{
-									$(".verity_input").attr("readonly", true);
+									$(".verity_input").prop("readonly", true);
 								}
+							}else{ //app杀掉进程的 新用户  ↓
+								$(".verity_input").prop("readonly", false);
+								$("#sendCode").prop("disabled", true);
 							}
 							finishEmailVerity = false;
-							$(".toPay").attr("disabled", "disabled");
+							$(".toPay").prop("disabled", "disabled");
 							if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)) {
-								$("#sendCode").removeAttr("disabled");
+								lstimes_ = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
+								lstimes_ = lstimes_ -  Date.parse(new Date())/1000 + 60*5;
+								if (lstimes_>0) {
+									$("#sendCode").prop("disabled", true);
+								}else{
+									$("#sendCode").prop("disabled", false);
+								}
 								$(".email_err_msg").hide();
 								$(".email_check_ok").hide();
 							} else {
-								$("#sendCode").attr("disabled", true);
+								$("#sendCode").prop("disabled", true);
 								$(".email_check_ok").hide();
 								$(".email_err_msg").hide();
 							}
-						} else {
-							console.log("111")
+						}else {
 							finishEmailVerity = true;
 							if (readClause && finishPhoneVerity) {
 								$(".toPay").removeAttr("disabled")
@@ -585,7 +594,6 @@
 							$(this).parents('div.form-control').siblings().slideUp();
 						}
 					} else {
-						console.log("222")
 						$(this).parents('div.form-control').siblings().slideUp();
 						$("#sendCode").attr("disabled", "disabled");
 						$(".verity_input").attr("readonly", true);
@@ -642,7 +650,7 @@
 								//sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 								sessionStorage.setItem("send_code_"+{{.T._id}}, Date.parse(new Date())/1000);
 								//
-								localStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""))
+								localStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""));
 							}
 						} else {
 							EasyAlert.show(data.errMsg, "", 3000)
@@ -657,7 +665,6 @@
 				//校验验证码
 				$(".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){
@@ -688,8 +695,6 @@
 
 				//点击阅读条款
 				$(".fixed-bottom-box .weui-check").on("click", function() {
-					console.log("finishEmailVerity:",finishEmailVerity)
-					console.log("finishPhoneVerity:",finishPhoneVerity)
 					if ($(this).is(":checked")) {
 						if (finishEmailVerity && finishPhoneVerity) {
 							readClause = true;
@@ -727,6 +732,7 @@
 							sessionStorage.readClause="false";
 							$(".toPay").attr("disabled", "disabled");
 						}
+						sessionStorage.email_lastVerity=email_lastVerity;
 						window.location.href="/jyapp/front/dataExport/previewData/"+{{.T._id}}+"?dataType="+dataType;
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);
@@ -738,11 +744,6 @@
 					if (!finishEmailVerity || !readClause || !canpay || !finishPhoneVerity) {
 						return
 					}
-//					}else{
-//				      //清除我已阅读缓存
-//				      sessionStorage.removeItem("readClause");
-//					  sessionStorage.removeItem("index");
-//				     }
 					$(".loading_").show();
 					canpay = false;
 					var param = {};

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

@@ -784,9 +784,13 @@
 					var checkValue = $('input:radio[name="way"]:checked').val();
 		        	if(checkValue=="微信支付"){
 		        		localStorage.setItem($(".param_id").text(),"wx");
+		        		$("#wx").prop("checked",true);
+						$("#zfb").prop("checked",false);
 		            	pay_way="wx_app";
 		        	}else{
 		        		localStorage.setItem($(".param_id").text(),"ali");
+		        		$("#wx").prop("checked",false);
+						$("#zfb").prop("checked",true);
 		        		pay_way="ali_app";
 		        	}
 				});
@@ -1253,13 +1257,18 @@
 				$(".param_dataType").text(param_dataType);
 				$(".param_id").text(param_id);
 				if(localStorage.getItem(param_id)=="wx"){
-					$("#wx").attr("checked",true);
-					$("#zfb").attr("checked",false);
+					$("#wx").prop("checked",true);
+					$("#zfb").prop("checked",false);
 					pay_way="wx_app";
 				}else if(localStorage.getItem(param_id)=="ali"){
 					pay_way="ali_app";
-					$("#zfb").attr("checked",true);
-					$("#wx").attr("checked",false);
+					$("#zfb").prop("checked",true);
+					$("#wx").prop("checked",false);
+				}else{
+					//不是在app生成的订单 默认为微信
+					$("#wx").prop("checked",true);
+					$("#zfb").prop("checked",false);
+					pay_way="wx_app";
 				}
 				this_e=e;
 			}

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

@@ -359,7 +359,7 @@
 		            	if(selectType=="title"){
 		            		selectTypeHtml+="<span>按标题匹配</span>";
 		            	}else if(selectType=="all"){
-		            		selectTypeHtml+="<span>按全文搜索</span>";
+		            		selectTypeHtml+="<span>按全文匹配</span>";
 		            	}
 		            }else{
 		            	selectTypeHtml+="<span></span>";
@@ -418,9 +418,6 @@
 					}else if(sessionStorage.type=="geren"){
 						$(".persontaitou").show();
 					}
-					sessionStorage.removeItem("applysuccess");
-					sessionStorage.removeItem("companyName");
-					sessionStorage.removeItem("taxNumer");
 				}else{
 					$(".person_").show();
 				}
@@ -501,13 +498,18 @@
 				$(".param_dataType").text(param_dataType);
 				$(".param_id").text(param_id);
 				if(localStorage.getItem(param_id)=="wx"){
-					$("#wx").attr("checked",true);
-					$("#zfb").attr("checked",false);
+					$("#wx").prop("checked",true);
+					$("#zfb").prop("checked",false);
 					pay_way="wx_app";
 				}else if(localStorage.getItem(param_id)=="ali"){
-					$("#zfb").attr("checked",true);
-					$("#wx").attr("checked",false);
+					$("#zfb").prop("checked",true);
+					$("#wx").prop("checked",false);
 					pay_way="ali_app";
+				}else{
+					//不是在app生成的订单 默认为微信
+					$("#wx").prop("checked",true);
+					$("#zfb").prop("checked",false);
+					pay_way="wx_app";
 				}
 			}
 			

src/web/staticres/dataExport/css/order_twoleave.css

@@ -26,7 +26,7 @@
 
 #order_two .c-info .inner .item { font-size: 14px; color: #1d1d1d; margin-bottom: 10px; }
 
-#order_two .c-info .inner .item .l { width: 80px; text-align: left; }
+#order_two .c-info .inner .item .l { width:120px; text-align: left; }
 
 #order_two .c-info .inner .item .gjc { padding: 15px; border: 1px solid #ccc; margin-right: 20px; }
 

src/web/templates/pc/orderDetail.html

@@ -158,7 +158,8 @@
             var subType = filter["subtype"];
             var buyer = filter["buyer"];
             var winner = filter["winner"];
-
+            var selectType=filter["selectType"];
+	console.log(filter)
             if(!publishtime){
                 publishtime = "全部";
             }
@@ -216,6 +217,16 @@
                 marginBottom = 10;
             }
             keywordsHtml += "</div>";
+           	var selectTypeHtml="";
+            if(selectType){
+            	if(selectType=="title"){
+            		selectTypeHtml+="<span>按标题匹配</span>";
+            	}else if(selectType=="all"){
+            		selectTypeHtml+="<span>按全文匹配</span>";
+            	}
+            }else{
+            	selectTypeHtml+="<span></span>";
+            }
             var priceHtml = "";
             if(price){
                 priceHtml += "<span>" + price + "</span>";
@@ -264,6 +275,10 @@
                         "<div class=\"item clearfix\" style=\"margin-bottom: "+marginBottom+"px;\">" +
                             "<div class=\"l fl\">关键词：</div>" +
                             "" + keywordsHtml + "" +
+                        "</div>" +
+                         "<div class=\"item clearfix\">" +
+                            "<div class=\"l fl\">关键词匹配方式：</div>" +
+                            "<div class=\"r fl\">" + selectTypeHtml + "</div>" +
                         "</div>" +
                         "<div class=\"item clearfix\">" +
                             "<div class=\"l fl\">金额：</div>" +

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

@@ -376,9 +376,16 @@
 					$(".verity_input").removeAttr("readonly");
 				}
 				if (sessionStorage.getItem("order_phone"+{{.T._id}})!=null){
-					$(".phone_check_ok").show();
-					$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
-					finishPhoneVerity=true;
+					if((/^[1][3-9][0-9]{9}$/.test(sessionStorage.getItem("order_phone"+{{.T._id}})))){
+						$(".phone_check_ok").show();
+						$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
+						finishPhoneVerity=true;
+					}else{
+						$(".phone_err_msg").show();
+						$(".phone_check_ok").hide();
+						finishPhoneVerity = false;
+						$(".toPay").attr("disabled", "disabled");
+					}
 				}else if(phone_lastInput!=""){
 					$(".phone_check_ok").show();
 					$(".phone_input").val(phone_lastInput);
@@ -479,11 +486,21 @@
 								}else{
 									$(".verity_input").attr("readonly", true);
 								}
+							}else{
+								//新用户输入后 从新进来
+								$(".verity_input").prop("readonly", false);
+								$("#sendCode").prop("disabled", true);
 							}
 							finishEmailVerity=false;
 							$(".toPay").attr("disabled","disabled");
 							if(/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)){
-								$("#sendCode").removeAttr("disabled");
+								lstimes_ = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
+								lstimes_ = lstimes_ -  Date.parse(new Date())/1000 + 60*5;
+								if (lstimes_>0) {
+									$("#sendCode").prop("disabled", true);
+								}else{
+									$("#sendCode").prop("disabled", false);
+								}
 								$(".email_err_msg").hide();
 								$(".email_check_ok").hide();
 							}else{
@@ -492,7 +509,6 @@
 								$(".email_err_msg").hide();
 							}
 						}else{
-							console.log("!!")
 							finishEmailVerity=true;
 							if(readClause&&finishPhoneVerity){
 								$(".toPay").removeAttr("disabled")

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

@@ -264,7 +264,7 @@
 		            	if(selectType=="title"){
 		            		selectTypeHtml+="<span>按标题匹配</span>";
 		            	}else if(selectType=="all"){
-		            		selectTypeHtml+="<span>按全文搜索</span>";
+		            		selectTypeHtml+="<span>按全文匹配</span>";
 		            	}
 		            }else{
 		            	selectTypeHtml+="<span></span>";
@@ -322,9 +322,6 @@
 					} else if (sessionStorage.type=="geren"){
 						$(".persontaitou").show();
 					}
-					sessionStorage.removeItem("applysuccess");
-					sessionStorage.removeItem("companyName");
-					sessionStorage.removeItem("taxNumer");
 				} else {
 					$(".person_").show();
 				}
@@ -468,11 +465,13 @@
 					</div>
 				</div>
 			</main>
-			{{if ne .T.o.order_status -2}} {{if .T.o.pay_time}}
+			{{if ne .T.o.order_status -2}}
+			{{if .T.o.pay_time}}
 			<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
 			{{else}}
 			<div class="button align bottomButton" id="buy" onclick="goPay()">去支付</div>
-			{{end}} {{else}}
+			{{end}} 
+			{{else}}
 			<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
 			{{end}}
 		</div>