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

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

@@ -114,7 +114,7 @@
                     <div class="form-control">
 <!--                            <label for="">手机号：</label>-->
                         <div class="input">
-                            <input type="text" class="phone_input" maxlength="11" placeholder="手机号">
+                            <input type="text" class="phone_input" maxlength="11" placeholder="手机号" id="phone_input">
 				<div id="devinput" style="top: -0.05rem;">
 					<i class="icon iconfont phone_check_ok"></i>
 					<span class="phone_err_msg">手机号不正确</span>
@@ -307,12 +307,15 @@
 						sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 					}
 				}
+				if($("#phone_input").val()){
+					sessionStorage.setItem("order_phone"+{{.T._id}}, $("#phone_input").val().replace(/\s*/g,""));
+				}
 				window.location.href="/jyapp/front/staticPage/dataExport_serviceterms.html";
 			}
 			$(function() {     
 				//进入其他页面 验证码显示 
 				if(sessionStorage.email_sign=="1"){
-					$(".form-control").show();
+					$(".verification").show();
 				}
 				//返回键
 				$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
@@ -358,14 +361,20 @@
 				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null&&sessionStorage.getItem("send_email_"+{{.T._id}})!=email_lastInput){
 					$(".email_check_ok").hide();
 					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
-					$(".email_input").parents('div.form-control').siblings().slideDown();
+					var emver = sessionStorage.getItem("EmailVerity_"+{{.T._id}});
+					console.log(emver)
+					if(emver==null){
+						$(".email_input").parents('div.form-control').siblings().slideDown();
+					}else{
+						$(".email_check_ok").show();
+					}
 					lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}));
 					$(".verity_input").removeAttr("readonly");
 					lstimes = lstimes -  Date.parse(new Date())/1000 + 60*5;
 					if (lstimes>0){
 						sendemailTimer(lstimes);
 					}
-					//sessionStorage.removeItem("send_code_"+{{.T._id}});
+					sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
 					sessionStorage.removeItem("send_email_"+{{.T._id}});
 				}else {
 					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
@@ -381,15 +390,28 @@
 				if (email_lastVerity > 0) {
 					sendemailTimer(email_lastVerity);
 				}
+				/*
 				if (sessionStorage.getItem("order_phone"+userId + {{.T._id}}) != null) {
+					alert("####")
 					$(".phone_check_ok").show();
 					$(".phone_input").val(sessionStorage.getItem("order_phone"+userId + {{.T._id}}));
 					finishPhoneVerity = true;
 				} else if (phone_lastInput != "") {
+					alert("#######222")
 					$(".phone_check_ok").show();
 					$(".phone_input").val(phone_lastInput);
 					finishPhoneVerity = true;
 				}
+				*/
+				if (sessionStorage.getItem("order_phone"+{{.T._id}})!=null){
+					$(".phone_check_ok").show();
+					$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
+					finishPhoneVerity=true;
+				}else if(phone_lastInput!=""){
+					$(".phone_check_ok").show();
+					$(".phone_input").val(phone_lastInput);
+					finishPhoneVerity=true;
+				}
 				//
 				$('#choose_way').click(function() {
 					$('.pay_way').slideDown('slow')
@@ -613,13 +635,14 @@
 								$(".email_err_msg").hide();
 								$(".verity_input").attr("readonly", true);
 								$(".email_input").parents('div.form-control').siblings().slideUp();
+								//进入其他页面 验证码显示 清除缓存
+								sessionStorage.removeItem("email_sign");
+								sessionStorage.setItem("EmailVerity_"+{{.T._id}},"T");
 							} else {
 								EasyAlert.show("验证码错误", "", 3000);
 							}
 						})
 					} else {
-						//进入其他页面 验证码显示 清除缓存
-						sessionStorage.removeItem("email_sign");
 						$(".email_err_msg").hide();
 					}
 					//防遮挡
@@ -652,6 +675,9 @@
 							sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 							}
 						}
+						if($("#phone_input").val()){
+							sessionStorage.setItem("order_phone"+{{.T._id}}, $("#phone_input").val().replace(/\s*/g,""));
+						}
 						if ($(".fixed-bottom-box .weui-check").is(":checked")) {
 							readClause = true;
 							sessionStorage.readClause="true";
@@ -694,6 +720,7 @@
 					/*-----------------*/
 					$.post("/jyapp/dataExport/pay/createOrder", param, function(data) {
 						if (data.success) {
+							sessionStorage.setItem("order_email"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 							try {
 				                if(pay_way=="wx_app"){
 				                  JyObj.wxPay(data.data)

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

@@ -225,11 +225,14 @@
 //		            }
 		            if (region && region.length>0){
 		                for (var i=0;i<region.length;i++){
-		                    regionHtml += "<span>" + region[i] + "&nbsp</span>";
+		                	var region_i=region[i]
+		                    regionHtml += "<span>" + region_i+ "&nbsp</span>";
+		                    console.log(region[i])
 		                }
 		            }else if(area && area.length>0){
 		                for (var i=0;i<area.length;i++){
 		                    regionHtml += "<span>" + area[i] + "&nbsp</span>";
+		                    console.log(area[i])
 		                }
 		            }else {
 		                regionHtml += "<li>全国</li>";

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

@@ -841,6 +841,7 @@
 			$("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
 		        SuperSearch.init(true,true,true);
 		    });
+			/*
 			if(result.userId==""){
 				userId = "";
 				//中标企业搜索跳转
@@ -861,6 +862,14 @@
 						EntSearch.init(true,true,true);
 			    });
 			}
+			*/
+			userId = result.userId;
+			SuperSearch.openTablepro=result.tablepro;
+			//中标企业搜索跳转
+		    $(".content ul li a:eq(0)").unbind("tap").on("tap",function(){
+					EntSearch.clearSessionStorage();
+					EntSearch.init(true,true,true);
+		    });
 	    });
 	}
 	function backThisPage(){

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

@@ -116,7 +116,7 @@
                         <div class="form-control">
 <!--                            <label for="">手机号：</label>-->
                             <div class="input">
-                                <input type="text" class="phone_input" maxlength="11" placeholder="手机号">
+                                <input type="text" class="phone_input" maxlength="11" placeholder="手机号" id="phone_input">
 								<div id="devinput" style="top: -0.05rem;">
 									<i class="icon iconfont phone_check_ok"></i>
 									<span class="phone_err_msg">手机号不正确</span>
@@ -299,6 +299,9 @@
 						sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 					}
 				}
+				if($("#phone_input").val()){
+					sessionStorage.setItem("order_phone"+{{.T._id}}, $("#phone_input").val().replace(/\s*/g,""));
+				}
 				window.location.href="/front/staticPage/wx-serviceterms.html";
 			}
 			//
@@ -606,6 +609,9 @@
 								sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 							}
 						}
+						if($("#phone_input").val()){
+							sessionStorage.setItem("order_phone"+{{.T._id}}, $("#phone_input").val().replace(/\s*/g,""));
+						}
 						if ($(".fixed-bottom-box .weui-check").is(":checked")) {
 							readClause = true;
 							sessionStorage.readClause="true";